Merge branch 'feature/CSC-1652-gh-action-for-processing-custom-sheets…

…' into staging
Roll20 · Oct 2, 2023 · 2b6f989 · 2b6f989
2 parents 868b10a + 9de8e91
commit 2b6f989
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/.github/workflows/use-sdk.yml b/.github/workflows/use-sdk.yml
@@ -54,7 +54,6 @@ jobs:
       - run: bun install
         working-directory: contrib/sheet-pixie
       - run: bun run contrib/sheet-pixie/index.ts ${{ needs.changes.outputs.sheet-json }}
-      - run: gcloud storage rsync --project=roll20-actual ${{ runner.temp }} "gs://roll20-cdn/$CDN_SHEETS_FOLDER" --cache-control='no-cache' --recursive
       - run: gcloud storage rsync --project=roll20-actual ${{ runner.temp }}/roll20 "gs://roll20-cdn/$CDN_SHEETS_FOLDER" --cache-control='no-cache' --recursive
 
   force-update:
@@ -83,4 +82,4 @@ jobs:
       - run: bun install
         working-directory: contrib/sheet-pixie
       - run: make all
-      - run: bash force-update.sh ${{ runner.temp }}
+      - run: gcloud storage rsync --project=roll20-actual ${{ runner.temp }}/roll20 "gs://roll20-cdn/$CDN_SHEETS_FOLDER" --delete-unmatched-destination-objects --cache-control='no-cache' --recursive
diff --git a/force-update.sh b/force-update.sh