Update build_gcc.yaml

dkurt · Jan 9, 2025 · 40f0d1f · 40f0d1f
1 parent 0b06e50
commit 40f0d1f
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/.github/workflows/build_gcc.yaml b/.github/workflows/build_gcc.yaml
@@ -6,7 +6,7 @@ jobs:
   build_with_gcc:
     strategy:
       matrix:
-        os: [ubuntu-22.04, ubuntu-24.04]
+        os: [ubuntu-22.04]
     runs-on: ${{ matrix.os }}
     env:
       PACKAGESDIR: ${{ github.workspace }}/packages
@@ -93,8 +93,8 @@ jobs:
         cp artifacts/packages/Release/Shipping/Microsoft.NETCore.App.Runtime.linux-riscv64.*.nupkg ${PACKAGESDIR}
         mkdir -p ${DOWNLOADDIR}/Runtime/${RUNTIME_VERSION}
         cp artifacts/packages/Release/Shipping/dotnet-runtime-*-linux-riscv64.tar.gz ${DOWNLOADDIR}/Runtime/${RUNTIME_VERSION}
-        cp artifacts/packages/Release/Shipping/Microsoft.NETCore.App.Host.linux-riscv64.*.nupkg ${OUTPUTDIR}
-        cp artifacts/packages/Release/Shipping/Microsoft.NETCore.App.Runtime.linux-riscv64.*.nupkg ${OUTPUTDIR}
+        cp artifacts/packages/Release/Shipping/Microsoft.NETCore.App.Host.linux-riscv64.*.nupkg ${PACKAGESDIR}
+        cp artifacts/packages/Release/Shipping/Microsoft.NETCore.App.Runtime.linux-riscv64.*.nupkg ${PACKAGESDIR}
         cd .. && rm -r runtime
 
     - name: Build aspnetcore
@@ -108,7 +108,7 @@ jobs:
         mkdir -p ${DOWNLOADDIR}/aspnetcore/Runtime/${ASPNETCORE_VERSION}
         cp artifacts/installers/Release/aspnetcore-runtime-*-linux-riscv64.tar.gz ${DOWNLOADDIR}/aspnetcore/Runtime/${ASPNETCORE_VERSION}/aspnetcore-runtime-9.0.0-linux-riscv64.tar.gz
         cp artifacts/installers/Release/aspnetcore_base_runtime.version ${DOWNLOADDIR}/aspnetcore/Runtime/${ASPNETCORE_VERSION}
-        cp artifacts/packages/Release/Shipping/Microsoft.AspNetCore.App.Runtime.linux-riscv64.*.nupkg ${OUTPUTDIR}
+        cp artifacts/packages/Release/Shipping/Microsoft.AspNetCore.App.Runtime.linux-riscv64.*.nupkg ${PACKAGESDIR}
         cp artifacts/packages/Release/Shipping/Microsoft.DotNet.Web.*.nupkg ${PACKAGESDIR}
         cd .. && rm -r aspnetcore
 
@@ -128,13 +128,20 @@ jobs:
         cp artifacts/packages/Release/Shipping/dotnet-sdk-*-linux-riscv64.tar.gz ${OUTPUTDIR}/dotnet-sdk-${SDK_VERSION}-linux-riscv64-gcc-${{ matrix.os }}.tar.gz
         cp artifacts/packages/Release/Shipping/dotnet-sdk-*-linux-riscv64.tar.gz.sha512 ${OUTPUTDIR}/dotnet-sdk-${SDK_VERSION}-linux-riscv64-gcc-${{ matrix.os }}.tar.gz.sha512
 
-    - name: Upload .NET
+    - name: Upload SDK
       uses: actions/upload-artifact@v4
       if: startsWith(github.ref, 'refs/tags/') != true
       with:
         name: "dotnet-sdk-linux-riscv64-gcc-${{ matrix.os }}"
         path: "${{ github.workspace }}/output/dotnet-sdk-*.tar.gz*"
 
+    - name: Upload packages
+      uses: actions/upload-artifact@v4
+      if: startsWith(github.ref, 'refs/tags/') != true
+      with:
+        name: "packages-gcc-${{ matrix.os }}"
+        path: "${{ github.workspace }}/packages/*"
+
     - name: Release
       uses: softprops/action-gh-release@v2
       if: startsWith(github.ref, 'refs/tags/')