From c883f899bbc92ced9446c64635756334efc65552 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Fri, 23 Feb 2024 13:28:45 -0500 Subject: [PATCH] Build artifact before upload --- .github/workflows/build_check.yml | 12 +++++------- .github/workflows/build_ui.yml | 12 +++++------- CHANGELIST.md | 1 + 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build_check.yml b/.github/workflows/build_check.yml index e4efd4b0..239bec79 100644 --- a/.github/workflows/build_check.yml +++ b/.github/workflows/build_check.yml @@ -31,22 +31,20 @@ jobs: - name: Build run: dotnet publish ${{ matrix.project }}/${{ matrix.project }}.csproj -f ${{ matrix.framework }} -r ${{ matrix.runtime }} -c ${{ matrix.conf == 'Release' && 'Release -p:DebugType=None -p:DebugSymbols=false' || 'Debug'}} --self-contained true --version-suffix ${{ github.sha }} ${{ (startsWith(matrix.framework, 'net5') || startsWith(matrix.framework, 'net6') || startsWith(matrix.framework, 'net7') || startsWith(matrix.framework, 'net8')) && '-p:PublishSingleFile=true' || ''}} + - name: Archive build + run: zip -r ${{ matrix.project }}_${{ matrix.framework }}_${{ matrix.runtime }}_${{ matrix.conf }}.zip ${{ matrix.project }}/bin/${{ matrix.conf }}/${{ matrix.framework }}/${{ matrix.runtime }}/publish/ + - name: Upload build uses: actions/upload-artifact@v4 with: name: ${{ matrix.project }}_${{ matrix.framework }}_${{ matrix.runtime }}_${{ matrix.conf }} - path: ${{ matrix.project }}/bin/${{ matrix.conf }}/${{ matrix.framework }}/${{ matrix.runtime }}/publish/ - - - name: Process artifacts - uses: actions/download-artifact@v4.1.2 - with: - path: zip + path: ${{ matrix.project }}_${{ matrix.framework }}_${{ matrix.runtime }}_${{ matrix.conf }}.zip - name: Upload to rolling uses: ncipollo/release-action@v1.14.0 with: allowUpdates: True - artifacts: 'zip/*' + artifacts: ${{ matrix.project }}_${{ matrix.framework }}_${{ matrix.runtime }}_${{ matrix.conf }}.zip generateReleaseNotes: True omitBody: True omitBodyDuringUpdate: True diff --git a/.github/workflows/build_ui.yml b/.github/workflows/build_ui.yml index 228b7ca7..05fda8e5 100644 --- a/.github/workflows/build_ui.yml +++ b/.github/workflows/build_ui.yml @@ -37,23 +37,21 @@ jobs: unzip redumper-2024.01.08_build311-win64.zip mkdir -p MPF/bin/${{ matrix.conf }}/${{ matrix.framework }}/${{ matrix.runtime }}/publish/Programs/Redumper mv redumper-2024.01.08_build311-win64/bin/redumper.exe MPF/bin/${{ matrix.conf }}/${{ matrix.framework }}/${{ matrix.runtime }}/publish/Programs/Redumper/ + + - name: Archive build + run: zip -r ${{ matrix.project }}_${{ matrix.framework }}_${{ matrix.runtime }}_${{ matrix.conf }}.zip ${{ matrix.project }}/bin/${{ matrix.conf }}/${{ matrix.framework }}/${{ matrix.runtime }}/publish/ - name: Upload build uses: actions/upload-artifact@v4 with: name: ${{ matrix.project }}_${{ matrix.framework }}_${{ matrix.runtime }}_${{ matrix.conf }} - path: ${{ matrix.project }}/bin/${{ matrix.conf }}/${{ matrix.framework }}/${{ matrix.runtime }}/publish/ - - - name: Process artifacts - uses: actions/download-artifact@v4.1.2 - with: - path: zip + path: ${{ matrix.project }}_${{ matrix.framework }}_${{ matrix.runtime }}_${{ matrix.conf }}.zip - name: Upload to rolling uses: ncipollo/release-action@v1.14.0 with: allowUpdates: True - artifacts: 'zip/*' + artifacts: ${{ matrix.project }}_${{ matrix.framework }}_${{ matrix.runtime }}_${{ matrix.conf }}.zip generateReleaseNotes: True omitBody: True omitBodyDuringUpdate: True diff --git a/CHANGELIST.md b/CHANGELIST.md index 54de0345..e5ebaad7 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -29,6 +29,7 @@ - Try using download-artifact - Download all artifacts? - Use newer download version +- Build artifact before upload ### 3.1.1 (2024-02-20)