From 284090f842fa7b4b9c7be9cee4a2d0043f2c12c5 Mon Sep 17 00:00:00 2001
From: Richard Gibson <richard.gibson@gmail.com>
Date: Tue, 16 Jul 2024 15:52:38 -0400
Subject: [PATCH] ci: Update after-merge workflow to tolerate non-dirty git
 state

Ref #9709
---
 .github/workflows/after-merge.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/after-merge.yml b/.github/workflows/after-merge.yml
index b6414fbc1b0f..6e5e23f3faba 100644
--- 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