ci: Update after-merge workflow to tolerate non-dirty git state

Ref #9709
Agoric · Jul 16, 2024 · 51daaa5 · 51daaa5
1 parent 7bde505
commit 51daaa5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.github/workflows/after-merge.yml b/.github/workflows/after-merge.yml
@@ -75,13 +75,13 @@ jobs:
               ;;
           esac
           # Prevent `lerna publish` from failing due to uncommitted changes.
-          git stash
+          git stash || true
           # without concurrency until https://github.com/Agoric/agoric-sdk/issues/8091
           yarn lerna publish --concurrency 1 --conventional-prerelease --canary --exact \
             --dist-tag=$TAG --preid=$TAG-$(git rev-parse --short=7 HEAD) \
             --no-push --no-verify-access --yes
-          # restore the stashed changes for caching
-          git stash apply
+          # restore any stashed changes for caching
+          git stash apply || true
       - name: notify on failure
         if: failure()
         uses: ./.github/actions/notify-status