From 82ab0484a906c651fd0e8aa4f7655d49caf3465c Mon Sep 17 00:00:00 2001 From: Tadej Novak Date: Sat, 17 Feb 2024 14:54:43 +0100 Subject: [PATCH] CI: move to newer macOS runners and always update APT cache --- .github/workflows/Android.yml | 2 ++ .github/workflows/Linux.yml | 3 +++ .github/workflows/Windows.yml | 1 + .github/workflows/iOS.yml | 6 ++++-- .github/workflows/macOS.yml | 21 +++++++++++++-------- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/.github/workflows/Android.yml b/.github/workflows/Android.yml index 89edbc6..6e4da01 100644 --- a/.github/workflows/Android.yml +++ b/.github/workflows/Android.yml @@ -85,6 +85,7 @@ jobs: version: ${{ matrix.qt_version }} modules: qtlocation qtpositioning set-env: false + extra: --base https://mirrors.ocf.berkeley.edu/qt/ - name: Download Qt (Android) id: qt-android @@ -95,6 +96,7 @@ jobs: target: android arch: ${{ matrix.arch }} modules: qtlocation qtpositioning + extra: --base https://mirrors.ocf.berkeley.edu/qt/ - name: Fix Qt release if: ${{ matrix.abi }} == 'armeabi-v7a' diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml index e1a5e1b..30a8c62 100644 --- a/.github/workflows/Linux.yml +++ b/.github/workflows/Linux.yml @@ -71,6 +71,7 @@ jobs: - name: Install test dependencies if: matrix.compiler != 'default' run: | + sudo apt-get update sudo apt-get install \ libxkbcommon-x11-0 \ libxcb-cursor0 \ @@ -93,6 +94,7 @@ jobs: - name: Install lcov if: matrix.compiler != 'default' run: | + sudo apt-get update sudo apt-get install \ libcapture-tiny-perl \ libdatetime-perl \ @@ -121,6 +123,7 @@ jobs: dir: ${{ github.workspace }} target: desktop modules: ${{ matrix.qt_modules }} + extra: --base https://mirrors.ocf.berkeley.edu/qt/ - name: Setup ninja if: matrix.compiler != 'default' diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml index bf9a92f..57603b0 100644 --- a/.github/workflows/Windows.yml +++ b/.github/workflows/Windows.yml @@ -92,6 +92,7 @@ jobs: target: desktop arch: ${{ matrix.qt_arch }} modules: ${{ matrix.qt_modules }} + extra: --base https://mirrors.ocf.berkeley.edu/qt/ - name: Setup ninja uses: seanmiddleditch/gha-setup-ninja@v4 diff --git a/.github/workflows/iOS.yml b/.github/workflows/iOS.yml index f7a5f8b..d99ad17 100644 --- a/.github/workflows/iOS.yml +++ b/.github/workflows/iOS.yml @@ -40,7 +40,7 @@ concurrency: jobs: build: name: Build QMapLibre for iOS (Qt${{ matrix.qt_version}}) - runs-on: macos-13 + runs-on: macos-14 strategy: matrix: include: @@ -73,6 +73,7 @@ jobs: target: desktop modules: qtlocation qtpositioning set-env: false + extra: --base https://mirrors.ocf.berkeley.edu/qt/ - name: Download Qt (iOS) uses: jurplel/install-qt-action@v3 @@ -81,6 +82,7 @@ jobs: version: ${{ matrix.qt_version }} target: ios modules: qtlocation qtpositioning + extra: --base https://mirrors.ocf.berkeley.edu/qt/ - name: Setup ninja uses: seanmiddleditch/gha-setup-ninja@v4 @@ -121,7 +123,7 @@ jobs: release: name: Release QMapLibre if: github.ref_type == 'tag' - runs-on: macos-13 + runs-on: macos-14 needs: build permissions: contents: write diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml index 0a7c557..e245491 100644 --- a/.github/workflows/macOS.yml +++ b/.github/workflows/macOS.yml @@ -40,7 +40,7 @@ concurrency: jobs: build-and-test: name: Build QMapLibre for macOS (Qt${{ matrix.qt_version}}, ${{ matrix.compiler }}) - runs-on: macos-13 + runs-on: ${{ matrix.runs_on }} strategy: matrix: include: @@ -50,24 +50,28 @@ jobs: compiler: default deployment_target: 10.13 deployment_arch: x86_64 + runs_on: macos-13 - qt_series: 6 qt_version: 6.5.3 qt_modules: qtlocation qtpositioning compiler: default deployment_target: 11.0 deployment_arch: x86_64 + runs_on: macos-14 - qt_series: 6 qt_version: 6.6.1 qt_modules: qtlocation qtpositioning compiler: default deployment_target: 11.0 deployment_arch: x86_64;arm64 + runs_on: macos-14 - qt_series: 6 qt_version: 6.6.1 qt_modules: qtlocation qtpositioning compiler: llvm@17 deployment_target: 11.0 - deployment_arch: x86_64 + deployment_arch: arm64 + runs_on: macos-14 env: COMPILER: ${{ matrix.compiler }} @@ -91,12 +95,12 @@ jobs: if: matrix.compiler != 'default' run: | brew install "$COMPILER" - echo "/usr/local/opt/${COMPILER}/bin" >> "$GITHUB_PATH" + echo "/opt/homebrew/opt/${COMPILER}/bin" >> "$GITHUB_PATH" { - echo "CC=/usr/local/opt/${COMPILER}/bin/clang" - echo "CXX=/usr/local/opt/${COMPILER}/bin/clang++" - echo "LDFLAGS=\"-L/usr/local/opt/${COMPILER}/lib\"" - echo "CPPFLAGS=\"-I/usr/local/opt/${COMPILER}/include\"" + echo "CC=/opt/homebrew/opt/${COMPILER}/bin/clang" + echo "CXX=/opt/homebrew/opt/${COMPILER}/bin/clang++" + echo "LDFLAGS=\"-L/opt/homebrew/opt/${COMPILER}/lib\"" + echo "CPPFLAGS=\"-I/opt/homebrew/opt/${COMPILER}/include\"" } >> "$GITHUB_ENV" - name: Download Qt @@ -106,6 +110,7 @@ jobs: version: ${{ matrix.qt_version }} target: desktop modules: ${{ matrix.qt_modules }} + extra: --base https://mirrors.ocf.berkeley.edu/qt/ - name: Setup ninja uses: seanmiddleditch/gha-setup-ninja@v4 @@ -217,7 +222,7 @@ jobs: release: name: Release QMapLibre if: github.ref_type == 'tag' - runs-on: macos-13 + runs-on: macos-14 needs: build-and-test permissions: contents: write