diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml index d59a4478..8aadd6a3 100644 --- a/.github/workflows/fork-sync.yml +++ b/.github/workflows/fork-sync.yml @@ -14,7 +14,11 @@ jobs: synchronize-upstream: runs-on: ubuntu-latest steps: - - run: gh repo clone discretizer/homepage + - uses: actions/checkout@v4 + with: + ref: upstream + fetch-depth: 0 + - run: git remote add upstream https://github.com/gethomepage/homepage.git - name: Fetch Upstream Tags id: fetch-upstream-tags if: ${{ !inputs.tags }} @@ -27,17 +31,10 @@ jobs: echo 'NEW_TAGS<> $GITHUB_OUTPUT $(eval `git for-each-ref --format=$fmt --no-merge upstream refs/tags`) >> $GITHUB_OUTPUT echo 'EOF' >> $GITHUB_OUTPUT - working-directory: homepage - - name: Set Identity - run: | - git config user.name "Github Action" - git config user.email "bot@github-actions" - working-directory: homepage - name: Bump Current run: | git checkout upstream git merge upstream/main upstream - working-directory: homepage - name: Create Tags if: ${{inputs.tags || steps.fetch-upstream-tags.outputs.NEW_TAGS}} run: | @@ -49,11 +46,9 @@ jobs: git tag ${TAG} release/${TAG} done for TAG in ${NEW_TAGS}; do git push -u origin release/${TAG} ${TAG}; done - working-directory: homepage env: NEW_TAGS: ${{inputs.tags || steps.fetch-upstream-tags.outputs.NEW_TAGS}} - name: Push Current - working-directory: homepage run: | git checkout -b current upstream git rev-list --no-merges --reverse origin/feature/add_auth ^upstream | git cherry-pick --stdin