From 3461479701d9b0b0eabe12b2c5ac72e820f93beb Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 8 Jan 2024 13:10:37 +0000 Subject: [PATCH] Fixed artifact name collisions I thought these would be namespaced per workflow instance :( --- .github/workflows/build.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3512bc64..71b42f77 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,7 +45,7 @@ jobs: uses: actions/upload-artifact@v4 if: always() with: - name: Linux + name: Linux-PM${{ inputs.pm-version-major }} path: | ./PHP-Linux-x86_64*.tar.gz install.log @@ -60,7 +60,7 @@ jobs: uses: actions/upload-artifact@v4 if: failure() with: - name: Linux-workspace + name: Linux-workspace-PM${{ inputs.pm-version-major }} path: | workspace.tar.gz if-no-files-found: error @@ -99,7 +99,7 @@ jobs: uses: actions/upload-artifact@v4 if: always() with: - name: MacOS + name: MacOS-PM${{ inputs.pm-version-major }} path: | ./PHP-MacOS-x86_64*.tar.gz install.log @@ -114,7 +114,7 @@ jobs: uses: actions/upload-artifact@v4 if: failure() with: - name: MacOS-workspace + name: MacOS-workspace-PM${{ inputs.pm-version-major }} path: | workspace.tar.gz if-no-files-found: error @@ -147,7 +147,7 @@ jobs: uses: actions/upload-artifact@v4 if: always() with: - name: Windows + name: Windows-PM${{ inputs.pm-version-major }} path: | PHP-Windows-x64*.zip compile.log @@ -210,9 +210,9 @@ jobs: uses: ncipollo/release-action@v1.13.0 with: artifacts: | - ${{ github.workspace }}/Linux/*.tar.gz - ${{ github.workspace }}/MacOS/*.tar.gz - ${{ github.workspace }}/Windows/*.zip + ${{ github.workspace }}/Linux-PM${{ inputs.pm-version-major }}/*.tar.gz + ${{ github.workspace }}/MacOS-PM${{ inputs.pm-version-major }}/*.tar.gz + ${{ github.workspace }}/Windows-PM${{ inputs.pm-version-major }}/*.zip makeLatest: ${{ github.ref_name == github.event.repository.default_branch }} name: PHP for PocketMine-MP ${{ inputs.pm-version.major }}.x - Latest (Build ${{ github.run_number }}) tag: php-pm${{ inputs.pm-version-major }}-latest @@ -225,9 +225,9 @@ jobs: uses: ncipollo/release-action@v1.13.0 with: artifacts: | - ${{ github.workspace }}/Linux/*.tar.gz - ${{ github.workspace }}/MacOS/*.tar.gz - ${{ github.workspace }}/Windows/*.zip + ${{ github.workspace }}/Linux-PM${{ inputs.pm-version-major }}/*.tar.gz + ${{ github.workspace }}/MacOS-PM${{ inputs.pm-version-major }}/*.tar.gz + ${{ github.workspace }}/Windows-PM${{ inputs.pm-version-major }}/*.zip makeLatest: ${{ github.ref_name == github.event.repository.default_branch }} name: PHP ${{ steps.version.outputs.PHP_VERSION }} for PocketMine-MP ${{ inputs.pm-version.major }}.x - Latest (Build ${{ github.run_number }}) tag: php-${{ steps.version.outputs.PHP_VERSION }}-pm${{ inputs.pm-version-major }}-latest @@ -241,9 +241,9 @@ jobs: uses: ncipollo/release-action@v1.13.0 with: artifacts: | - ${{ github.workspace }}/Linux/*.tar.gz - ${{ github.workspace }}/MacOS/*.tar.gz - ${{ github.workspace }}/Windows/*.zip + ${{ github.workspace }}/Linux-PM${{ inputs.pm-version-major }}/*.tar.gz + ${{ github.workspace }}/MacOS-PM${{ inputs.pm-version-major }}/*.tar.gz + ${{ github.workspace }}/Windows-PM${{ inputs.pm-version-major }}/*.zip makeLatest: false name: PHP ${{ steps.version.outputs.PHP_VERSION }} for PocketMine-MP ${{ inputs.pm-version.major }}.x - (Build ${{ github.run_number }}) tag: php-${{ steps.version.outputs.PHP_VERSION }}-pm${{ inputs.pm-version-major }}-build-${{ github.run_number }}