Skip to content

Remove invalid --ff-only flag from git push in sync and publish workflows #19

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

Merged
MaartenGr merged 1 commit into from
Nov 9, 2026
Merged

Remove invalid --ff-only flag from git push in sync and publish workflows #19

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ jobs:
export GIT_COMMITTER_NAME="${GIT_AUTHOR_NAME}"
export GIT_COMMITTER_EMAIL="${GIT_AUTHOR_EMAIL}"
SQUASH_SHA="$(git commit-tree "${TARGET_SHA}^{tree}" -p "${UPSTREAM_SHA}" -m "${COMMIT_MESSAGE}")"
git push upstream "${SQUASH_SHA}:refs/heads/main" --ff-only
git push origin "${SQUASH_SHA}:refs/heads/main" --ff-only
git push upstream "${SQUASH_SHA}:refs/heads/main"
git push origin "${SQUASH_SHA}:refs/heads/main"
gh api -X PATCH "repos/${SOURCE_REPO}/pulls/${PR_NUMBER}" -f state=closed
2 changes: 1 addition & 1 deletion .github/workflows/sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ jobs:
AUTH_B64="$(printf 'x-access-token:%s' "${GH_APP_TOKEN}" | base64 -w0)"
git config "http.https://github.com/.extraheader" "AUTHORIZATION: basic ${AUTH_B64}"
git fetch --no-tags https://github.com/google-gemma/docs.git main:refs/remotes/upstream/main
git push "https://github.com/${TARGET_REPO}.git" refs/remotes/upstream/main:refs/heads/main --ff-only
git push "https://github.com/${TARGET_REPO}.git" refs/remotes/upstream/main:refs/heads/main
Loading