Merge pull request #31046 from ppalaga/230209-exte-template

quarkusio · Feb 12, 2023 · a4b3c1a · a4b3c1a
2 parents 6da5320 + aedcfe4
commit a4b3c1a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 23 deletions.
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
@@ -52,35 +52,23 @@ jobs:
           git config --local user.email "[email protected]"
           git config --local user.name "GitHub Action"
 
-      - name: Maven release ${{steps.metadata.outputs.current-version}}
+      - name: Update latest release version in docs
         run: |
-          git checkout -b release
-          mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}}
+          mvn -B -ntp -pl docs -am generate-resources -Denforcer.skip -Dformatter.skip -Dimpsort.skip
           if ! git diff --quiet docs/modules/ROOT/pages/includes/attributes.adoc; then
             git add docs/modules/ROOT/pages/includes/attributes.adoc
-            git commit -m "Update stable version for documentation"
+            git commit -m "Update the latest release version ${{steps.metadata.outputs.current-version}} in documentation"
           fi
-          git checkout ${{github.base_ref}}
-          git rebase release
+
+      - name: Maven release ${{steps.metadata.outputs.current-version}}
+        run: |
+          mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}}
           mvn -B release:perform -Darguments=-DperformRelease -DperformRelease -Prelease
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
 
-      - name: Adjust tag for documentation changes
-        run: |
-          git checkout ${{steps.metadata.outputs.current-version}}
-          mvn -B clean install -DskipTests -DskipITs
-          if ! git diff --quiet docs/modules/ROOT/pages/includes/attributes.adoc; then
-            git add docs/modules/ROOT/pages/includes/attributes.adoc
-            git commit -m "Update stable version for documentation"
-            # Move the tag after inclusion of documentation adjustments
-            git tag -f ${{steps.metadata.outputs.current-version}}
-            # Push modified tag
-            git push origin refs/tags/${{steps.metadata.outputs.current-version}} -f          
-          fi
-          # Go back to base branch
-          git checkout ${{github.base_ref}}
-
       - name: Push changes to ${{github.base_ref}} branch
-        run: git push
+        run: |
+          git push
+          git push origin ${{steps.metadata.outputs.current-version}}
diff --git a/...c/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/docs/pom.tpl.qute.xml b/...c/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/docs/pom.tpl.qute.xml
@@ -60,7 +60,7 @@
                 <executions>
                     <execution>
                         <id>copy-resources</id>
-                        <phase>prepare-package</phase>
+                        <phase>generate-resources</phase>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals>