From cf48e908c80c45801503f3a8154db047862136e4 Mon Sep 17 00:00:00 2001 From: EgorPopelyaev Date: Tue, 3 Dec 2024 16:40:49 +0100 Subject: [PATCH] chnage artefacts path for s3 upload --- .github/scripts/release/release_lib.sh | 2 +- .../workflows/release-reusable-promote-to-final.yml | 4 +++- .github/workflows/release-reusable-rc-buid.yml | 2 +- .github/workflows/release-reusable-s3-upload.yml | 12 ++---------- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/scripts/release/release_lib.sh b/.github/scripts/release/release_lib.sh index 43227180cb7c..a4751008ea3e 100644 --- a/.github/scripts/release/release_lib.sh +++ b/.github/scripts/release/release_lib.sh @@ -132,7 +132,7 @@ upload_s3_release() { echo "Current content, should be empty on new uploads:" aws s3 ls "s3://releases.parity.io/${product}/${version}/${target}" --recursive --human-readable --summarize || true echo "Content to be uploaded:" - artifacts="artifacts/$product/" + artifacts="release-artifacts/$target/$product/" ls "$artifacts" aws s3 sync --acl public-read "$artifacts" "s3://releases.parity.io/${product}/${version}/${target}" echo "Uploaded files:" diff --git a/.github/workflows/release-reusable-promote-to-final.yml b/.github/workflows/release-reusable-promote-to-final.yml index 8c3e7e620817..a9cdc65fa17a 100644 --- a/.github/workflows/release-reusable-promote-to-final.yml +++ b/.github/workflows/release-reusable-promote-to-final.yml @@ -43,8 +43,10 @@ jobs: - name: Prepare final tag id: prepare_final_tag + shell: bash run: | - echo "FINAL_TAG=${${{ inputs.release_tag }}%-rc*}" >> $GITHUB_OUTPUT + tag="${{ inputs.release_tag }}%-rc*" + echo "FINAL_TAG=${tag}" >> $GITHUB_OUTPUT - name: Fetch binaries from s3 based on version run: | diff --git a/.github/workflows/release-reusable-rc-buid.yml b/.github/workflows/release-reusable-rc-buid.yml index 4b7aef937704..0222b2aa91e2 100644 --- a/.github/workflows/release-reusable-rc-buid.yml +++ b/.github/workflows/release-reusable-rc-buid.yml @@ -285,7 +285,7 @@ jobs: - name: Upload ${{inputs.package }} artifacts uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 with: - name: ${{ inputs.package }} + name: ${{ inputs.package }}_${{ inputs.target }} path: target/production overwrite: true diff --git a/.github/workflows/release-reusable-s3-upload.yml b/.github/workflows/release-reusable-s3-upload.yml index f4187bf9cf74..48c7e53c6c8f 100644 --- a/.github/workflows/release-reusable-s3-upload.yml +++ b/.github/workflows/release-reusable-s3-upload.yml @@ -40,18 +40,10 @@ jobs: uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Download amd64 artifacts - if: ${{ inputs.target == 'x86_64-unknown-linux-gnu' }} uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 with: - name: ${{ inputs.package }} - path: artifacts/${{ inputs.package }} - - - name: Download arm artifacts - if: ${{ inputs.target == 'aarch64-apple-darwin' }} - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 - with: - name: ${{ inputs.package }}_aarch64-apple-darwin - path: artifacts/${{ inputs.package }} + name: ${{ inputs.package }}_${{ inputs.target }} + path: release-artifacts/${{ inputs.target }}/${{ inputs.package }} - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2