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

…' into staging

.github/workflows/use-sdk.yml

@@ -36,7 +36,6 @@ jobs:
     env:
       NPM_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
       CDN_SHEETS_FOLDER: ${{ vars.CDN_SHEETS_FOLDER }}
-      DEST_DIR: /tmp
     steps:
       - uses: actions/checkout@v3
       - id: 'auth'
@@ -62,8 +61,8 @@ jobs:
           command: install
           args: fd-find
       - run: make clean
-      - run: DEST_DIR=$RUNNER_TEMP bun run contrib/sheet-pixie/index.ts ${{ needs.changes.outputs.sheet-json }}
-      - run: bash update.sh
+      - run: bun run contrib/sheet-pixie/index.ts ${{ needs.changes.outputs.sheet-json }}
+      - run: bash update.sh ${{ runner.temp }}
       - run: bash sync_sheets.sh
 
   force-update:
@@ -74,7 +73,6 @@ jobs:
     env:
       NPM_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
       CDN_SHEETS_FOLDER: ${{ vars.CDN_SHEETS_FOLDER }}
-      DEST_DIR: /tmp
     steps:
       - uses: actions/checkout@v3
       - id: 'auth'
@@ -101,4 +99,4 @@ jobs:
           args: fd-find
       - run: make clean
       - run: make all
-      - run: bash force-update.sh "$DEST_DIR"
+      - run: bash force-update.sh "$RUNNER_TEMP"

.gitignore

@@ -146,8 +146,6 @@ Network Trash Folder
 Temporary Items
 .apdisk
 
-**/*/release-ci.sh
-!release-ci.sh
 sync_sheets.sh
 
 **/*/dist/*.html

Makefile

@@ -1,9 +1,5 @@
 SHELL := /bin/bash
 
-# Change this value to whichever variant you're currently testing a certain sheet with
-DEFAULT_RELEASE_SCRIPT := release-ci.sh
-CDN_SHEETS_FOLDER := custom-sheets-staging
-
 listing:
 	fd . --exclude contrib --type d --max-depth 1 | sort
 

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.DEST_DIR || ''}/${sheetDir}/dist`;
+  const distDir = `${process.env.RUNNER_TEMP || '/tmp'}/${sheetDir}/dist`;
   rmSync(distDir, { recursive: true, force: true });
   mkdirSync(distDir, { recursive: true });
   await Promise.all([

contrib/sheet-pixie/save.ts

@@ -1,4 +1,5 @@
 function saveToFile(path: string, content: string) {
+  console.log("Writing content to file: " + path);
   return Bun.write(path, content);
 }
 export { saveToFile };

update.sh

@@ -5,4 +5,6 @@ touch sync_sheets.sh
 echo '#!/bin/bash' > sync_sheets.sh
 echo 'set -e' >> sync_sheets.sh
 chmod +x sync_sheets.sh
-fd dist --type d --strip-cwd-prefix -j1 --exec bash -c 'echo ./gcp.sh \"$(printf "%s" "{//}")\" \"$(printf "gs://roll20-cdn/$CDN_SHEETS_FOLDER/%s\n" "{//}")\" \"$(printf "gs://roll20-cdn/$CDN_SHEETS_FOLDER/%s" "{//}")/dist\" \"$(printf "gs://roll20-cdn/$CDN_SHEETS_FOLDER/%s" "{//}")/translations\"' | tee -a sync_sheets.sh
+CWD=$(pwd)
+cd $1;
+fd dist --type d --strip-cwd-prefix -j1 --exec bash -c 'echo ./gcp.sh \"$(printf "%s" "{//}")\" \"$(printf "gs://roll20-cdn/$CDN_SHEETS_FOLDER/%s\n" "{//}")\" \"$(printf "gs://roll20-cdn/$CDN_SHEETS_FOLDER/%s" "{//}")/dist\" \"$(printf "gs://roll20-cdn/$CDN_SHEETS_FOLDER/%s" "{//}")/translations\"' | tee -a $CWD/sync_sheets.sh