diff --git a/.github/workflows/migrate-images.yml b/.github/workflows/migrate-images.yml index a947ee059..b587ffc76 100644 --- a/.github/workflows/migrate-images.yml +++ b/.github/workflows/migrate-images.yml @@ -67,7 +67,7 @@ jobs: --no-dry-run \ --base-ref HEAD~1 - - name: Commit updated YAMLs and remove temporary assets (push to main) + - name: Amend commit – update YAMLs and remove tmp assets (push to main) if: github.event_name == 'push' run: | git config user.name "github-actions[bot]" @@ -75,11 +75,11 @@ jobs: git rm -rf --ignore-unmatch data/tmp/ git add -u data/materials/ if git diff --staged --quiet; then - echo "No changes to commit" + echo "No changes to amend" else - git commit -m "chore: migrate images to GCS and remove temporary assets [skip ci]" + git commit --amend --no-edit n=0 - until git pull --rebase && git push; do + until git push --force-with-lease; do n=$((n+1)) if [ $n -ge 3 ]; then echo "Push failed after 3 attempts" diff --git a/data/materials/generic/pla-army-green.yaml b/data/materials/generic/pla-army-green.yaml index ca41c5da4..45ef75afa 100644 --- a/data/materials/generic/pla-army-green.yaml +++ b/data/materials/generic/pla-army-green.yaml @@ -11,7 +11,7 @@ primary_color: color_rgba: '#1f6b20ff' secondary_colors: [] photos: -- url: https://files.openprinttag.org/generic/pla-army-green/20260205110532.jpg +- url: /tmp/assets/generic/pla-army-green/20260205110600.jpg type: unspecified properties: {} uuid: c6753d1b-4618-505a-aa5a-0676e55e9545 diff --git a/data/tmp/assets/generic/pla-army-green/20260205110600.jpg b/data/tmp/assets/generic/pla-army-green/20260205110600.jpg new file mode 100644 index 000000000..c4a070dd3 Binary files /dev/null and b/data/tmp/assets/generic/pla-army-green/20260205110600.jpg differ