Merge pull request #2060 from nellh/bids-validator-build-fixes

ci: Include legacy validator build in deno web deployment

Author: nellh

.circleci/config.yml

@@ -75,54 +75,6 @@ jobs:
             - ./.next/cache
       - store_artifacts:
           path: ~/web_version
-  gh-pages_deployment:
-    docker:
-      - image: node:18-alpine
-    steps:
-      - run: npm install --global npm
-      - run: apk --no-cache add ca-certificates git openssh-client
-      - add_ssh_keys:
-          fingerprints:
-            - '86:74:77:4c:90:02:f4:5d:b4:f8:3c:b4:37:c3:c0:25'
-      - checkout
-      - restore_cache:
-          keys:
-            - npm-deps-{{ checksum "package.json" }}-{{ checksum "./bids-validator/package.json" }}-{{ checksum "./bids-validator-web/package.json" }}-v1
-      - run: git config --global user.email "bids.maintenance@gmail.com"
-      - run: git config --global user.name "bids-maintenance"
-      - run: ssh-keyscan github.com >> ~/.ssh/known_hosts
-      - run:
-          name: Create new gh-pages branch without history
-          command: git checkout --orphan gh-pages
-      - run:
-          name: Install bids-validator and bids-validator-web dependencies
-          command: npm install
-      - run:
-          name: Build and export web-validator
-          command: npm run web-export
-      - run:
-          name: Clean and remove bids-validator files
-          command: git reset . && git clean --force -d --exclude bids-validator-web/out
-      - run:
-          name: Move build into legacy directory
-          command: mv bids-validator-web/out/ legacy
-      - run:
-          name: Remove files not related to build
-          command: rm -r bids-validator bids-validator-web node_modules
-      - run:
-          name: Create a nojekyll file (gh-pages specific)
-          command: touch .nojekyll
-      - run: git status
-      - run:
-          name: Commit updates
-          command: git add legacy && git commit --allow-empty --no-verify -m "Circle CI - Generate validator demo with version $CIRCLE_TAG [ci skip]"
-      - run: git push origin gh-pages -f
-      - save_cache:
-          key: npm-deps-{{ checksum "package.json" }}-{{ checksum "./bids-validator/package.json" }}-{{ checksum "./bids-validator-web/package.json" }}-v1
-          paths:
-            - ./node_modules
-      - store_artifacts:
-          path: ~/legacy
 workflows:
   version: 2
   build-deploy:
@@ -145,13 +97,3 @@ workflows:
               only: /.*/
             tags:
               only: /.*/
-      - gh-pages_deployment:
-          requires:
-            - test
-            - test_docker
-            - githubPagesTest
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /v\d+\.\d+\.\d+$/

.github/workflows/schema_web_build.yml

@@ -1,5 +1,5 @@
 ---
-name: Schema validator web deploy
+name: Schema validator web build
 
 on:
   push:

.github/workflows/schema_web_deploy.yml

@@ -14,14 +14,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      # Use Node 18 for legacy build
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
       - uses: denoland/setup-deno@v1
         with:
           deno-version: v1.x
       - run: deno task build
         working-directory: ./web
-      - uses: actions/upload-artifact@v4
+      - name: Install NPM deps
+        run: npm install
+      - name: Build legacy validator website
+        run: npm run web-export
+      - name: Move legacy validator build into deno website
+        run: mv bids-validator-web/out web/dist/legacy
+      - name: Upload GitHub Pages artifact
+        uses: actions/upload-pages-artifact@v3
         with:
-          name: github-pages
           path: web/dist
   deploy:
     needs: build

web/vite.config.mts

@@ -8,6 +8,7 @@ import "npm:react-dom@^18.2.0"
 
 // https://vitejs.dev/config/
 export default defineConfig({
+  base: '',
   plugins: [
     httpsImports.default(),
     react(),