ci: windows gnu remove matrix

esp-rs · Feb 12, 2024 · 0a0e191 · 0a0e191
1 parent ec0834a
commit 0a0e191
Showing 1 changed file with 4 additions and 22 deletions.
diff --git a/.github/workflows/build-x86_64-pc-windows-gnu.yaml b/.github/workflows/build-x86_64-pc-windows-gnu.yaml
@@ -36,15 +36,7 @@ jobs:
   build-xtensa-rust:
     name: Build Xtensa Rust
     needs: get_release
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [self-hosted, Windows]
-        include:
-          - os: [self-hosted, Windows]
-            ASSET_PATH: "rust/build/dist/rust-${{ github.event.inputs.release_version }}-x86_64-pc-windows-gnu.zip"
-            ASSET_NAME: "rust-${{ github.event.inputs.release_version }}-x86_64-pc-windows-gnu.zip"
-            ASSET_CONTENT_TYPE: "application/x-tar"
+    runs-on: [self-hosted, Windows]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -72,14 +64,6 @@ jobs:
         working-directory: "R:"
         continue-on-error: true
         run: C:\msys64\usr\bin\env.exe MSYSTEM=MINGW64 /usr/bin/bash -lc "cd /r; python3 x.py dist --stage 2"
-      # This step make sense only on Azure runners with 8 cores and 16 GB RAM,
-      # because LLVM OOMs. Either increase memory or decrease number of parallel processes.
-      #- name: Retry build with x.py - dist packages - in case of failure on LLVM OOM
-      #  id: retry-build-rust
-      #  if: steps.build-rust.outcome == 'failure'
-      #  working-directory: "R:"
-      #  continue-on-error: true
-      #  run: C:\msys64\usr\bin\env.exe MSYSTEM=MINGW64 /usr/bin/bash -lc "cd /r; python3 x.py dist --stage 2"
       - name: Repackage binary
         id: repackage-binary
         continue-on-error: true
@@ -89,16 +73,14 @@ jobs:
           &"$env:GITHUB_WORKSPACE/support/rust-build/Repackage-RustRelease.ps1" -DefaultHost x86_64-pc-windows-gnu
       - name: Upload Release Asset
         if: steps.repackage-binary.outcome != 'failure'
-        id: upload-release-asset
-        continue-on-error: true
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.get_release.outputs.upload_url }}
-          asset_path: ${{ matrix.ASSET_PATH }}
-          asset_name: ${{ matrix.ASSET_NAME }}
-          asset_content_type: ${{ matrix.ASSET_CONTENT_TYPE }}
+          asset_path: rust/build/dist/rust-${{ github.event.inputs.release_version }}-x86_64-pc-windows-gnu.zip
+          asset_name: rust-${{ github.event.inputs.release_version }}-x86_64-pc-windows-gnu.zip
+          asset_content_type: application/x-tar
       - name: Unmount local drive
         id: unount_path
         continue-on-error: true