Skip to content

Commit

Permalink
fixup - show diff and restrict pushing to only when in this PR pretty…
Browse files Browse the repository at this point in the history
… much
  • Loading branch information
yarikoptic committed Apr 27, 2024
1 parent 03e33bc commit 6d07424
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 6 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/schemacode_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ jobs:
- name: "Apply patches for BIDS-2.0"
run: tools/bids-2.0/apply_all

- name: "Show differences after patching"
run: |
git add .
git diff --cached
- name: "Set up Python"
uses: actions/setup-python@v5
with:
Expand Down
22 changes: 16 additions & 6 deletions .github/workflows/validate_bids-examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,27 @@ jobs:
set -o pipefail
tools/bids-2.0/apply_all 2>&1 | tee /tmp/patch.log
- name: "Push patched version online for possible introspection"
# if: contains(github.ref, 'refs/heads/bids-2.0')
- name: "Show differences after patching"
run: |
git add .
git diff --cached
- name: "Commit and push patched version online for possible introspection"
# Run only on a non-merge commit for the PR
if: >
github.repository == 'bids-standard/bids-specification' &&
github.event.pull_request.head.ref == 'bids-2.0' &&
github.event.pull_request.merge_commit_sha != github.sha
run: |
set -x
commit=$(git rev-parse HEAD)
branch=$(git rev-parse --abbrev-ref HEAD)-patched
branch=${GITHUB_HEAD_REF}-patched
git config --global user.email "[email protected]"
git config --global user.name "BIDS 2.0 GitHub CI"
git checkout -b "$branch"
git add .
{
echo -e "Applied patches for BIDS-2.0 to $commit\n";
cat /tmp/patch.log";
echo -e "Applied patches for ${GITHUB_HEAD_REF} to ${commit}\n";
cat /tmp/patch.log;
} | git commit -F -
git push -f origin "$branch"
Expand Down

0 comments on commit 6d07424

Please sign in to comment.