git before push rebase

debugly · debugly · commit 69030b7cfc31 · 2025-02-13T14:28:09.000+08:00
diff --git a/.github/workflows/onestep.sh b/.github/workflows/onestep.sh
@@ -87,6 +87,7 @@ function upgrade()
     sed -i "" "s/^export PRE_COMPILE_TAG=.*/export PRE_COMPILE_TAG=$TAG/" $file
     git add $file
     git commit -m "upgrade $LIB_NAME to $TAG by cd"
+    git pull --rebase
     git push origin
 }
 

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ function upgrade()`
`87`	`87`	`sed -i "" "s/^export PRE_COMPILE_TAG=.*/export PRE_COMPILE_TAG=$TAG/" $file`
`88`	`88`	`git add $file`
`89`	`89`	`git commit -m "upgrade $LIB_NAME to $TAG by cd"`
	`90`	`+ git pull --rebase`
`90`	`91`	`git push origin`
`91`	`92`	`}`
`92`	`93`