Drop FORCE_USE_SYSTEM_CLANG: 1

hebasto · Sep 9, 2023 · 8d452c0 · 8d452c0
1 parent acd2faa
commit 8d452c0
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,18 +48,17 @@ jobs:
           - name: 'macOS arm64'
             triplet: 'arm64-apple-darwin'
             compiler: 'clang'
-            packages: 'llvm'
+            packages: ''
           - name: 'macOS x86_64'
             triplet: 'x86_64-apple-darwin'
             compiler: 'clang'
-            packages: 'llvm'
+            packages: ''
           - name: 'Windows'
             triplet: 'x86_64-w64-mingw32'
             compiler: 'x86_64-w64-mingw32-g++-posix'
             packages: 'g++-mingw-w64-x86-64-posix'
 
     env:
-      FORCE_USE_SYSTEM_CLANG: 1
       XCODE_VERSION: '12.2'
       XCODE_BUILD_ID: '12B45b'
 
@@ -70,12 +69,12 @@ jobs:
       - name: Install dependency packages
         run: |
           sudo apt-get update
-          sudo apt-get install ${{ matrix.host.packages }}
+          sudo apt-get install ccache ${{ matrix.host.packages }}
 
       - name: Depends fingerprint
         id: depends_fingerprint
         run: |
-          ${{ matrix.host.compiler }} -v 2>&1 | tee depends/compiler-version
+          if ${{ !endsWith(matrix.host.triplet, '-apple-darwin') }}; then ${{ matrix.host.compiler }} -v 2>&1 | tee depends/compiler-version; fi
           if ${{ endsWith(matrix.host.triplet, '-apple-darwin') }}; then echo ${{ env.XCODE_VERSION }} ${{ env.XCODE_BUILD_ID }} > depends/sdk-version; fi
           echo "hash=${{ hashFiles('./depends/**') }}" >> "$GITHUB_OUTPUT"
 
@@ -99,6 +98,3 @@ jobs:
         run: |
           cd depends
           make -j$(nproc) HOST=${{ matrix.host.triplet }} LOG=1
-
-      - run: |
-          pwd