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

…' into staging
Roll20 · Oct 2, 2023 · 868b10a · 868b10a
2 parents d524994 + c71c748
commit 868b10a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/use-sdk.yml b/.github/workflows/use-sdk.yml
@@ -55,6 +55,7 @@ jobs:
         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:
     name: Process HTML/CSS for all character sheets (force-update)

diff --git a/contrib/sheet-pixie/index.ts b/contrib/sheet-pixie/index.ts
@@ -41,7 +41,7 @@ async function onSheetChange(sheetDir: string) {
   const cssRes = await tryCss(Bun.file(`${sheetDir}/${cssPath}`), advanced);
   const { css, rawCss } = cssRes;
 
-  const distDir = `${process.env.RUNNER_TEMP || '/tmp'}/${sheetDir}/dist`;
+  const distDir = `${process.env.DEST_DIR || '/tmp'}/roll20/${sheetDir}/dist`;
   rmSync(distDir, { recursive: true, force: true });
   mkdirSync(distDir, { recursive: true });
   await Promise.all([