From 1c65351cefd793a954134b1029bad5e2eae0aa80 Mon Sep 17 00:00:00 2001 From: Morten Borup Petersen Date: Sun, 5 Jan 2025 16:12:35 +0100 Subject: [PATCH] Remove ancient GCC pins in `linux-release.yml` (#385) * Remove ancient GCC pins in `linux-release.yml` * Switch to ninja * fix * mac --------- Co-authored-by: Morten Borup Petersen --- .github/workflows/linux-release.yml | 10 ++++------ .github/workflows/test.yml | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/linux-release.yml b/.github/workflows/linux-release.yml index 58865f3a..89d31d25 100644 --- a/.github/workflows/linux-release.yml +++ b/.github/workflows/linux-release.yml @@ -7,9 +7,6 @@ on: jobs: buildUbuntuXenial: runs-on: ubuntu-20.04 - env: - CC: gcc-9 - CXX: g++-9 strategy: matrix: @@ -33,7 +30,8 @@ jobs: libxcb-xinerama0 libxcb-composite0 libxcb-cursor0 libxcb-damage0 \ libxcb-dpms0 libxcb-dri2-0 libxcb-dri3-0 libxcb-ewmh2 libxcb-glx0 \ libxcb-present0 libxcb-randr0 libxcb-record0 libxcb-render0 libxcb-res0 \ - libxcb-screensaver0 libxcb-shape0 libxcb-shm0 libxcb-sync1 libxcb-util1 libegl1 + libxcb-screensaver0 libxcb-shape0 libxcb-shm0 libxcb-sync1 libxcb-util1 libegl1 \ + ninja-build - name: Install Qt uses: jurplel/install-qt-action@v3 @@ -56,8 +54,8 @@ jobs: run: | echo "--------------------------------------------------------------" echo "building desktop" - cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} . - make -j $(nproc) + cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} . -GNinja + ninja - name: package artifacts run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ab0def4e..de6a90c5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,9 +34,7 @@ jobs: libxcb-dpms0 libxcb-dri2-0 libxcb-dri3-0 libxcb-ewmh2 libxcb-glx0 \ libxcb-present0 libxcb-randr0 libxcb-record0 libxcb-render0 libxcb-res0 \ libxcb-screensaver0 libxcb-shape0 libxcb-shm0 libxcb-sync1 libxcb-util1 \ - - echo "CC=gcc-9" >> $GITHUB_ENV - echo "CXX=g++-9" >> $GITHUB_ENV + ninja-build # Dummy display server for CI tests Xvfb :99 & @@ -45,7 +43,7 @@ jobs: # MacOS - if: contains( matrix.os, 'macos') name: Prepare macos container for build - run: brew install autoconf automake libtool xz pkg-config libgit2 libjpg libpng libmtp + run: brew install autoconf automake libtool xz pkg-config libgit2 libjpg libpng libmtp ninja # Windows - if: contains( matrix.os, 'windows') @@ -76,8 +74,8 @@ jobs: - if: "!contains(matrix.os, 'windows')" name: build Ripes run: | - cmake -DRIPES_BUILD_TESTS=ON -DVSRTL_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release . - make -j $(nproc) + cmake -GNinja -DRIPES_BUILD_TESTS=ON -DVSRTL_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release . + ninja - if: contains(matrix.os, 'windows') name: build Ripes (Windows)