Integration tests: update approval tests and snapshots

quarkiverse · Sep 18, 2024 · 549979d · 549979d
1 parent 69ac532
commit 549979d
Show file tree

Hide file tree

Showing 12 changed files with 430 additions and 20 deletions.
diff --git a/integration-tests/src/test/java/io/quarkiverse/githubaction/it/CodestartKotlinTest.java b/integration-tests/src/test/java/io/quarkiverse/githubaction/it/CodestartKotlinTest.java
@@ -28,6 +28,7 @@ void testContent() throws Throwable {
         codestartTest.assertThatGeneratedFileMatchSnapshot(Language.KOTLIN, ".github/dependabot.yml");
         codestartTest.assertThatGeneratedFileMatchSnapshot(Language.KOTLIN, ".github/workflows/ci.yml");
         codestartTest.assertThatGeneratedFileMatchSnapshot(Language.KOTLIN, ".github/workflows/publish-action-artifact.yml");
+        codestartTest.assertThatGeneratedFileMatchSnapshot(Language.KOTLIN, ".github/workflows/release.yml");
         codestartTest.assertThatGeneratedFileMatchSnapshot(Language.KOTLIN, "src/main/resources/application.properties");
     }
 

diff --git a/integration-tests/src/test/java/io/quarkiverse/githubaction/it/CodestartTest.java b/integration-tests/src/test/java/io/quarkiverse/githubaction/it/CodestartTest.java
@@ -28,6 +28,7 @@ void testContent() throws Throwable {
         codestartTest.assertThatGeneratedFileMatchSnapshot(Language.JAVA, ".github/dependabot.yml");
         codestartTest.assertThatGeneratedFileMatchSnapshot(Language.JAVA, ".github/workflows/ci.yml");
         codestartTest.assertThatGeneratedFileMatchSnapshot(Language.JAVA, ".github/workflows/publish-action-artifact.yml");
+        codestartTest.assertThatGeneratedFileMatchSnapshot(Language.JAVA, ".github/workflows/release.yml");
         codestartTest.assertThatGeneratedFileMatchSnapshot(Language.JAVA, "src/main/resources/application.properties");
     }
 

diff --git a/...snapshots__/CodestartKotlinTest/testContent/.github_workflows_publish-action-artifact.yml b/...snapshots__/CodestartKotlinTest/testContent/.github_workflows_publish-action-artifact.yml
@@ -33,6 +33,6 @@ jobs:
       - name: Build and publish action to Maven repository
         shell: bash
         run: |
