From 6dc3fedf8cc436013a939689e2ca5e30d004d226 Mon Sep 17 00:00:00 2001 From: Mary Date: Sat, 20 Mar 2021 21:46:49 +0100 Subject: [PATCH] ci: Tune Github Actions artifacts Let's github actions pack zip for all os, put the real name in the output artifact and ensure to only publish the Ryujinx project --- .github/workflows/build.yml | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 26b8781c2..621477dee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,8 @@ name: Build job on: push: - branches: [ master ] + # branches: [ master ] + branches: [ ci/artifact-tuning ] paths-ignore: - '.github/*' - '.github/ISSUE_TEMPLATE/**' @@ -28,7 +29,7 @@ jobs: - os: ubuntu-latest OS_NAME: Linux x64 DOTNET_RUNTIME_IDENTIFIER: linux-x64 - RELEASE_ZIP_OS_NAME: linux_x64.tar.gz + RELEASE_ZIP_OS_NAME: linux_x64 - os: macOS-latest OS_NAME: MacOS x64 @@ -59,22 +60,11 @@ jobs: - name: Test run: dotnet test -c "${{ matrix.configuration }}" - name: Publish - run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.DOTNET_RUNTIME_IDENTIFIER }}" -o ./publish /p:Version="1.0.0" /p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" /p:ExtraDefineConstants=DISABLE_UPDATER - if: github.event_name == 'pull_request' - - name: Packing artifacts (Normal) - run: | - mkdir output - 7z a "./output/ryujinx-${{ matrix.configuration }}-1.0.0+${{ steps.git_short_hash.outputs.result }}-${{ matrix.RELEASE_ZIP_OS_NAME }}.zip" ./publish - if: github.event_name == 'pull_request' && matrix.os != 'ubuntu-latest' - - name: Packing artifacts (Linux only) - run: | - mkdir output - 7z a "ryujinx-${{ matrix.configuration }}-1.0.0+${{ steps.git_short_hash.outputs.result }}-${{ matrix.RELEASE_ZIP_OS_NAME }}.tar" ./publish - 7z a "./output/ryujinx-${{ matrix.configuration }}-1.0.0+${{ steps.git_short_hash.outputs.result }}-${{ matrix.RELEASE_ZIP_OS_NAME }}.tar.gz" "ryujinx-${{ matrix.configuration }}-1.0.0+${{ steps.git_short_hash.outputs.result }}-${{ matrix.RELEASE_ZIP_OS_NAME }}.tar" - if: github.event_name == 'pull_request' && matrix.os == 'ubuntu-latest' + run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.DOTNET_RUNTIME_IDENTIFIER }}" -o ./publish /p:Version="1.0.0" /p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" /p:ExtraDefineConstants=DISABLE_UPDATER Ryujinx + #if: github.event_name == 'pull_request' - name: Upload artifacts uses: actions/upload-artifact@v2 with: - name: Output ${{ matrix.OS_NAME }} (${{ matrix.configuration }}) - path: output - if: github.event_name == 'pull_request' + name: ryujinx-${{ matrix.configuration }}-1.0.0+${{ steps.git_short_hash.outputs.result }}-${{ matrix.RELEASE_ZIP_OS_NAME }} + path: publish + #if: github.event_name == 'pull_request'