From 3777bd8dc15258df27fde881f0db71d16ac28de3 Mon Sep 17 00:00:00 2001 From: Wil Wade Date: Tue, 5 Mar 2024 13:58:02 -0500 Subject: [PATCH] Fix actions issues --- .github/workflows/release.yml | 25 +++++++++++++++---------- .github/workflows/verify-pr-commit.yml | 20 +++++++++++++------- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ef411d506e..56e85bf38c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -236,7 +236,7 @@ jobs: - name: Upload Artifacts uses: actions/upload-artifact@v4 with: - name: artifacts-${{github.run_id}} + name: artifacts-binary-${{matrix.network}}-${-${{github.run_id}} path: | ${{env.BIN_DIR}}/${{env.RELEASE_BIN_FILENAME}} ${{env.BIN_DIR}}/${{env.RELEASE_BIN_FILENAME}}.sha256 @@ -355,7 +355,7 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v4 with: - name: artifacts-${{github.run_id}} + name: artifacts-wasm-${{matrix.network}}-${{github.run_id}} path: ${{env.WASM_DIR}}/${{env.RELEASE_WASM_FILENAME}} if-no-files-found: error @@ -421,7 +421,7 @@ jobs: id: download-binaries uses: actions/download-artifact@v4 with: - name: artifacts-${{github.run_id}} + pattern: artifacts-binary-*-${{github.run_id}} path: . - name: List Downloaded Binaries run: | @@ -477,8 +477,9 @@ jobs: id: download-binaries uses: actions/download-artifact@v4 with: - name: artifacts-${{github.run_id}} + name: artifacts-binary-*-${{github.run_id}} path: . + merge-multiple: true - name: List Downloaded Binaries run: | download_dir=${{steps.download-binaries.outputs.download-path}} @@ -540,8 +541,9 @@ jobs: - name: Download Test Binary uses: actions/download-artifact@v4 with: - name: artifacts-${{github.run_id}} + pattern: artifacts-binary-*-${{github.run_id}} path: ${{env.TEST_DOWNLOAD_DIR}} + merge-multiple: true - name: Rename and Move Binaries run: | mkdir -p ${{env.BIN_DIR}} @@ -618,9 +620,9 @@ jobs: run: | cat ${{env.OUTPUT_FILENAME}} - name: Upload Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: artifacts-${{github.run_id}} + name: artifacts-metadata-${{github.run_id}} path: ${{env.OUTPUT_DIR}}/${{env.OUTPUT_FILENAME}} if-no-files-found: error - name: Stop Local Nodes @@ -727,8 +729,9 @@ jobs: id: download uses: actions/download-artifact@v4 with: - name: artifacts-${{github.run_id}} + pattern: artifacts-*-${{github.run_id}} path: /tmp + merge-multiple: true - name: List Downloaded Artifacts working-directory: /tmp run: | @@ -855,8 +858,9 @@ jobs: id: download-binaries uses: actions/download-artifact@v4 with: - name: artifacts-${{github.run_id}} + pattern: artifacts-binary-*-${{github.run_id}} path: . + merge-multiple: true - name: List Downloaded Binaries run: | download_dir=${{steps.download-binaries.outputs.download-path}} @@ -953,8 +957,9 @@ jobs: id: download-binaries uses: actions/download-artifact@v4 with: - name: artifacts-${{github.run_id}} + pattern: artifacts-binary-*-${{github.run_id}} path: . + merge-multiple: true - name: List Downloaded Binaries run: | download_dir=${{steps.download-binaries.outputs.download-path}} diff --git a/.github/workflows/verify-pr-commit.yml b/.github/workflows/verify-pr-commit.yml index 77acf7c73d..f296d2cc88 100644 --- a/.github/workflows/verify-pr-commit.yml +++ b/.github/workflows/verify-pr-commit.yml @@ -170,7 +170,7 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v4 with: - name: artifacts-${{github.run_id}} + name: artifacts-binary-${{matrix.network}}-${-${{github.run_id}} path: ${{env.BIN_DIR}}/${{env.FINAL_BIN_FILENAME}}* if-no-files-found: error @@ -424,8 +424,9 @@ jobs: id: download-binaries uses: actions/download-artifact@v4 with: - name: artifacts-${{github.run_id}} + pattern: artifacts-binary-*-${{github.run_id}} path: ${{env.BIN_DIR}} + merge-multiple: true - name: List Downloaded Binaries run: | download_dir=${{steps.download-binaries.outputs.download-path}} @@ -472,8 +473,9 @@ jobs: id: download-binaries uses: actions/download-artifact@v4 with: - name: artifacts-${{github.run_id}} + pattern: artifacts-binary-*-${{github.run_id}} path: ${{env.BIN_DIR}} + merge-multiple: true - name: List Downloaded Binaries run: | download_dir=${{steps.download-binaries.outputs.download-path}} @@ -557,8 +559,9 @@ jobs: id: download-binaries uses: actions/download-artifact@v4 with: - name: artifacts-${{github.run_id}} + pattern: artifacts-binary-*-${{github.run_id}} path: ${{env.BIN_DIR}} + merge-multiple: true - name: List Downloaded Binaries run: | download_dir=${{steps.download-binaries.outputs.download-path}} @@ -591,8 +594,9 @@ jobs: id: download-binaries uses: actions/download-artifact@v4 with: - name: artifacts-${{github.run_id}} + pattern: artifacts-binary-*-${{github.run_id}} path: ${{env.BIN_DIR}} + merge-multiple: true - name: List Downloaded Binaries run: | download_dir=${{steps.download-binaries.outputs.download-path}} @@ -671,8 +675,9 @@ jobs: id: download-binaries uses: actions/download-artifact@v4 with: - name: artifacts-${{github.run_id}} + pattern: artifacts-binary-*-${{github.run_id}} path: ${{env.BIN_DIR}} + merge-multiple: true - name: List Downloaded Binaries run: | download_dir=${{steps.download-binaries.outputs.download-path}} @@ -746,8 +751,9 @@ jobs: id: download-binaries uses: actions/download-artifact@v4 with: - name: artifacts-${{github.run_id}} + pattern: artifacts-binary-*-${{github.run_id}} path: ${{env.BIN_DIR}} + merge-multiple: true - name: List Downloaded Binaries run: | download_dir=${{steps.download-binaries.outputs.download-path}}