From 09dec4e5bbd433b482ec8b02c376b9847c61b226 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Wed, 14 Jun 2023 01:22:32 +0200 Subject: [PATCH] Try to fix --- .github/workflows/sync-fork.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sync-fork.yml b/.github/workflows/sync-fork.yml index 676af0e952d..ff6fa5dcbe8 100644 --- a/.github/workflows/sync-fork.yml +++ b/.github/workflows/sync-fork.yml @@ -15,7 +15,7 @@ jobs: - name: Checkout target repo uses: actions/checkout@v3 with: - ref: jdk21-fix-8240567 + ref: master fetch-depth: '0' - name: Sync upstream changes @@ -24,8 +24,11 @@ jobs: git config --local user.name "GitHub Actions" git remote add upstream https://github.com/openjdk/jdk21.git git fetch upstream + git checkout master git merge upstream/master git push - git checkout master + + git checkout jdk21-fix-8240567 + git fetch upstream git merge upstream/master git push