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

[SPARK-38966][CI] Allow fork branches to be in-sync with upstream master #36263

Conversation

EnricoMi
Copy link
Contributor

@EnricoMi EnricoMi commented Apr 19, 2022

What changes were proposed in this pull request?

Make git commit in .github/workflows/build_and_test.yml work with empty commits by adding --allow-empty to the command.

Why are the changes needed?

Whenever I sync my fork master from upstream Apache master, CI fails:

From https://github.com/G-Research/spark
 * branch                  master     -> FETCH_HEAD
Already up to date. (nothing to squash)
On branch master
Your branch is up to date with 'origin/master'.

nothing to commit, working tree clean
Error: Process completed with exit code 1.

Since my fork master is without changes, the git commit fails. This is annoying.

The same issue makes the scheduled build and test workflow fail multiple times a day.

Does this PR introduce any user-facing change?

No, this is CI only.

How was this patch tested?

Tested git commit --allow-empty with no changes on command line.

@github-actions github-actions bot added the INFRA label Apr 19, 2022
@AmplabJenkins
Copy link

Can one of the admins verify this patch?

Copy link
Member

@HyukjinKwon HyukjinKwon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@EnricoMi I think the change is good. Mind filing a JIRA?

@EnricoMi EnricoMi changed the title [CI] Allow fork branches to be in-sync with upstream master [SPARK-38966][CI] Allow fork branches to be in-sync with upstream master Apr 20, 2022
@EnricoMi
Copy link
Contributor Author

Done

@HyukjinKwon
Copy link
Member

Merged to master.

@EnricoMi
Copy link
Contributor Author

Thanks!

@EnricoMi
Copy link
Contributor Author

Scheduled build-and-test workflow is not failing in forks any more, thanks: https://github.com/G-Research/spark/runs/6095625654?check_suite_focus=true

@EnricoMi EnricoMi deleted the branch-allow-for-synced-fork-branches branch April 20, 2022 17:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
3 participants