Merge pull request #130 from qld-gov-au/develop

form.io 8.1.0 upgrade
qld-gov-au · Aug 8, 2023 · 409c927 · 409c927
2 parents 5575106 + af8cde9
commit 409c927
Show file tree

Hide file tree

Showing 38 changed files with 8,995 additions and 6,513 deletions.
diff --git a/.github/workflows/compile.js.yml b/.github/workflows/compile.js.yml
@@ -119,6 +119,20 @@ jobs:
           set -x
           cp -r ./binary-repo/* ./dist
 
+      - name: "Set environment variables if TARGET_REPO and/or TARGET_CDN_REPO exists"
+        id: set-TARGET_REPO-exists
+        run: |
+          if [ -n "${{ secrets.TARGET_REPO }}" ]; then
+            echo "TARGET_REPO=true" >> $GITHUB_ENV
+          else
+            echo "TARGET_REPO=false" >> $GITHUB_ENV
+          fi
+          if [ -n "${{ secrets.TARGET_CDN_REPO }}" ]; then
+            echo "TARGET_CDN_REPO=true" >> $GITHUB_ENV
+          else
+            echo "TARGET_CDN_REPO=false" >> $GITHUB_ENV
+          fi
+
       - name: Publish
         uses: qld-gov-au/gha-publish-to-git@master
         with:
@@ -130,7 +144,7 @@ jobs:
           github_pat: '${{ secrets.GH_PAT }}'
           source_folder: dist
           tag_branch: main
-        if: ${{ success() && ( github.actor != 'dependabot[bot]' ) && env.repository != ''  }}
+        if: ${{ success() &&  env.TARGET_REPO == 'true'  }}
 
       - name: Publish to formio-qld-cdn
         uses: qld-gov-au/gha-cdn-version-tree-by-tag-builder@main
@@ -142,7 +156,7 @@ jobs:
           github_token: '${{ secrets.GH_TOKEN }}'
           github_pat: '${{ secrets.GH_PAT }}'
           source_folder: dist
-        if: ${{ success() && ( github.actor != 'dependabot[bot]' )  && env.repository != '' }}
+        if: ${{ success()  && env.TARGET_CDN_REPO == 'True' }}
 
 
 
diff --git a/.github/workflows/storybook-deploy.js.yml b/.github/workflows/storybook-deploy.js.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [ '16' ]
+        node: [ '18' ]
     name: Deploy with Node ${{ matrix.node }}
 #    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:

diff --git a/.github/workspace/formiojs/npm b/.github/workspace/formiojs/npm
@@ -0,0 +1,6 @@
+#!/bin/sh
+export PATH="$PWD/node/":$PATH
+node -v
+npm -v
+$PWD/node/npm "$@"
+##node "node/node_modules/npm/bin/npm-cli.js" "$@"
diff --git a/.github/workspace/formiojs/npx b/.github/workspace/formiojs/npx
@@ -0,0 +1,6 @@
+#!/bin/sh
+export PATH="$PWD/node/":$PATH
+node -v
+npx -v
+$PWD/node/npx "$@"
+