Skip to content

Workflow: add rebase code after checkout #4827

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

Open
Syspretor wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Workflow: add rebase code after checkout #4827

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions .github/workflows/project-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,16 @@ jobs:
with:
path: ${{ env.GOPATH }}/src/github.com/fluid-cloudnative/fluid

- name: Check rebase
run: |
git fetch origin master
# Check if the current branch contains the latest master commit
MASTER_COMMIT=$(git rev-parse origin/master)
if ! git merge-base --is-ancestor $MASTER_COMMIT HEAD; then
echo "::error ::Current branch is not up-to-date with master. Please rebase."
Copy link
Member

@TrafalgarZZZ TrafalgarZZZ Apr 8, 2025

Choose a reason for hiding this comment

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

Better to provide a command like:

Suggested change
echo "::error ::Current branch is not up-to-date with master. Please rebase."
echo "::error ::Current branch is not up-to-date with master. Please rebase with `git fetch origin master && git rebase origin/master`"

exit 1
fi

- name: Lint golang code
uses: golangci/golangci-lint-action@v6
with:
Expand Down
Loading