Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: move to newer macOS runners and always update APT cache #114

Merged
merged 1 commit into from
Feb 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/Android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/Linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/Windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/iOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
21 changes: 13 additions & 8 deletions .github/workflows/macOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 }}
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading