Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci(restore-node): avoid clobbering #endo-branch: setup #8155

Merged
merged 1 commit into from
Aug 9, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions .github/actions/restore-node/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ runs:
shell: bash
- uses: actions/checkout@v3
with:
clean: 'false'
clean: false
submodules: 'true'
persist-credentials: false
path: ${{ inputs.path }}
# Select a branch on Endo to test against by adding text to the body of the
# pull request. For example: #endo-branch: some-pr-branch
# The default is '*NONE*' to indicate not to check out Endo, just use
# The default is '*NOPE*' to indicate not to check out Endo, just use
# the published NPM packages.
- name: Get the appropriate Endo branch
id: endo-branch
Expand Down Expand Up @@ -111,8 +111,8 @@ runs:
mkdir -p node_modules/.cache/agoric
date > node_modules/.cache/agoric/yarn-installed
if test -e ~/endo; then
# Remove traces of the redirected `yarn install`.
git restore package.json yarn.lock
# Stage the redirected `yarn install` consequences.
git add package.json yarn.lock
rm -rf ~/endo
fi
shell: bash
Expand All @@ -131,9 +131,11 @@ runs:
- name: git dirty check
working-directory: ${{ inputs.path }}
run: |-
if [ -n "$(git status --porcelain)" ];
then
set -x
# In case of Endo override, ignore staged changes.
if [ -n "$(git status --porcelain | grep -Eve '^A '; true)" ]; then
git status
echo "Unexpected dirty git status" 1>&2
exit 1
fi
shell: bash