[ci] Fix custom compiler on macOS and reduce cache size

maplibre · Oct 29, 2023 · baaa2bc · baaa2bc
1 parent 815a70f
commit baaa2bc
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -90,6 +90,7 @@ jobs:
       - name: Setup compiler (macOS)
         if: matrix.compiler != 'default'
         run: |
+          brew install --overwrite [email protected]
           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