diff --git a/.github/workflows/migrate-images.yml b/.github/workflows/migrate-images.yml index cd7c09743..a947ee059 100644 --- a/.github/workflows/migrate-images.yml +++ b/.github/workflows/migrate-images.yml @@ -78,6 +78,14 @@ jobs: echo "No changes to commit" else git commit -m "chore: migrate images to GCS and remove temporary assets [skip ci]" - git pull --rebase - git push + n=0 + until git pull --rebase && git push; do + n=$((n+1)) + if [ $n -ge 3 ]; then + echo "Push failed after 3 attempts" + exit 1 + fi + echo "Retry $n/3..." + sleep 5 + done fi diff --git a/data/materials/generic/pla-army-green.yaml b/data/materials/generic/pla-army-green.yaml index 0c060e27c..0c4410a45 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: /tmp/assets/generic/pla-army-green/20260205111104.jpg +- url: /tmp/assets/generic/pla-army-green/20260205110532.jpg type: unspecified properties: {} uuid: c6753d1b-4618-505a-aa5a-0676e55e9545 diff --git a/data/tmp/assets/generic/pla-army-green/20260205110532.jpg b/data/tmp/assets/generic/pla-army-green/20260205110532.jpg new file mode 100644 index 000000000..372877c4d Binary files /dev/null and b/data/tmp/assets/generic/pla-army-green/20260205110532.jpg differ diff --git a/data/tmp/assets/generic/pla-army-green/20260205111104.jpg b/data/tmp/assets/generic/pla-army-green/20260205111104.jpg deleted file mode 100644 index 0014f2b37..000000000 Binary files a/data/tmp/assets/generic/pla-army-green/20260205111104.jpg and /dev/null differ