Skip to content

Commit f917a7e

Browse files
committed
in release workflow, base commit on upstream main
1 parent 1603dab commit f917a7e

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

.github/workflows/release.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,14 @@ jobs:
6969
GIT_USER_EMAIL="$(git log -1 --pretty=format:'%ae')"
7070
7171
cd typst-packages
72+
73+
# Add upstream remote and fetch
74+
git remote add upstream https://github.com/typst/packages.git
75+
git fetch --depth 1 upstream main
76+
7277
git config user.name "${GIT_USER_NAME}"
7378
git config user.email "${GIT_USER_EMAIL}"
74-
git checkout -b "${PKG_NAME}-${PKG_VERSION}"
79+
git checkout --no-track -B "${PKG_NAME}-${PKG_VERSION}" upstream/main
7580
git add .
7681
git commit -m "${PKG_NAME}:${PKG_VERSION}"
7782
git push --force --set-upstream origin "${PKG_NAME}-${PKG_VERSION}"

0 commit comments

Comments
 (0)