Move to Quarkus 999-SNAPSHOT including daily and PR CI

quarkus-qe · May 23, 2022 · 263e9af · 263e9af
1 parent 482077d
commit 263e9af
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 35 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,9 +18,9 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
           check-latest: true
-      - name: Build Quarkus 2.7
+      - name: Build Quarkus main
         run: |
-          git clone https://github.com/quarkusio/quarkus.git && cd quarkus && git checkout 2.7 && ./mvnw -B -s .github/mvn-settings.xml clean install -Dquickly -Prelocations -pl devtools/cli -am
+          git clone https://github.com/quarkusio/quarkus.git && cd quarkus && ./mvnw -B -s .github/mvn-settings.xml clean install -Dquickly -Prelocations -pl devtools/cli -am
       - name: Tar Maven Repo
         shell: bash
         run: tar -I 'pigz -9' -cf maven-repo.tgz -C ~ .m2/repository
@@ -113,7 +113,7 @@ jobs:
         run: tar -xzf maven-repo.tgz -C ~
       - name: Build Quarkus CLI
         run: |
-          git clone https://github.com/quarkusio/quarkus.git && cd quarkus/devtools/cli && git checkout 2.7 && mvn -B -s ../../../.github/mvn-settings.xml clean install -Dquickly -Prelocations
+          git clone https://github.com/quarkusio/quarkus.git && cd quarkus/devtools/cli && mvn -B -s ../../../.github/mvn-settings.xml clean install -Dquickly -Prelocations
 # TODO https://github.com/quarkus-qe/quarkus-test-suite/issues/632
 #      - name: Install Quarkus CLI
 #        run: |
@@ -174,7 +174,7 @@ jobs:
 # TODO https://github.com/quarkus-qe/quarkus-test-suite/issues/632
 #      - name: Build Quarkus CLI
 #        run: |
-#          git clone https://github.com/quarkusio/quarkus.git && cd quarkus/devtools/cli && git checkout 2.7 && mvn -B -s ../../../.github/mvn-settings.xml clean install -Dquickly -Prelocations
+#          git clone https://github.com/quarkusio/quarkus.git && cd quarkus/devtools/cli && mvn -B -s ../../../.github/mvn-settings.xml clean install -Dquickly -Prelocations
 #      - name: Install Quarkus CLI
 #        run: |
 #          cat <<EOF > ./quarkus-dev-cli

diff --git a/.github/workflows/daily.yaml b/.github/workflows/daily.yaml
@@ -20,9 +20,9 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
           check-latest: true
-      - name: Build Quarkus 2.7
+      - name: Build Quarkus main
         run: |
-          git clone https://github.com/quarkusio/quarkus.git && cd quarkus && git checkout 2.7 && ./mvnw -B -s .github/mvn-settings.xml clean install -Dquickly -Prelocations
+          git clone https://github.com/quarkusio/quarkus.git && cd quarkus && ./mvnw -B -s .github/mvn-settings.xml clean install -Dquickly -Prelocations
       - name: Tar Maven Repo
         shell: bash
         run: tar -I 'pigz -9' -cf maven-repo.tgz -C ~ .m2/repository
@@ -60,22 +60,16 @@ jobs:
       - name: Extract Maven Repo
         shell: bash
         run: tar -xzf maven-repo.tgz -C ~
-# TODO https://github.com/quarkus-qe/quarkus-test-suite/issues/632
-#      - name: Build Quarkus CLI
-#        run: |
-#          git clone https://github.com/quarkusio/quarkus.git && cd quarkus/devtools/cli && git checkout 2.7 && mvn -B -s ../../../.github/mvn-settings.xml clean install -Dquickly -Prelocations
-#      - name: Install Quarkus CLI
-#        run: |
-#          cat <<EOF > ./quarkus-dev-cli
-#          #!/bin/bash
-#          java -jar $PWD/quarkus/devtools/cli/target/quarkus-cli-999-SNAPSHOT-runner.jar "\$@"
-#          EOF
-#          chmod +x ./quarkus-dev-cli
+      - name: Install Quarkus CLI
+        run: |
+          cat <<EOF > ./quarkus-dev-cli
+          #!/bin/bash
+          java -jar $PWD/quarkus/devtools/cli/target/quarkus-cli-999-SNAPSHOT-runner.jar "\$@"
+          EOF
+          chmod +x ./quarkus-dev-cli
       - name: Test in JVM mode
         run: |
-          mvn -fae -V -B -s .github/mvn-settings.xml -fae clean verify -P ${{ matrix.profiles }}
-# TODO https://github.com/quarkus-qe/quarkus-test-suite/issues/632
-#          -Dinclude.quarkus-cli-tests -Dts.quarkus.cli.cmd="${PWD}/quarkus-dev-cli"
+          mvn -fae -V -B -s .github/mvn-settings.xml -fae clean verify -P ${{ matrix.profiles }} -Dinclude.quarkus-cli-tests -Dts.quarkus.cli.cmd="${PWD}/quarkus-dev-cli"
       - name: Zip Artifacts
         if: failure()
         run: |
@@ -118,23 +112,18 @@ jobs:
       - name: Extract Maven Repo
         shell: bash
         run: tar -xzf maven-repo.tgz -C ~
-# TODO https://github.com/quarkus-qe/quarkus-test-suite/issues/632
-#      - name: Build Quarkus CLI
-#        run: |
-#          git clone https://github.com/quarkusio/quarkus.git && cd quarkus/devtools/cli && git checkout 2.7 && mvn -B -s ../../../.github/mvn-settings.xml clean install -Dquickly -Prelocations
-#      - name: Install Quarkus CLI
-#        run: |
-#          cat <<EOF > ./quarkus-dev-cli
-#          #!/bin/bash
-#          java -jar $PWD/quarkus/devtools/cli/target/quarkus-cli-999-SNAPSHOT-runner.jar "\$@"
-#          EOF
-#          chmod +x ./quarkus-dev-cli
+      - name: Install Quarkus CLI
+        run: |
+          cat <<EOF > ./quarkus-dev-cli
+          #!/bin/bash
+          java -jar $PWD/quarkus/devtools/cli/target/quarkus-cli-999-SNAPSHOT-runner.jar "\$@"
+          EOF
+          chmod +x ./quarkus-dev-cli
       - name: Test in Native mode
         run: |
           mvn -fae -V -B -s .github/mvn-settings.xml -P ${{ matrix.profiles }} -fae clean verify -Dnative \
-            -Dquarkus.native.builder-image=quay.io/quarkus/${{ matrix.image }}
-# TODO https://github.com/quarkus-qe/quarkus-test-suite/issues/632
-#            -Dinclude.quarkus-cli-tests -Dts.quarkus.cli.cmd="${PWD}/quarkus-dev-cli"
+            -Dquarkus.native.builder-image=quay.io/quarkus/${{ matrix.image }} \
+            -Dinclude.quarkus-cli-tests -Dts.quarkus.cli.cmd="${PWD}/quarkus-dev-cli"
       - name: Zip Artifacts
         if: failure()
         run: |

diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
         <failsafe-plugin.version>2.22.2</failsafe-plugin.version>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
-        <quarkus.platform.version>2.7.5.Final</quarkus.platform.version>
+        <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version>
         <quarkus.qe.framework.version>1.1.0.Final</quarkus.qe.framework.version>
         <quarkus-qpid-jms.version>0.32.0</quarkus-qpid-jms.version>
         <quarkus-ide-config.version>2.6.1.Final</quarkus-ide-config.version>