diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 41c9ad0..6a39be4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -81,15 +81,10 @@ jobs: html_url=$(grep -Po -m 1 '(?:\G(?!^)",|"html_url":\s*)\s*"\K[^"]+' release.json) echo "Created release [${{ env.version_tag }}]($html_url)" >> $GITHUB_STEP_SUMMARY - - name: Download merged.hex + - name: Download artifacts uses: actions/download-artifact@v4 with: - name: ${{ env.BRANCH }}_merged.hex - - - name: Download app_update.bin - uses: actions/download-artifact@v4 - with: - name: ${{ env.BRANCH }}_app_update.bin + merge-multiple: true - name: Display structure of downloaded files run: ls -R @@ -100,7 +95,6 @@ jobs: OWNER: ${{ github.repository_owner }} REPO: ${{ github.event.repository.name }} run: | - ls -R curl -L \ -X POST \ -H "Accept: application/vnd.github+json" \ @@ -108,7 +102,7 @@ jobs: -H "X-GitHub-Api-Version: 2022-11-28" \ -H "Content-Type: application/octet-stream" \ "${{ env.upload_url }}?name=${{ env.BRANCH }}_merged.hex" \ - --data-binary "@${{ env.BRANCH }}_merged.hex" + --data-binary "@merged.hex" echo 'Uploaded build artifact ${{ env.BRANCH }}_merged.hex as asset to release' >> $GITHUB_STEP_SUMMARY - name: Upload merged_sha256.sum @@ -117,7 +111,7 @@ jobs: OWNER: ${{ github.repository_owner }} REPO: ${{ github.event.repository.name }} run: | - sha256sum ${{ env.BRANCH }}_merged.hex > ${{ env.BRANCH }}_merged_sha256.sum + sha256sum merged.hex > merged_sha256.sum curl -L \ -X POST \ -H "Accept: application/vnd.github+json" \ @@ -125,7 +119,7 @@ jobs: -H "X-GitHub-Api-Version: 2022-11-28" \ -H "Content-Type: application/octet-stream" \ "${{ env.upload_url }}?name=${{ env.BRANCH }}_merged_sha256.sum" \ - --data-binary "@${{ env.BRANCH }}_merged_sha256.sum" + --data-binary "@merged_sha256.sum" echo 'Uploaded build artifact ${{ env.BRANCH }}_merged_sha256.sum as asset to release' >> $GITHUB_STEP_SUMMARY - name: Upload app_update.bin @@ -141,7 +135,7 @@ jobs: -H "X-GitHub-Api-Version: 2022-11-28" \ -H "Content-Type: application/octet-stream" \ "${{ env.upload_url }}?name=${{ env.BRANCH }}_app_update.bin" \ - --data-binary "@${{ env.BRANCH }}_app_update.bin" + --data-binary "@app_update.bin" echo 'Uploaded build artifact ${{ env.BRANCH }}_app_update.bin as asset to release' >> $GITHUB_STEP_SUMMARY - name: Upload app_update_sha256.sum @@ -150,7 +144,7 @@ jobs: OWNER: ${{ github.repository_owner }} REPO: ${{ github.event.repository.name }} run: | - sha256sum ${{ env.BRANCH }}_app_update.bin > ${{ env.BRANCH }}_app_update_sha256.sum + sha256sum app_update.bin > app_update_sha256.sum curl -L \ -X POST \ -H "Accept: application/vnd.github+json" \ @@ -158,5 +152,5 @@ jobs: -H "X-GitHub-Api-Version: 2022-11-28" \ -H "Content-Type: application/octet-stream" \ "${{ env.upload_url }}?name=${{ env.BRANCH }}_app_update_sha256.sum" \ - --data-binary "@${{ env.BRANCH }}_app_update_sha256.sum" + --data-binary "@app_update_sha256.sum" echo 'Uploaded build artifact ${{ env.BRANCH }}_app_update_sha256.sum as asset to release' >> $GITHUB_STEP_SUMMARY