Merge pull request #314 from Zemnmez/version-pipelining

Another try :'(
zemn-me · Jun 6, 2022 · cc7b622 · cc7b622
2 parents 72fddc9 + 194b1f2
commit cc7b622
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -97,8 +97,10 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Merge with versioned
-        run: git merge origin/versioned
+      - name: Checkout versioned branch
+        run: git switch versioned
+      - name: Merge with main
+        run: git merge main
       - name: Open PR to 'versioned' branch
         run: gh pr create -f
         env: