Merge pull request #8168 from Agoric/mfig-staged-endo

ci(restore-node): detect staged yarn.lock, package.json
Agoric · Jan 11, 2024 · f10dbc8 · f10dbc8
2 parents 767c4f6 + df7b11b
commit f10dbc8
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/.github/actions/restore-node/action.yml b/.github/actions/restore-node/action.yml
@@ -136,8 +136,9 @@ runs:
       working-directory: ${{ inputs.path }}
       run: |-
         set -x
-        # In case of Endo override, ignore staged changes.
-        if [ -n "$(git status --porcelain | grep -Eve '^A  '; true)" ]; then
+        # In case of Endo override, ignore matching index and worktree.
+        # (First column is non-space, second column is space, followed by separator.)
+        if [ -n "$(git status --porcelain | grep -Eve '^[^ ]  '; true)" ]; then
           git status
           echo "Unexpected dirty git status" 1>&2
           exit 1

diff --git a/.github/workflows/test-dapp-card-store.yml b/.github/workflows/test-dapp-card-store.yml
@@ -74,7 +74,7 @@ jobs:
 
       - name: notify on failure
         if: failure() && github.event_name != 'pull_request'
-        uses: ./.github/actions/notify-status
+        uses: ./agoric-sdk/.github/actions/notify-status
         with:
           webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
           from: ${{ secrets.NOTIFY_EMAIL_FROM }}

diff --git a/.github/workflows/test-dapp-fungible-faucet.yml.DISABLED b/.github/workflows/test-dapp-fungible-faucet.yml.DISABLED
@@ -75,7 +75,7 @@ jobs:
 
       - name: notify on failure
         if: failure() && github.event_name != 'pull_request'
-        uses: ./.github/actions/notify-status
+        uses: ./agoric-sdk/.github/actions/notify-status
         with:
           webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
           from: ${{ secrets.NOTIFY_EMAIL_FROM }}

diff --git a/.github/workflows/test-dapp-otc.yml b/.github/workflows/test-dapp-otc.yml
@@ -74,7 +74,7 @@ jobs:
 
       - name: notify on failure
         if: failure() && github.event_name != 'pull_request'
-        uses: ./.github/actions/notify-status
+        uses: ./agoric-sdk/.github/actions/notify-status
         with:
           webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
           from: ${{ secrets.NOTIFY_EMAIL_FROM }}

diff --git a/.github/workflows/test-dapp-pegasus.yml b/.github/workflows/test-dapp-pegasus.yml
@@ -74,7 +74,7 @@ jobs:
 
       - name: notify on failure
         if: failure() && github.event_name != 'pull_request'
-        uses: ./.github/actions/notify-status
+        uses: ./agoric-sdk/.github/actions/notify-status
         with:
           webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
           from: ${{ secrets.NOTIFY_EMAIL_FROM }}

diff --git a/.github/workflows/test-dapp-simple-exchange.yml b/.github/workflows/test-dapp-simple-exchange.yml
@@ -74,7 +74,7 @@ jobs:
 
       - name: notify on failure
         if: failure() && github.event_name != 'pull_request'
-        uses: ./.github/actions/notify-status
+        uses: ./agoric-sdk/.github/actions/notify-status
         with:
           webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
           from: ${{ secrets.NOTIFY_EMAIL_FROM }}

diff --git a/.github/workflows/test-dapp-treasury.yml.DISABLED b/.github/workflows/test-dapp-treasury.yml.DISABLED
@@ -74,7 +74,7 @@ jobs:
 
       - name: notify on failure
         if: failure() && github.event_name != 'pull_request'
-        uses: ./.github/actions/notify-status
+        uses: ./agoric-sdk/.github/actions/notify-status
         with:
           webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
           from: ${{ secrets.NOTIFY_EMAIL_FROM }}

diff --git a/.github/workflows/test-documentation.yml b/.github/workflows/test-documentation.yml
@@ -74,7 +74,7 @@ jobs:
 
       - name: notify on failure
         if: failure() && github.event_name != 'pull_request'
-        uses: ./.github/actions/notify-status
+        uses: ./agoric-sdk/.github/actions/notify-status
         with:
           webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
           from: ${{ secrets.NOTIFY_EMAIL_FROM }}