Release 2.1.1

.github/workflows/bump_version.yml

@@ -28,9 +28,16 @@ on:
 concurrency:
     group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
     cancel-in-progress: true
-    
+
 env:
     GITHUB_TOKEN: ${{ secrets.PROSOPONATOR_PAT }}
+    GH_TOKEN: ${{ secrets.PROSOPONATOR_PAT }}
+    CARGO_TERM_COLOR: always
+    NODE_OPTIONS: "--max-old-space-size=4096"
+
+defaults:
+    run:
+        shell: bash
 
 jobs:
     bump_version:
@@ -76,9 +83,32 @@ jobs:
 
             - uses: actions/checkout@v3
 
+            - uses: actions/setup-node@v3
+              with:
+                  node-version-file: '.nvmrc'
+            - run: npm i -g "npm@$(jq -r .engines.npm < package.json)"
+
+            - run: mkdir -p ~/.npm
+            - run: mkdir -p ~/.cache/Cypress
+
+            - name: Restore npm cache
+              if: ${{ runner.environment != 'self-hosted' }} # don't restore cache on self-hosted runners, network speed not good enough
+              uses: actions/cache/restore@v3
+              with:
+                  # must restore all cache dirs, and they must exist ahead of this!
+                  path: |
+                      ~/.npm
+                      ~/.cache/Cypress
+                  # note that restoring a cache in github is a pain. The trailing '-' matches any string after the '-', therefore 'abc-' would match a cache named 'abc-1234' or 'abc-5678', etc.
+                  # the problem is 'abc-' will not match a cache named 'abc'! So if you're using wildcard cache name selectors like this, you need a field that changes as the suffix to become the wildcard
+                  # here we're setting the key to an unused cache key so it falls back to the wildcard selector in `restore-keys`
+                  key: some-unused-cache-key
+                  restore-keys: |
+                      npm-${{ runner.os }}-${{ runner.arch }}-
+
             - name: Bump version
               run: |
-                set -euxo pipefail # stop on errors, print commands, fail on pipe fails
+                set -euo pipefail # stop on errors, print commands, fail on pipe fails
 
                 # set the author in git
                 git config user.name "prosoponator[bot]"
@@ -97,17 +127,31 @@ jobs:
                 pkgJsons=$(npm run --silent ws:pkg)
                 pkgNames=$(npm run --silent ws:ls)
                 for pkgJson in $pkgJsons; do
+                    echo "Bumping version in $pkgJson"
                     # for each package in the workspace, set the version number
-                    cat $pkgJson | jq ".version = \"${{ github.event.inputs.version }}\"" > $pkgJson
+                    cat $pkgJson | jq ".version = \"${{ github.event.inputs.version }}\"" > tmp
+                    mv tmp $pkgJson
                     for pkgName in $pkgNames; do
                         # for each package in the workspace, check whether it is in the dependencies of the current package
                         # if so, bump the version number in the dependencies
-                        cat $pkgJson | jq "if .dependencies[\"$pkgName\"] then .dependencies[\"$pkgName\"] = \"^${{ github.event.inputs.version }}\" else . end" > $pkgJson
+                        cat $pkgJson | jq "if .dependencies[\"$pkgName\"] then .dependencies[\"$pkgName\"] = \"${{ github.event.inputs.version }}\" else . end" > tmp
+                        mv tmp $pkgJson
+                        cat $pkgJson | jq "if .devDependencies[\"$pkgName\"] then .devDependencies[\"$pkgName\"] = \"${{ github.event.inputs.version }}\" else . end" > tmp
+                        mv tmp $pkgJson 
                     done
                 done
 
-                # update pkg lock
+                # need to bump the PROSOPO_PACKAGE_VERSION variable in env files
+                envFiles=$(find . -iregex ".*\/\.?env\.[^js][^ts][^.d.ts]\w+" -not -path "./node_modules/**")
+                echo "Bumping version in env files: $envFiles"
+                for envFile in $envFiles; do
+                    sed -i "s/PROSOPO_PACKAGE_VERSION=.*/PROSOPO_PACKAGE_VERSION=${{ github.event.inputs.version }}/g" $envFile
+                done
+
+                # the json may be poorly formatted now, so we need to fix it
                 npm i