-          ./mvnw -B clean deploy -Dquarkus.package.type=uber-jar -Dquarkus.package.add-runner-suffix=false
+          ./mvnw -B -P flatten clean deploy
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/...est/resources/__snapshots__/CodestartKotlinTest/testContent/.github_workflows_release.yml b/...est/resources/__snapshots__/CodestartKotlinTest/testContent/.github_workflows_release.yml
@@ -0,0 +1,58 @@
+name: Release new version
+
+on:
+  push:
+    branches:
+      - releases/**
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: temurin
+          cache: maven
+
+      - name: Configure Git author
+        run: |
+          git config --local user.email "[email protected]"
+          git config --local user.name "GitHub Action"
+
+      - name: Release new version
+        run: |
+          ./mvnw -B release:prepare release:perform
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set major tag
+        run: |
+          git tag -f $(git describe --tags | cut -d . -f 1) tags/$(git describe --tags --abbrev=0)
+          git push --tags --force
+
+      - name: Set next release version
+        run: |
+          [[ "${{ github.event.created }}" = false ]] && exit 0
+          git fetch origin main:main --depth=1
+          git switch main
+          ./mvnw -B build-helper:parse-version@parse-next-version versions:set-property@next-minor-version
+          git add pom.xml
+          git commit -m '[release action] prepare for next development iteration'
+          git push origin main
diff --git a/...gration-tests/src/test/resources/__snapshots__/CodestartKotlinTest/testContent/action.yml b/...gration-tests/src/test/resources/__snapshots__/CodestartKotlinTest/testContent/action.yml
@@ -37,7 +37,7 @@ runs:
       uses: jbangdev/setup-jbang@main
     - name: Run the action
       id: action
-      run: jbang --java 17 --fresh --repos 'quarkus-github-action=https://maven.pkg.github.com/your-org/your-repository/' --repos 'mavencentral' org.test:test-codestart:1.0.0-codestart
+      run: jbang --java 17 --fresh --repos 'quarkus-github-action=https://maven.pkg.github.com/your-org/your-repository/' --repos 'central' org.test:test-codestart:1.0.0-codestart
       shell: bash
       env:
         JSON_INPUTS: ${{ toJSON(inputs) }}

diff --git a/...-tests/src/test/resources/__snapshots__/CodestartKotlinTest/testContent/dir-tree.snapshot b/...-tests/src/test/resources/__snapshots__/CodestartKotlinTest/testContent/dir-tree.snapshot
@@ -3,4 +3,5 @@ dependabot.yml
 workflows/
 workflows/ci.yml
 workflows/publish-action-artifact.yml
-workflows/publish-docker-image.yml.disabled
+workflows/publish-docker-image.yml.disabled
+workflows/release.yml
diff --git a/integration-tests/src/test/resources/__snapshots__/CodestartKotlinTest/testContent/pom.xml b/integration-tests/src/test/resources/__snapshots__/CodestartKotlinTest/testContent/pom.xml
@@ -7,17 +7,30 @@
     <name>My action name</name>
     <description>My action description</description>
 
+    <scm>
+        <connection>scm:git:https://github.com/your-org/your-repository.git</connection>
+        <developerConnection>scm:git:https://github.com/your-org/your-repository.git</developerConnection>
+        <url>https://github.com/your-org/your-repository</url>
+    </scm>
+
     <properties>
+        <build-helper-plugin.version>3.6.0</build-helper-plugin.version>
         <compiler-plugin.version>3.8.1-MOCK</compiler-plugin.version>
+        <deploy-plugin.version>3.1.3</deploy-plugin.version>
+        <exec-plugin.version>3.4.1</exec-plugin.version>
+        <flatten-plugin.version>1.6.0</flatten-plugin.version>
         <kotlin.version>1.4.28-MOCK</kotlin.version>
         <maven.compiler.release>17</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.next.version>1.0.0</project.next.version>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <quarkus.platform.artifact-id>quarkus-mock-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
         <quarkus.platform.version>999-MOCK</quarkus.platform.version>
+        <release-plugin.version>3.1.1</release-plugin.version>
         <skipITs>true</skipITs>
         <surefire-plugin.version>3.0.0-MOCK</surefire-plugin.version>
+        <versions-plugin.version>2.17.1</versions-plugin.version>
     </properties>
 
     <dependencyManagement>
@@ -65,6 +78,38 @@
     <build>
         <sourceDirectory>src/main/kotlin</sourceDirectory>
         <testSourceDirectory>src/test/kotlin</testSourceDirectory>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>flatten-maven-plugin</artifactId>
+                    <version>${flatten-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>${deploy-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>${release-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>${build-helper-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>versions-maven-plugin</artifactId>
+                    <version>${versions-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <version>${exec-plugin.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>${quarkus.platform.group-id}</groupId>
@@ -175,18 +220,11 @@
         </profile>
         <profile>
             <id>flatten</id>
-            <activation>
-                <property>
-                    <name>quarkus.package.type</name>
-                    <value>uber-jar</value>
-                </property>
-            </activation>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>flatten-maven-plugin</artifactId>
-                        <version>1.6.0</version>
                         <executions>
                             <execution>
                                 <id>flatten</id>
@@ -218,6 +256,10 @@
                     </plugin>
                 </plugins>
             </build>
+            <properties>
+                <quarkus.package.jar.add-runner-suffix>false</quarkus.package.jar.add-runner-suffix>
+                <quarkus.package.jar.type>uber-jar</quarkus.package.jar.type>
+            </properties>
         </profile>
         <profile>
             <id>github-action</id>
@@ -226,6 +268,109 @@
                     <name>env.GITHUB_REPOSITORY</name>
                 </property>
             </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-deploy-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-release-plugin</artifactId>
+                        <configuration>
+                            <preparationGoals>exec:exec@action-replace-version
+                                exec:exec@git-add-action
+                                build-helper:parse-version@parse-version
+                                versions:set-property@next-incremental-version</preparationGoals>
+                            <releaseProfiles>flatten</releaseProfiles>
+                            <releaseVersion>${project.next.version}</releaseVersion>
+                            <tagNameFormat>v@{project.version}</tagNameFormat>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>parse-version</id>
+                                <goals>
+                                    <goal>parse-version</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>parse-next-version</id>
+                                <goals>
+                                    <goal>parse-version</goal>
+                                </goals>
+                                <configuration>
+                                    <versionString>${project.next.version}</versionString>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>versions-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>next-minor-version</id>
+                                <goals>
+                                    <goal>set-property</goal>
+                                </goals>
+                                <configuration>
+                                    <property>project.next.version</property>
+                                    <newVersion>${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}.0</newVersion>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>next-incremental-version</id>
+                                <goals>
+                                    <goal>set-property</goal>
+                                </goals>
+                                <configuration>
+                                    <property>project.next.version</property>
+                                    <newVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.nextIncrementalVersion}</newVersion>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>action-replace-version</id>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>sed</executable>
+                                    <arguments>
+                                        <argument>-i</argument>
+                                        <argument>-e</argument>
+                                        <argument>/^ *run: jbang/ s/:\([^:]*\)$/:${project.version}/</argument>
+                                        <argument>action.yml</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>git-add-action</id>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>git</executable>
+                                    <arguments>
+                                        <argument>add</argument>
+                                        <argument>action.yml</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <workingDirectory>${project.basedir}</workingDirectory>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
             <distributionManagement>
                 <repository>
                     <id>github</id>

diff --git a/...ces/__snapshots__/CodestartTest/testContent/.github_workflows_publish-action-artifact.yml b/...ces/__snapshots__/CodestartTest/testContent/.github_workflows_publish-action-artifact.yml
@@ -33,6 +33,6 @@ jobs:
       - name: Build and publish action to Maven repository
         shell: bash
         run: |
-          ./mvnw -B clean deploy -Dquarkus.package.type=uber-jar -Dquarkus.package.add-runner-suffix=false
+          ./mvnw -B -P flatten clean deploy
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.../src/test/resources/__snapshots__/CodestartTest/testContent/.github_workflows_release.yml b/.../src/test/resources/__snapshots__/CodestartTest/testContent/.github_workflows_release.yml
@@ -0,0 +1,58 @@
+name: Release new version
+
+on:
+  push:
+    branches:
+      - releases/**
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: temurin
+          cache: maven
+
+      - name: Configure Git author
+        run: |
+          git config --local user.email "[email protected]"
+          git config --local user.name "GitHub Action"
+
+      - name: Release new version
+        run: |
+          ./mvnw -B release:prepare release:perform
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set major tag
+        run: |
+          git tag -f $(git describe --tags | cut -d . -f 1) tags/$(git describe --tags --abbrev=0)
+          git push --tags --force
+
+      - name: Set next release version
+        run: |
+          [[ "${{ github.event.created }}" = false ]] && exit 0
+          git fetch origin main:main --depth=1
+          git switch main
+          ./mvnw -B build-helper:parse-version@parse-next-version versions:set-property@next-minor-version
+          git add pom.xml
+          git commit -m '[release action] prepare for next development iteration'
+          git push origin main
diff --git a/integration-tests/src/test/resources/__snapshots__/CodestartTest/testContent/action.yml b/integration-tests/src/test/resources/__snapshots__/CodestartTest/testContent/action.yml
@@ -37,7 +37,7 @@ runs:
       uses: jbangdev/setup-jbang@main
     - name: Run the action
       id: action
-      run: jbang --java 17 --fresh --repos 'quarkus-github-action=https://maven.pkg.github.com/your-org/your-repository/' --repos 'mavencentral' org.test:test-codestart:1.0.0-codestart
+      run: jbang --java 17 --fresh --repos 'quarkus-github-action=https://maven.pkg.github.com/your-org/your-repository/' --repos 'central' org.test:test-codestart:1.0.0-codestart
       shell: bash
       env:
         JSON_INPUTS: ${{ toJSON(inputs) }}

diff --git a/...ration-tests/src/test/resources/__snapshots__/CodestartTest/testContent/dir-tree.snapshot b/...ration-tests/src/test/resources/__snapshots__/CodestartTest/testContent/dir-tree.snapshot
@@ -3,4 +3,5 @@ dependabot.yml
 workflows/
 workflows/ci.yml
 workflows/publish-action-artifact.yml
-workflows/publish-docker-image.yml.disabled
+workflows/publish-docker-image.yml.disabled
+workflows/release.yml