Update llvm_clang.yml

escapezn · May 18, 2024 · fd07311 · fd07311
1 parent 1200809
commit fd07311
Showing 1 changed file with 4 additions and 25 deletions.
diff --git a/.github/workflows/llvm_clang.yml b/.github/workflows/llvm_clang.yml
@@ -55,14 +55,6 @@ jobs:
           key: ${{ secrets.CACHE_VERSION }}-clang-x86_64_v3_toolchain-${{ github.run_id }}
           restore-keys: ${{ secrets.CACHE_VERSION }}-clang-x86_64_v3_toolchain
 
-      - name: Loading i686 toolchain
-        id: i686_cache
-        uses: actions/cache/restore@main
-        with:
-          path: build_i686
-          key: ${{ secrets.CACHE_VERSION }}-clang-i686_toolchain-${{ github.run_id }}
-          restore-keys: ${{ secrets.CACHE_VERSION }}-clang-i686_toolchain
-
       - name: Loading aarch64 toolchain
         id: aarch64_cache
         if: false
@@ -106,12 +98,6 @@ jobs:
           cmake -DTARGET_ARCH=x86_64-w64-mingw32 -DLLVM_ENABLE_PGO=GEN -DCOMPILER_TOOLCHAIN=clang -DGCC_ARCH=x86-64-v3 -DCMAKE_INSTALL_PREFIX=$PWD/clang_root -DMINGW_INSTALL_PREFIX=$PWD/build_x86_64_v3/x86_64_v3-w64-mingw32 -DSINGLE_SOURCE_LOCATION=$PWD/src_packages -DRUSTUP_LOCATION=$PWD/clang_root/install_rustup -G Ninja -B build_x86_64_v3 -S $PWD
           ninja -C build_x86_64_v3 llvm-clang
 
-      - name: Building i686 toolchain
-        if: ${{ steps.i686_cache.outputs.cache-matched-key == '' }}
-        run: |
-          cmake -DTARGET_ARCH=i686-w64-mingw32 -DLLVM_ENABLE_PGO=GEN -DCOMPILER_TOOLCHAIN=clang -DCMAKE_INSTALL_PREFIX=$PWD/clang_root -DMINGW_INSTALL_PREFIX=$PWD/build_i686/i686-w64-mingw32 -DSINGLE_SOURCE_LOCATION=$PWD/src_packages -DRUSTUP_LOCATION=$PWD/clang_root/install_rustup -G Ninja -B build_i686 -S $PWD
-          ninja -C build_i686 llvm-clang
-
       - name: Building aarch64 toolchain
         if: false
         run: |
@@ -138,26 +124,25 @@ jobs:
 
       - name: Cleanup
         run: |
-          rm -rf {build_i686,build_x86_64,build_x86_64_v3,build_aarch64}/{toolchain,packages} || true
+          rm -rf {build_x86_64,build_x86_64_v3,build_aarch64}/{toolchain,packages} || true
 
       - name: Collecting logs
         if: always()
         run: |
-          mkdir -p build_x86_64_logs build_i686_logs build_aarch64_logs
+          mkdir -p build_x86_64_logs build_aarch64_logs
           cp -fr $(find build_x86_64 -type f -iname "*-*.log") build_x86_64_logs || true
-          cp -fr $(find build_i686 -type f -iname "*-*.log") build_i686_logs || true
           cp -fr $(find build_aarch64 -type f -iname "*-*.log") build_aarch64_logs || true
           7z a -m0=lzma2 -mx=9 -ms=on logs.7z build*logs
 
       - name: Uploading logs
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@main
         if: always()
         with:
           name: logs
           path: logs.7z
 
       - name: Uploading toolchain
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@main
         if: always()
         with:
           name: toolchain
@@ -181,12 +166,6 @@ jobs:
           path: build_x86_64_v3
           key: ${{ secrets.CACHE_VERSION }}-clang-x86_64_v3_toolchain-${{ github.run_id }}
 
-      - name: Saving i686 toolchain
-        uses: actions/cache/save@main
-        with:
-          path: build_i686
-          key: ${{ secrets.CACHE_VERSION }}-clang-i686_toolchain-${{ github.run_id }}
-
       - name: Saving aarch64 toolchain
         if: false
         uses: actions/cache/save@main