+                npm run -w @prosopo/scripts build
+                npm run lint-fix
 
                 # commit the version changes
                 git add .
@@ -121,3 +165,4 @@ jobs:
 
                 # create a PR for the release
                 gh pr create --base ${{ github.event.inputs.dest }} --title "Release ${{ github.event.inputs.version }}" --fill
+

.github/workflows/cache.yml

@@ -12,8 +12,14 @@ concurrency:
     cancel-in-progress: true
 
 env:
+    GITHUB_TOKEN: ${{ secrets.PROSOPONATOR_PAT }}
+    GH_TOKEN: ${{ secrets.PROSOPONATOR_PAT }}
     CARGO_TERM_COLOR: always
-    GH_TOKEN: ${{ github.token }}
+    NODE_OPTIONS: "--max-old-space-size=4096"
+
+defaults:
+    run:
+        shell: bash
 
 jobs:
     build:
@@ -59,10 +65,8 @@ jobs:
 
             - uses: actions/checkout@v3
 
-            # make cache dirs
-            - run: mkdir -p protocol/cargo-cache
-            - run: mkdir -p protocol/target
-            - run: mkdir -p node_modules
+            # make cache dirs, these must exist before doing cache stuff
+            - run: mkdir -p ~/.npm
             - run: mkdir -p ~/.cache/Cypress
 
             # don't restore the cache, otherwise we get artifacts left over from the previous run sit in the cache for eternity. Do a clean build every time.
@@ -77,38 +81,28 @@ jobs:
             # install cypress so we don't have to do that every time
             - run: npx cypress install
 
-            - run: ls -la ~/.cache/Cypress || true
-            - run: ls -la protocol/cargo-cache || true
-            - run: ls -la protocol/target/ink || true
-            - run: ls -la node_modules || true
-
-            # save cache to main branch. Any branch can use this cache afterwards to speed up their build
-            - name: Save cache
+            - name: Save npm cache
               uses: actions/cache/save@v3
               if: always()
               with:
                   path: |
-                      protocol/cargo-cache
-                      protocol/target
-                      node_modules
-                      ~/.cache/Cypress
-                  key: project-cache-${{ github.event.pull_request.head.ref || github.ref }}-${{ runner.os }}-${{ runner.arch }}-${{ github.run_id }}-${{ github.run_attempt }}
+                    ~/.npm
+                    ~/.cache/Cypress
+                  key: npm-${{ runner.os }}-${{ runner.arch }}-${{ github.run_id }}-${{ github.run_attempt }}
 
-            # remove all but the latest cache, leaving only the cache we just saved
-            - name: Cleanup caches
+            - name: Cleanup npm caches
               if: always()
-              env:
-                  REF: ${{ github.event.pull_request.head.ref || github.ref }}
               run: |
                   set -euxo pipefail # stop on errors, print commands, fail on pipe fails
 
-                    set +e; gh extension install actions/gh-actions-cache; set -e
-                    echo "Fetching list of cache key"
-                    cacheKeys=$(gh actions-cache list --sort created-at --order desc --limit 100 -R "${{ github.repository }}" --key "project-cache-$REF-${{ runner.os }}-${{ runner.arch }}-" | cut -f 1 | tail -n +3)
-                    echo caches to be removed:
-                    echo "${cacheKeys}"
-                    set +e
-                    for cacheKey in $cacheKeys
-                    do
-                        gh actions-cache delete "$cacheKey" -R "${{ github.repository }}" --confirm
-                    done
+                  # remove all but the latest cache, leaving only the cache we just saved
+                  set +e; gh extension install actions/gh-actions-cache; set -e
+                  echo "Fetching list of cache key"
+                  cacheKeys=$(gh actions-cache list --sort created-at --order desc --limit 100 -R "${{ github.repository }}" --key "npm-${{ runner.os }}-${{ runner.arch }}-" | cut -f 1 | tail -n +3)
+                  echo caches to be removed:
+                  echo "${cacheKeys}"
+                  set +e
+                  for cacheKey in $cacheKeys
+                  do
+                      gh actions-cache delete "$cacheKey" -R "${{ github.repository }}" --confirm
+                  done