From dd19d748acc3a76875a9dfbcd8824d0f5a632614 Mon Sep 17 00:00:00 2001 From: Ben Allfree Date: Tue, 2 Dec 2025 21:09:32 -0800 Subject: [PATCH] dev: build test --- .github/workflows/custom_build_test.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/custom_build_test.yml b/.github/workflows/custom_build_test.yml index 29d0094..1cded97 100644 --- a/.github/workflows/custom_build_test.yml +++ b/.github/workflows/custom_build_test.yml @@ -212,17 +212,17 @@ jobs: --exclude='*.bin' \ --exclude='*.uf2' \ --exclude='build' \ - -czf "source-${{ inputs.build_hash }}.tar.gz" \ + -czf "source-${{ inputs.build_hash }}-${{ github.run_id }}.tar.gz" \ -C firmware . update_status uploading_source_archive - SOURCE_ARCHIVE_PATH="/source-${{ inputs.build_hash }}.tar.gz" - SOURCE_OBJECT_PATH="${R2_BUCKET_NAME}/source-${{ inputs.build_hash }}.tar.gz" + SOURCE_ARCHIVE_PATH="/source-${{ inputs.build_hash }}-${{ github.run_id }}.tar.gz" + SOURCE_OBJECT_PATH="${R2_BUCKET_NAME}/source-${{ inputs.build_hash }}-${{ github.run_id }}.tar.gz" # Upload source archive to R2 wrangler r2 object put "$SOURCE_OBJECT_PATH" \ - --file "source-${{ inputs.build_hash }}.tar.gz" --remote + --file "source-${{ inputs.build_hash }}-${{ github.run_id }}.tar.gz" --remote update_status uploaded_source "" "$SOURCE_ARCHIVE_PATH" @@ -268,18 +268,18 @@ jobs: update_status uploading_firmware # Create tar.gz archive of firmware files from the target's build directory - tar -czf "firmware-${{ inputs.build_hash }}.tar.gz" -C ".pio/build/${{ inputs.target }}" firmware*.* + tar -czf "firmware-${{ inputs.build_hash }}-${{ github.run_id }}.tar.gz" -C ".pio/build/${{ inputs.target }}" firmware*.* # Determine artifact path (with leading slash for storage) - ARTIFACT_PATH="/firmware-${{ inputs.build_hash }}.tar.gz" + ARTIFACT_PATH="/firmware-${{ inputs.build_hash }}-${{ github.run_id }}.tar.gz" # Object path for wrangler is bucket/key without leading slash - OBJECT_PATH="${R2_BUCKET_NAME}/firmware-${{ inputs.build_hash }}.tar.gz" + OBJECT_PATH="${R2_BUCKET_NAME}/firmware-${{ inputs.build_hash }}-${{ github.run_id }}.tar.gz" # Upload to R2 with hash and tar.gz extension wrangler r2 object put "$OBJECT_PATH" \ - --file "firmware-${{ inputs.build_hash }}.tar.gz" --remote + --file "firmware-${{ inputs.build_hash }}-${{ github.run_id }}.tar.gz" --remote - SOURCE_ARCHIVE_PATH="/source-${{ inputs.build_hash }}.tar.gz" + SOURCE_ARCHIVE_PATH="/source-${{ inputs.build_hash }}-${{ github.run_id }}.tar.gz" update_status uploaded "$ARTIFACT_PATH" "$SOURCE_ARCHIVE_PATH" - name: Update Build Status - Final