Merge pull request quarkusio#28974 from gastaldi/feature_branch

Quarkiverse: Support release from feature branches
gsmet · Nov 3, 2022 · cc266ca · cc266ca
2 parents 6ed8fc0 + 8db677c
commit cc266ca
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.../resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/build.yml b/.../resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/build.yml
@@ -36,9 +36,9 @@ jobs:
         run: git config --global core.autocrlf false
         if: startsWith(matrix.os, 'windows')
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: 11

diff --git a/.../quarkus-extension/code/quarkiverse/java/.github/workflows/quarkus-snapshot.tpl.qute.yaml b/.../quarkus-extension/code/quarkiverse/java/.github/workflows/quarkus-snapshot.tpl.qute.yaml
@@ -30,18 +30,18 @@ jobs:
         run: sudo add-apt-repository ppa:rmescandon/yq && sudo apt update && sudo apt install yq -y
 
       - name: Set up Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: ${{ env.JAVA_VERSION }}
 
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: current-repo
 
       - name: Checkout Ecosystem
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: ${{ env.ECOSYSTEM_CI_REPO }}
           path: ecosystem-ci

diff --git a/...esources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/release.yml b/...esources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/release.yml
@@ -69,8 +69,8 @@ jobs:
             # Move the tag after inclusion of documentation adjustments
             git tag -f ${{steps.metadata.outputs.current-version}}
           fi
-          # Go back to main
-          git checkout main
+          # Go back to base branch
+          git checkout ${{github.base_ref}}
 
       - name: Push changes to ${{github.base_ref}}
         uses: ad-m/[email protected]