Skip to content

Commit 563bb47

Browse files
author
玖宇
committed
Workflow: add rebase code after checkout
Signed-off-by: 玖宇 <[email protected]>
1 parent 9ebcdef commit 563bb47

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

.github/workflows/project-check.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@ jobs:
3838
with:
3939
path: ${{ env.GOPATH }}/src/github.com/fluid-cloudnative/fluid
4040

41+
- name: Rebase code to master
42+
run: |
43+
git fetch origin master
44+
if ! git rebase origin/master; then
45+
echo "Rebase failed due to conflicts"
46+
exit 1
47+
fi
48+
4149
- name: Lint golang code
4250
uses: golangci/golangci-lint-action@v6
4351
with:

0 commit comments

Comments
 (0)