Skip to content

Commit 2722e3e

Browse files
authored
Add an Ubuntu-2404 runner (#754)
* Allow building on Ubuntu 24.04 by downloading the 22.04 ubuntu package * Add an Ubuntu 24.04 runner
1 parent 5aad610 commit 2722e3e

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

.github/workflows/app_build.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
# fail-fast: Default is true, switch to false to allow one platform to fail and still run others
3333
fail-fast: false
3434
matrix:
35-
os: [ubuntu-20.04, ubuntu-22.04, windows-2022, macos-13, macos-arm64]
35+
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, windows-2022, macos-13, macos-arm64]
3636
include:
3737
- os: ubuntu-20.04
3838
SELF_HOSTED: false
@@ -54,6 +54,16 @@ jobs:
5454
QT_OS_NAME: linux
5555
QT_ARCH: gcc_64
5656
arch: x86_64
57+
- os: ubuntu-24.04
58+
SELF_HOSTED: false
59+
PLATFORM_NAME: Linux
60+
BINARY_EXT: deb
61+
COMPRESSED_EXT: tar.gz
62+
BINARY_PKG_PATH: _CPack_Packages/Linux/DEB
63+
COMPRESSED_PKG_PATH: _CPack_Packages/Linux/TGZ
64+
QT_OS_NAME: linux
65+
QT_ARCH: gcc_64
66+
arch: x86_64
5767
- os: windows-2022
5868
SELF_HOSTED: false
5969
PLATFORM_NAME: Windows

FindOpenStudioSDK.cmake

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,14 @@ if(APPLE)
2424

2525
elseif(UNIX)
2626
set(OPENSTUDIO_PLATFORM "${LSB_RELEASE_ID_SHORT}-${LSB_RELEASE_VERSION_SHORT}-${ARCH}")
27-
if(LSB_RELEASE_VERSION_SHORT MATCHES "22.04")
27+
if(LSB_RELEASE_VERSION_SHORT MATCHES "24.04")
28+
set(OPENSTUDIO_PLATFORM "${LSB_RELEASE_ID_SHORT}-22.04-${ARCH}")
29+
if (ARCH MATCHES "arm64")
30+
set(OPENSTUDIO_EXPECTED_HASH ff544a9dfa4846de6af959a0c1ec926d)
31+
else()
32+
set(OPENSTUDIO_EXPECTED_HASH b14c71b37a01040f3216abc68488ed62)
33+
endif()
34+
elseif(LSB_RELEASE_VERSION_SHORT MATCHES "22.04")
2835
if (ARCH MATCHES "arm64")
2936
set(OPENSTUDIO_EXPECTED_HASH ff544a9dfa4846de6af959a0c1ec926d)
3037
else()

0 commit comments

Comments
 (0)