From 0f2d20ab66bbecbb74a1a70498e3fd7b3d4c6f49 Mon Sep 17 00:00:00 2001 From: Nicolai Ommer Date: Tue, 18 Mar 2025 18:44:47 +0100 Subject: [PATCH 1/3] Update ubuntu and macos runners --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3ec7f355..5dcc97fb 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-20.04, ubuntu-22.04 ] + os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-24.04 ] steps: - uses: actions/checkout@v4 - name: "Update dependencies" @@ -27,7 +27,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ macos-12, macos-13 ] + os: [ macos-13, macos-14 ] steps: - uses: actions/checkout@v4 - name: "Install dependencies" From 8aebe76508126b1dce6a511aa2c555c97aec3020 Mon Sep 17 00:00:00 2001 From: Nicolai Ommer Date: Tue, 18 Mar 2025 18:50:57 +0100 Subject: [PATCH 2/3] Update ubuntu and macos runners --- .github/workflows/build.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5dcc97fb..4c2ca34d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -33,9 +33,12 @@ jobs: - name: "Install dependencies" run: brew tap robotology/formulae && brew install cmake pkg-config qt@5 - name: "Build" - # for some reason qt5 is not correctly in the path and this will break whenever the location of it changes - # 5.15.11 is for macos-12 and 5.15.12 is for macos-13 - run: PATH=/usr/local/Cellar/qt@5/5.15.11/lib/cmake/Qt5:/usr/local/Cellar/qt@5/5.15.12/lib/cmake/Qt5:$PATH && make + run: | + export PATH="/usr/local/opt/qt@5/bin:$PATH" + export LDFLAGS="-L/usr/local/opt/qt@5/lib" + export CPPFLAGS="-I/usr/local/opt/qt@5/include" + export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig" + make # Windows build does not work currently, see https://github.com/RoboCup-SSL/grSim/issues/183 # build-windows: From 650180bfc1172addd1d2cf0e1147e5c6693f6aae Mon Sep 17 00:00:00 2001 From: Nicolai Ommer Date: Tue, 18 Mar 2025 19:42:18 +0100 Subject: [PATCH 3/3] Update ubuntu and macos runners --- .github/workflows/build.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 4c2ca34d..728e2d91 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -34,10 +34,18 @@ jobs: run: brew tap robotology/formulae && brew install cmake pkg-config qt@5 - name: "Build" run: | + # For macOS 13 export PATH="/usr/local/opt/qt@5/bin:$PATH" export LDFLAGS="-L/usr/local/opt/qt@5/lib" export CPPFLAGS="-I/usr/local/opt/qt@5/include" export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig" + + # For macOS 14 + export PATH="/opt/homebrew/opt/qt@5/bin:$PATH" + export LDFLAGS="-L/opt/homebrew/opt/qt@5/lib" + export CPPFLAGS="-I/opt/homebrew/opt/qt@5/include" + export PKG_CONFIG_PATH="/opt/homebrew/opt/qt@5/lib/pkgconfig" + make # Windows build does not work currently, see https://github.com/RoboCup-SSL/grSim/issues/183