diff options
| -rw-r--r-- | .github/workflows/cmake-tag.yml | 18 | ||||
| -rw-r--r-- | .github/workflows/cmake.yml | 27 |
2 files changed, 12 insertions, 33 deletions
diff --git a/.github/workflows/cmake-tag.yml b/.github/workflows/cmake-tag.yml index d4d26db3..8b8aaf97 100644 --- a/.github/workflows/cmake-tag.yml +++ b/.github/workflows/cmake-tag.yml @@ -15,14 +15,14 @@ jobs: strategy: fail-fast: true matrix: - os: [ubuntu-24.04, windows-latest, macos-12] + os: [ubuntu-latest, windows-latest, macos-latest] include: - - os: ubuntu-24.04 + - os: ubuntu-latest cmake: /usr/bin/env CC=gcc-14 CXX=g++-14 cmake - - os: macos-12 - cmake: /usr/bin/env CC="$(brew --prefix llvm@17)/bin/clang" CXX="$(brew --prefix llvm@17)/bin/clang++" cmake - os: windows-latest cmake: .\.github\workflows\build-windows.bat cmake + - os: macos-latest + cmake: /usr/bin/env CC="$(brew --prefix llvm)/bin/clang" CXX="$(brew --prefix llvm)/bin/clang++" cmake steps: - uses: actions/checkout@v3 @@ -32,7 +32,7 @@ jobs: - uses: abdes/gha-setup-ninja@master with: version: 1.11.1 - if: matrix.os != 'ubuntu-24.04' + if: matrix.os != 'ubuntu-latest' - name: Install Linux dependencies run: | @@ -41,12 +41,12 @@ jobs: sudo apt install g++-14 gdb ninja-build libbenchmark-dev sudo apt -q install libgl1-mesa-dri libgl-dev libglx-dev xorg-dev xvfb libopencv-dev sudo apt -q install libsdl2-dev - if: matrix.os == 'ubuntu-24.04' + if: matrix.os == 'ubuntu-latest' - name: Install OSX dependencies run: | - brew install SDL2 llvm@17 - if: matrix.os == 'macos-12' + brew install SDL2 llvm lld + if: matrix.os == 'macos-latest' - name: Configure run: ${{matrix.cmake}} -G "Ninja" -S ${{github.workspace}}/ -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} @@ -62,7 +62,7 @@ jobs: set -e xvfb-run gdb -q -batch -x ../../.github/gdbscript.py --args bin/floormat-test xvfb-run gdb -q -batch -x ../../.github/gdbscript.py --args bin/floormat-benchmark - if: matrix.os == 'ubuntu-24.04' + if: matrix.os == 'ubuntu-latest' # - name: Upload build # uses: actions/upload-artifact@v2.2.4 diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 456bc77b..a790a869 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -15,26 +15,16 @@ jobs: strategy: fail-fast: true matrix: - #os: [ubuntu-24.04, windows-latest, macos-12] - os: [ubuntu-24.04] + os: [ubuntu-latest] include: - - os: ubuntu-24.04 + - os: ubuntu-latest cmake: /usr/bin/env CC=gcc-14 CXX=g++-14 cmake - #- os: macos-12 - # cmake: /usr/bin/env CC="$(brew --prefix llvm@16)/bin/clang" CXX="$(brew --prefix llvm@16)/bin/clang++" cmake - #- os: windows-latest - # cmake: .\.github\workflows\build-windows.bat cmake steps: - uses: actions/checkout@v3 with: submodules: recursive - - uses: abdes/gha-setup-ninja@master - with: - version: 1.11.1 - if: matrix.os != 'ubuntu-24.04' - - name: Install Linux dependencies run: | sudo add-apt-repository ppa:ubuntu-toolchain-r/test @@ -42,12 +32,7 @@ jobs: sudo apt install g++-14 gdb ninja-build libbenchmark-dev sudo apt -q install libgl1-mesa-dri libgl-dev libglx-dev xorg-dev xvfb libopencv-dev sudo apt -q install libsdl2-dev - if: matrix.os == 'ubuntu-24.04' - - - name: Install OSX dependencies - run: | - brew install SDL2 llvm@16 - if: matrix.os == 'macos-12' + if: matrix.os == 'ubuntu-latest' - name: Configure run: ${{matrix.cmake}} -G "Ninja" -S ${{github.workspace}}/ -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} @@ -64,9 +49,3 @@ jobs: xvfb-run gdb -q -batch -x ../../.github/gdbscript.py --args bin/floormat-test xvfb-run gdb -q -batch -x ../../.github/gdbscript.py --args bin/floormat-benchmark if: matrix.os == 'ubuntu-24.04' - -# - name: Upload build -# uses: actions/upload-artifact@v2.2.4 -# with: -# name: buildoutput -# path: ${{github.workspace}}/build/ |