Merge branch 'master' into markm-fix-async-flow-endowment-bug-2

.github/actions/post-test/action.yml

@@ -32,7 +32,8 @@ runs:
           export DD_ENV="ci"
           export DD_SITE="${{ inputs.datadog-site }}"
 
-          timeout 15 npx @datadog/datadog-ci junit upload --service agoric-sdk ./packages/*/junit.xml
+          npx @datadog/datadog-ci --version 
+          timeout 30 npx @datadog/datadog-ci junit upload --service agoric-sdk ./packages/*/junit.xml
         fi
     - name: upload coverage prepare
       shell: bash

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

@@ -21,7 +21,7 @@ runs:
         path: ${{ inputs.path }}
         clean: 'false'
         submodules: 'true'
-    - uses: actions/setup-go@v4
+    - uses: actions/setup-go@v5
       with:
         cache-dependency-path: ${{ inputs.path }}/golang/cosmos/go.sum
         go-version: ${{ inputs.go-version }}

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

@@ -111,6 +111,10 @@ runs:
       shell: bash
       run: git config --global url."https://github.com/".insteadOf ssh://[email protected]/
 
+    # Before setup-node because that action runs `yarn cache dir`. See https://github.com/actions/setup-node/issues/480#issuecomment-1915448139
+    - run: corepack enable
+      shell: bash
+
     - uses: actions/setup-node@v4
       with:
         node-version: ${{ inputs.node-version }}
@@ -122,9 +126,6 @@ runs:
     - uses: kenchan0130/actions-system-info@master
       id: system-info
 
-    - run: corepack enable
-      shell: bash
-
     - name: restore built files
       id: built
       uses: actions/cache@v4
@@ -181,18 +182,13 @@ runs:
         mkdir -p node_modules/.cache/agoric
         date > node_modules/.cache/agoric/yarn-built
 
-    - name: git dirty check
-      working-directory: ${{ inputs.path }}
-      shell: bash
-      run: |-
-        set -x
-        # Fail if `git status` reports anything other than the following:
-        # * an untracked endo-sha.txt from above
-        # * work tree files that have been staged without further changes
-        #   (e.g., package.json or yarn.lock) as indicated by the Y position
-        #   in "XY PATH" being a space
-        if [ -n "$(git status --porcelain | grep -vE '^[?][?] endo-sha.txt$|^. '; true)" ]; then
-          git status
-          echo "Unexpected dirty git status" 1>&2
-          exit 1
-        fi
+    - name: Validate Git Tree Cleanliness
+      uses: pyTooling/Actions/[email protected]
+      with:
+        main: |
+          bash "$SRC/.github/actions/restore-node/check-git-status.sh" "$SRC" "$IGNORE_DIRTY_YARN_LOCK"
+        post: |
+          bash "$SRC/.github/actions/restore-node/check-git-status.sh" "$SRC" "$IGNORE_DIRTY_YARN_LOCK"
+      env:
+        SRC: ${{ inputs.path }}
+        IGNORE_DIRTY_YARN_LOCK: ${{ steps.endo-branch.outputs.result != 'NOPE' }}

.github/actions/restore-node/check-git-status.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Set verbose execution
+set -x
+
+# Navigate to the specified directory
+cd "$1" || exit $?
+
+# Get the value of IGNORE_ENDO_BRANCH
+ignore_dirty_yarn_lock=$2 || exit $?
+
+# Check for unexpected changes
+# Fail if git status detects changes
+changes=$(git status --porcelain)
+
+if [ "$ignore_dirty_yarn_lock" = true ]; then
+  # When integration is requested with a specific Endo branch, ignore changes:
+  # - package.json has a modified `"resolutions":` field,
+  # - yarn.lock is changed because of those resolutions.
+  # For more details, refer to https://github.com/Agoric/agoric-sdk/issues/9850.
+  changes=$(echo "$changes" | grep -v " yarn.lock")
+fi
+
+if [ -n "$changes" ]; then
+  git status
+  echo "Unexpected dirty git status in Agoric SDK path"
+  exit 1
+fi

.github/workflows/README.md

@@ -0,0 +1,8 @@
+# Github Workflows
+
+We use these for CI. Some other workflows that we aren't currently using are:
+
+* [dapp template](https://github.com/Agoric/agoric-sdk/blob/7a08c6af641c62d8b0ef4a0c35090b6216a5be34/.github/workflow-templates/test-dapp.yml#L1)
+* [ag-solo on xs](https://github.com/Agoric/agoric-sdk/blob/7a08c6af641c62d8b0ef4a0c35090b6216a5be34/.github/workflows/ag-solo-xs.yml.DISABLED#L1)
+* [Test Dapp Treasury](https://github.com/Agoric/agoric-sdk/blob/7a08c6af641c62d8b0ef4a0c35090b6216a5be34/.github/workflows/test-dapp-treasury.yml.DISABLED#L1)
+* [Update Hackathon branch](https://github.com/Agoric/agoric-sdk/blob/7a08c6af641c62d8b0ef4a0c35090b6216a5be34/.github/workflows/update-hackathon-branch.yml.DISABLED#L1)

.github/workflows/after-merge.yml

@@ -109,7 +109,7 @@ jobs:
         run: 'yarn test:c8-all || :'
       - name: generate coverage/html reports
         run: mkdir -p coverage/tmp && yarn c8 report --reporter=html-spa --reports-dir=coverage/html --temp-directory=coverage/tmp
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: coverage
           path: coverage
@@ -153,7 +153,7 @@ jobs:
         env:
           AUTOBENCH_METRICS_URL: ${{ secrets.AUTOBENCH_METRICS_URL }}
         run: cd packages/swingset-runner && yarn ci:autobench
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: benchmarkstats.json
           path: packages/swingset-runner/benchstats*.json

.github/workflows/comment-on-base-branch-change.yml

@@ -0,0 +1,22 @@
+name: Post Integration Test Comment on Base Branch Change
+
+on:
+  pull_request:
+    types:
+      - edited
+
+jobs:
+  trigger:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.changes.base && github.event.pull_request.base.ref == 'master' }}
+    steps:
+      - name: Post a comment on the PR
+        uses: actions/github-script@v6
+        with:
+          script: |
+            github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.payload.pull_request.number,
+              body: "Base branch is changed to master. Please re-run the integration tests by adding 'force:integration' label."
+            })