diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 569a603..4191cbb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -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 diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index f955e2b..40bd73d 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -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