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.

Sign up for GitHub

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

Use basename to split status URL in automerge script #469

Merged
merged 15 commits into from
Jan 8, 2024
Merged

Use basename to split status URL in automerge script #469

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5f2d036
use non-contextual github default env var
Jan 7, 2024
a37e9e7
make sha conditional on trigger event
Jan 7, 2024
e38d234
resolve merge conflicts
Jan 7, 2024
06aff35
reverse conditionals for readability
Jan 7, 2024
5bceb20
use git rev-parse for non-PR event SHAs
Jan 8, 2024
5161acf
resolve merge conflicts
Jan 8, 2024
fa02318
Merge branch 'master' of https://github.com/brain-score/vision into k…
Jan 8, 2024
7c1f45d
upgrade checkout to v4
Jan 8, 2024
6f538a1
fix typo
Jan 8, 2024
e46bf6d
getting clever about extracting sha from status triggers
Jan 8, 2024
8c86e16
fix merge conflicts
Jan 8, 2024
c6aaed7
cleanup
Jan 8, 2024
f02d7e9
update checkout to v4
Jan 8, 2024
d2811bd
Merge branch 'master' of https://github.com/brain-score/vision into k…
Jan 8, 2024
bd5fbf5
use basename to parse event url
Jan 8, 2024
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
4 changes: 3 additions & 1 deletion .github/workflows/automerge_plugin-only_prs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,11 @@ jobs:
with:
fetch-depth: 0
- name: Get SHA of last commit on PR branch
env:
EVENT_URL: ${{ github.event.url }}
run: |
if [[ ${{ github.event_name }} == "status" ]]; then
echo "TRIGGER_SHA=${{ github.event.url##*/ }}" >> $GITHUB_ENV
echo "TRIGGER_SHA=$( basename $EVENT_URL )" >> $GITHUB_ENV
else
echo "TRIGGER_SHA=${{ github.event.pull_request.head.sha }}" >> $GITHUB_ENV
fi
Expand Down