From f8c76c432f72afd961b0878ffb0883eeae5a5afd Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried <mail@leonard.io>
Date: Sat, 16 Dec 2023 20:24:46 +0100
Subject: [PATCH] Build with base

---
 .github/workflows/debug-client.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/debug-client.yml b/.github/workflows/debug-client.yml
index a04bdfcfd5b..917f1e3ff6e 100644
--- a/.github/workflows/debug-client.yml
+++ b/.github/workflows/debug-client.yml
@@ -19,9 +19,9 @@ jobs:
     timeout-minutes: 20
     steps:
       # this is necessary so that the correct credentials are put into the git configuration
-      # when we push to dev-2.x and push the HTML to the git repo
+      # when we push to debug-client-cdn and push the HTML to the git repo
       - uses: actions/checkout@v4
-        if: github.event_name == 'push' && (github.ref == 'refs/heads/dev-2.x')
+        if: github.event_name == 'push' && (github.ref == 'refs/heads/debug-client-cdn')
         with:
           token: ${{ secrets.CHANGELOG_TOKEN }}
           fetch-depth: 0
@@ -34,14 +34,17 @@ jobs:
         with:
           node-version: 18
 
+      - name: Set version
+        run: echo "VERSION=`date +%Y-%m-%dT%H:%M`" >> $GITHUB_ENV
+
       - name: Build debug client
         working-directory: client-next
         run: |
           npm install
-          npm run build
+          npm run build -- --base https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/${VERSION}/
 
       - name: Deploy compiled assets to repo
-        if: github.event_name == 'push' && github.ref == 'refs/heads/dev-2.x'
+        #if: github.event_name == 'push' && github.ref == 'refs/heads/debug-client-cdn'
         env:
           REMOTE: debug-client
           LOCAL_BRANCH: local-assets
@@ -58,30 +61,27 @@ jobs:
 
           git checkout $LOCAL_BRANCH
           
-          VERSION=`date +%Y-%m-%dT%H-%M`
           
           # Copy the compiled output to a versioned folder
           mkdir -p $VERSION
-          rsync -r client-next/output/* $VERSION
+          rsync -r client-next/output/* ./$VERSION/
           git add $VERSION
           git commit -am "Add version ${VERSION} of debug client"
           
           # Push to assets repo https://github.com/opentripplanner/debug-client-assets
-          git push $REMOTE $LOCAL_BRANCH:$REMOTE_BRANCH
+          #git push $REMOTE $LOCAL_BRANCH:$REMOTE_BRANCH
           
           # Switch back to the OTP code
           git checkout dev-2.x
           git pull --rebase
           
-          # Modify the compiled output of the index.html to the CDN version
           CLIENT_HTML_OUTPUT=src/client/debug-client-preview/index.html
           mkdir -p src/client/debug-client-preview/
-          # this line is admittedly pretty unreadable it replaces the string "/debug-client-preview/" with the JsDelivr CDN URL prefix
-          sed "s|\/debug-client-preview\/|https:\/\/cdn.jsdelivr.net\/gh\/opentripplanner\/debug-client-assets@main\/${VERSION}\/|g" <client-next/output/index.html >${CLIENT_HTML_OUTPUT}
+          cp client-next/output/index.html ${CLIENT_HTML_OUTPUT}
           
           # just to debug
           cat ${CLIENT_HTML_OUTPUT}
           
           git add ${CLIENT_HTML_OUTPUT}
           git commit -m "Upgrade debug client to version ${VERSION}"
-          git push ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git HEAD:dev-2.x
+          #git push ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git HEAD:dev-2.x