Try to fix

JabRef · Jun 13, 2023 · 09dec4e · 09dec4e
1 parent e733337
commit 09dec4e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git 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