diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index c0ac9091..7c495ed9 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -7,7 +7,7 @@ Pull request overview Link to relevant GitHub Issue(s) if appropriate: -Link to the **Ubuntu 22.04 .deb** installer to use for CI Testing. If not set, it will default to latest official release. +Link to the **Ubuntu 24.04 .deb** installer to use for CI Testing. If not set, it will default to latest official release. [OpenStudio Installer]: http:// diff --git a/.github/workflows/manual_installer_test.yml b/.github/workflows/manual_installer_test.yml index 46b3c5a6..634e769b 100644 --- a/.github/workflows/manual_installer_test.yml +++ b/.github/workflows/manual_installer_test.yml @@ -4,9 +4,9 @@ on: workflow_dispatch: inputs: os_installer_link: - description: 'The Link where to download the Ubuntu 22.04 OpenStudio SDK Installer (.DEB)' + description: 'The Link where to download the Ubuntu 24.04 OpenStudio SDK Installer (.DEB)' required: true - default: 'https://openstudio-ci-builds.s3-us-west-2.amazonaws.com/develop/OpenStudio-3.5.1-alpha%2B59f1eb448b-Ubuntu-22.04.deb' + default: 'https://openstudio-ci-builds.s3-us-west-2.amazonaws.com/develop/OpenStudio-3.5.1-alpha%2B59f1eb448b-Ubuntu-24.04.deb' branch_name: description: 'The branch name to use and where to commit the test results. If ommited, it will default to the installer SHA' required: false @@ -21,7 +21,7 @@ on: jobs: test_installer: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index c5adb5f7..293c2944 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -6,7 +6,7 @@ on: jobs: test_installer: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 if: "!(contains(github.event.head_commit.message, 'skip') && contains(github.event.head_commit.message, 'ci'))" steps: @@ -80,10 +80,10 @@ jobs: raise ValueError("Something went wrong when querying {}, status={}".format(url, r.status_code)) exit(0) data = r.json() - matched_installers = [x['browser_download_url'] for x in data['assets'] if 'Ubuntu-22.04-x86_64.deb' in x['name']] + matched_installers = [x['browser_download_url'] for x in data['assets'] if 'Ubuntu-24.04-x86_64.deb' in x['name']] if len(matched_installers) == 0: - matched_installers = [x['browser_download_url'] for x in data['assets'] if 'Ubuntu-22.04.deb' in x['name']] + matched_installers = [x['browser_download_url'] for x in data['assets'] if 'Ubuntu-24.04.deb' in x['name']] if len(matched_installers) == 0: matched_installers = [x['browser_download_url'] for x in data['assets'] if 'Linux.deb' in x['name']] if len(matched_installers) ==0: