From baaa2bc64a9c9cad9b71a49cae9536d6b5abc995 Mon Sep 17 00:00:00 2001 From: Tadej Novak Date: Sun, 29 Oct 2023 16:45:08 +0100 Subject: [PATCH] [ci] Fix custom compiler on macOS and reduce cache size --- .github/workflows/Android.yml | 1 + .github/workflows/Linux.yml | 1 + .github/workflows/Windows.yml | 1 + .github/workflows/iOS.yml | 4 ++-- .github/workflows/macOS.yml | 2 ++ 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Android.yml b/.github/workflows/Android.yml index 42c947f..8da36c8 100644 --- a/.github/workflows/Android.yml +++ b/.github/workflows/Android.yml @@ -102,6 +102,7 @@ jobs: uses: hendrikmuhs/ccache-action@v1 with: key: Android_QMapLibre_${{ matrix.config.abi }} + max-size: 200M - name: Build QMapLibre env: diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml index 5c07da6..ed4c210 100644 --- a/.github/workflows/Linux.yml +++ b/.github/workflows/Linux.yml @@ -106,6 +106,7 @@ jobs: uses: hendrikmuhs/ccache-action@v1 with: key: Linux_QMapLibre_${{ matrix.qt_version }}_${{ matrix.compiler }} + max-size: 200M - name: Build QMapLibre (Qt5) if: matrix.qt_series == 5 diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml index 85bcd72..5b6c0bb 100644 --- a/.github/workflows/Windows.yml +++ b/.github/workflows/Windows.yml @@ -103,6 +103,7 @@ jobs: uses: hendrikmuhs/ccache-action@v1 with: key: Windows_QMapLibre_${{ matrix.config.qtarch }} + max-size: 200M - name: Build QMapLibre shell: bash diff --git a/.github/workflows/iOS.yml b/.github/workflows/iOS.yml index ea26db4..b628c67 100644 --- a/.github/workflows/iOS.yml +++ b/.github/workflows/iOS.yml @@ -82,10 +82,10 @@ jobs: uses: hendrikmuhs/ccache-action@v1 with: key: iOS_QMapLibre + max-size: 200M - - name: Use custom version of ccache + - name: Use latest version of ccache run: | - sed -i.bak -e 's/ccache\/ccache\.git/ntadej\/ccache.git/' -e 's/master/xarch/' /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/ccache.rb brew unlink ccache brew install ccache --HEAD diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml index 5424c6c..5e15be2 100644 --- a/.github/workflows/macOS.yml +++ b/.github/workflows/macOS.yml @@ -90,6 +90,7 @@ jobs: - name: Setup compiler (macOS) if: matrix.compiler != 'default' run: | + brew install --overwrite python@3.11 brew install "$COMPILER" echo "/usr/local/opt/${COMPILER}/bin" >> "$GITHUB_PATH" { @@ -114,6 +115,7 @@ jobs: uses: hendrikmuhs/ccache-action@v1 with: key: macOS_QMapLibre_${{ matrix.qt_version }}_${{ matrix.compiler }} + max-size: 200M - name: Build QMapLibre (Qt5) if: matrix.qt_series == 5