Merge pull request #5512 from Agoric/mfig-ci-cache-keys

ci(actions): fix up cache keys

.github/actions/restore-golang/action.yml

@@ -5,11 +5,6 @@ inputs:
   go-version:
     description: 'The version of Go to use'
     required: true
-  cache-key:
-    description: pkg/mod cache key
-    required: false
-    type: string
-    default: latest
 
 runs:
   using: composite
@@ -24,14 +19,16 @@ runs:
     - uses: actions/setup-go@v2
       with:
         go-version: ${{ inputs.go-version }}
+    - uses: kenchan0130/actions-system-info@master
+      id: system-info
     - name: cache Go modules
       id: cache
       uses: actions/cache@v1
       with:
         path: ${{ env.GOPATH }}/pkg/mod
-        key: ${{ runner.os }}-${{ inputs.cache-key }}-go-${{ hashFiles('go.sum') }}
+        key: ${{ runner.os }}-${{ runner.arch }}-${{ steps.system-info.outputs.release }}-go-${{ inputs.go-version }}-built-${{ hashFiles('go.sum') }}
         restore-keys: |
-          ${{ runner.os }}-${{ inputs.cache-key }}-go-
+          ${{ runner.os }}-${{ runner.arch }}-${{ steps.system-info.outputs.release }}-go-${{ inputs.go-version }}-built-
     - name: go mod download
       run: go mod download
       shell: bash

.github/actions/restore-node/action.yml

@@ -19,12 +19,21 @@ runs:
     - uses: actions/setup-node@v1
       with:
         node-version: ${{ inputs.node-version }}
+    - uses: kenchan0130/actions-system-info@master
+      id: system-info
+    - name: cache node modules
+      uses: actions/cache@v1
+      with:
+        path: ~/.cache/yarn
+        key: ${{ runner.os }}-${{ runner.arch }}-${{ steps.system-info.outputs.release }}-yarn-${{ hashFiles('yarn.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-${{ runner.arch }}-${{ steps.system-info.outputs.release }}-yarn-
     - name: restore built files
       id: built
       uses: actions/cache@v1
       with:
         path: .
-        key: ${{ runner.os }}-${{ inputs.node-version }}-built-${{ github.sha }}
+        key: ${{ runner.os }}-${{ runner.arch }}-${{ steps.system-info.outputs.release }}-node-${{ inputs.node-version }}-built-${{ github.sha }}
     - name: yarn install --frozen-lockfile
       run: yarn install --frozen-lockfile
       shell: bash

.github/workflows/after-merge.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'true'
-      - uses: ./.github/actions/build-node
+      - uses: ./.github/actions/restore-node
         with:
           node-version: ${{ matrix.node-version}}
       - name: notify on failure

.github/workflows/deployment-test.yml

@@ -30,15 +30,14 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          clean: 'false'
+          submodules: 'true'
       - uses: ./.github/actions/restore-golang
         with:
           go-version: 1.17
           cache-key: trusty
-      - uses: ./.github/actions/build-node
+      - uses: ./.github/actions/restore-node
         with:
           node-version: 14.x
-          cache-built: false
 
       # Select a branch on loadgen to test against by adding text to the body of the
       # pull request. For example: #loadgen-branch: user-123-update-foo
@@ -68,25 +67,24 @@ jobs:
           path: testnet-load-generator
           ref: ${{steps.get-loadgen-branch.outputs.result}}
 
-      - name: Move repos under /usr/src where scripts expect them
+      - name: Put repos under /usr/src where scripts expect them
         run: |
           set -e
           sudo mv "$GITHUB_WORKSPACE/testnet-load-generator" /usr/src/testnet-load-generator
-          sudo mv "$GITHUB_WORKSPACE" /usr/src/agoric-sdk
+          sudo cp -a "$GITHUB_WORKSPACE" /usr/src/agoric-sdk
           ln -s /usr/src/agoric-sdk/packages/deployment/bin/ag-setup-cosmos /usr/local/bin/ag-setup-cosmos
-          ln -s /usr/src/agoric-sdk "$GITHUB_WORKSPACE"
         working-directory: /
 
       - name: Build cosmic-swingset dependencies
         run: |
-          # Some of our build relies on /usr/src/agoric-sdk
           set -e
-          cd /usr/src/agoric-sdk/packages/cosmic-swingset
+          cd packages/cosmic-swingset
           make install
-        working-directory: /
+        working-directory: /usr/src/agoric-sdk
       - run: sudo ./packages/deployment/scripts/install-deps.sh
         working-directory: /usr/src/agoric-sdk
       - run: /usr/src/agoric-sdk/packages/deployment/scripts/integration-test.sh
+        working-directory: /usr/src/agoric-sdk
         env:
           NETWORK_NAME: chaintest
       - name: capture results
@@ -96,20 +94,21 @@ jobs:
           echo "NOW=$NOW" >> "$GITHUB_ENV"
 
           # Stop the chain from running.
-          /usr/src/agoric-sdk/packages/deployment/scripts/setup.sh play stop || true
+          packages/deployment/scripts/setup.sh play stop || true
 
           # Get the results.
-          /usr/src/agoric-sdk/packages/deployment/scripts/capture-integration-results.sh "${{ job.status == 'failure' }}"
+          packages/deployment/scripts/capture-integration-results.sh "${{ job.status == 'failure' }}"
 
           # Tear down the nodes.
-          echo yes | /usr/src/agoric-sdk/packages/deployment/scripts/setup.sh destroy || true
+          echo yes | packages/deployment/scripts/setup.sh destroy || true
+        working-directory: /usr/src/agoric-sdk
         env:
           NETWORK_NAME: chaintest
       - uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: deployment-test-results-${{ env.NOW }}
-          path: chaintest/results
+          path: /usr/src/agoric-sdk/chaintest/results
 
       - name: notify on failure
         if: failure() && github.event_name != 'pull_request'

.github/workflows/test-all-packages.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'true'
-      - uses: ./.github/actions/build-node
+      - uses: ./.github/actions/restore-node
         with:
           node-version: ${{ matrix.node-version }}