Fix: separate scrape and commit jobs #23
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Coverage report
This PR does not seem to contain any modification to coverable code. |
thekaveman
added
bug
|
It works!! See commit 9f8beb5 from a manual run on this branch 🎉 🥳 |
angela-tran
approved these changes
Feb 27, 2024
the scrape job follows the matrix strategy to get the latest data files for each participant, and then uploads these files as artifacts to the workflow run the commit job downloads all artifacts into the data/ directory and then makes a single commit and push when files have changed this avoids a couple of problems in the initial implementation: * a race condition existed in the matrix strategy, where each matrix branch was attempting to commit files and push to main at nearly the same time, resulting in git conflicts on push * by using BOT_ACCESS_TOKEN on checkout in the commit job, the rest of the git commands are run as the cal-itp-bot user, which has permission to bypass branch protection rules for the main branch
thekaveman
force-pushed
the
fix/scrape-workflow-git
branch
from
9f8beb5
to
8192a72
Compare
|
I'm just going to merge this to clear the PR from our queue, but we still have this workflow marked as |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
scrapejob follows the matrix strategy to get the latest data files for each participant, and then uploads these files as artifacts to the workflow run.The
commitjob downloads all artifacts into thedata/directory and then makes a single commit and push when files have changed.This avoids a couple of problems in the initial implementation:
a race condition existed in the matrix strategy, where each matrix branch was attempting to commit files and push to
mainat nearly the same time, resulting in git conflicts on push.by using
BOT_ACCESS_TOKENon checkout in thecommitjob, the rest of the git commands are run as the @cal-itp-bot user, which has permission to bypass branch protection rules for themainbranch