Skip to content

Commit

Permalink
ci: use pyTooling/Actions/with-post-step for commands in run and post…
Browse files Browse the repository at this point in the history
…-run
  • Loading branch information
rabi-siddique committed Aug 6, 2024
1 parent fd78345 commit 6c0f6cf
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 67 deletions.
31 changes: 7 additions & 24 deletions .github/actions/restore-node/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,29 +181,12 @@ runs:
mkdir -p node_modules/.cache/agoric
date > node_modules/.cache/agoric/yarn-built
# Refs: https://github.com/orgs/community/discussions/45342
- name: Validate Git Tree in Root Directory
if: inputs.path == '.'
uses: ./.github/actions/with-post-step
- name: Validate Git Tree Cleanliness
uses: pyTooling/Actions/with-post-step@v0.4.5
with:
main: echo "Checking Git tree for changes in the root directory..."
main: |
bash "$SRC/.github/actions/restore-node/check-git-status.sh" "$SRC"
post: |
set -x
if [ -n "$(git status --porcelain | grep -vE 'junit.xml$' | grep -vE '^[?][?] endo-sha.txt$|^.'; true)" ]; then
git status
echo "Unexpected dirty git status in default path" 1>&2
exit 1
fi
- name: Validate Git Tree in Agoric SDK Directory
if: inputs.path == './agoric-sdk'
uses: ./agoric-sdk/.github/actions/with-post-step
with:
main: echo "Checking Git tree for changes in the root directory..."
post: |
set -x
if [ -n "$(git status --porcelain | grep -vE 'junit.xml$' | grep -vE '^[?][?] endo-sha.txt$|^.'; true)" ]; then
git status
echo "Unexpected dirty git status in Agoric SDK path" 1>&2
exit 1
fi
bash "$SRC/.github/actions/restore-node/check-git-status.sh" "$SRC"
env:
SRC: ${{ inputs.path }}
13 changes: 13 additions & 0 deletions .github/actions/restore-node/check-git-status.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash
# Set verbose execution
set -x
# Navigate to the specified directory
cd "$1" || exit $?
# Check for unexpected changes
# Fail if git status detects changes
changes=$(git status --porcelain)
if [ -n "$changes" ]; then
git status
echo "Unexpected dirty git status in Agoric SDK path"
exit 1
fi
21 changes: 0 additions & 21 deletions .github/actions/with-post-step/action.yml

This file was deleted.

22 changes: 0 additions & 22 deletions .github/actions/with-post-step/main.cjs

This file was deleted.

4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,7 @@ api-docs

chaintest
_testoutput.txt


junit.xml
endo-sha.txt
1 change: 1 addition & 0 deletions a3p-integration/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ upgrade-test-scripts
# same for each proposal, an independent project
proposals/*/.pnp.*
proposals/*/.yarn/*
proposals/a:upgrade-next/*
!proposals/*/.yarn/patches
!proposals/*/.yarn/plugins
!proposals/*/.yarn/releases
Expand Down
3 changes: 3 additions & 0 deletions packages/cosmic-swingset/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,6 @@ typings/

# next.js build output
.next

# rosetta-cli executable
bin/rosetta-cli

0 comments on commit 6c0f6cf

Please sign in to comment.