Merge pull request quarkiverse#41 from iocanel/fix-workflow

Troubleshoot build-test

.github/workflows/build-test.yml → .github/workflows/cli-integration-test.yml

@@ -1,4 +1,4 @@
-name: Build and test the plugin
+name: CLI integration test
 
 on:
   workflow_dispatch:
@@ -68,6 +68,9 @@ jobs:
           alias quarkus="java -jar ${GITHUB_WORKSPACE}/quarkus-cli.jar"
           
           echo "## Create a Quarkus project"
+
+          TMP_DIR=$(mktemp -d)
+          pushd $TMP_DIR
           quarkus create app
           cd code-with-quarkus
           
@@ -76,7 +79,7 @@ jobs:
           
           git config user.email "[email protected]"
           git config user.name "Quarkus coder"
-          git remote add origin git@github.com:quarkiverse/code-with-quarkus.git
+          git remote add origin https://github.com/quarkiverse/code-with-quarkus.git
           
           git add .
           git commit -asm "Initial upload"
@@ -87,6 +90,10 @@ jobs:
           
           echo "## Compile the quarkus app"
           mvn -B install -Dno-format
+
+          # Troubleshooting information
+          ls -al
+          git log
           
           echo "## Generate the Argo CD application"
           quarkus argocd application generate
@@ -106,4 +113,5 @@ jobs:
             echo "## ArgoCD file has not been generated properly !"
             cat ".argocd/code-with-quarkus-deploy.yaml"
             exit 1
-          fi
+          fi
+          popd

cli/pom.xml

@@ -67,6 +67,12 @@
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                <groupId>io.quarkus</groupId>

cli/src/main/java/io/quarkiverse/argocd/cli/application/GenerationBaseCommand.java

@@ -12,6 +12,7 @@
 import java.util.concurrent.Callable;
 import java.util.function.Consumer;
 
+import io.dekorate.utils.Strings;
 import io.quarkiverse.argocd.cli.handlers.GetArgoCDApplicationHandler;
 import io.quarkiverse.argocd.cli.utils.Git;
 import io.quarkiverse.argocd.spi.ArgoCDApplicationListBuildItem;
@@ -22,11 +23,15 @@
 import io.quarkus.bootstrap.app.QuarkusBootstrap;
 import io.quarkus.devtools.project.BuildTool;
 import io.quarkus.devtools.project.QuarkusProjectHelper;
+import io.quarkus.maven.dependency.ArtifactDependency;
 import picocli.CommandLine.ExitCode;
 import picocli.CommandLine.Option;
 
 public abstract class GenerationBaseCommand extends ApplicationBaseCommand implements Callable<Integer> {
 
+    private static final ArtifactDependency QUARKUS_ARGOCD = new ArtifactDependency("io.quarkiverse.argocd", "quarkus-argocd",
+            null, "jar", GenerationBaseCommand.getVersion());
+
     @Option(names = { "-n", "--namespace" }, description = "The target namespace")
     Optional<String> namespace = Optional.empty();
 
@@ -68,9 +73,12 @@ public Integer call() {
                 .setApplicationRoot(getWorkingDirectory())
                 .setProjectRoot(getWorkingDirectory())
                 .setTargetDirectory(targetDirecotry)
-                .setLocalProjectDiscovery(true)
                 .setIsolateDeployment(false)
+                .setRebuild(true)
+                .setLocalProjectDiscovery(true)
                 .setBaseClassLoader(ClassLoader.getSystemClassLoader())
+                .setForcedDependencies(List.of(QUARKUS_ARGOCD))
+                .setDependencyInfoProvider(null)
                 .build();
 
         List<String> resultBuildItemFQCNs = new ArrayList<>();
@@ -112,4 +120,8 @@ protected void writeStringSafe(Path p, String content) {
     protected Path getWorkingDirectory() {
         return Paths.get(System.getProperty("user.dir"));
     }
+
+    private static String getVersion() {
+        return Strings.read(GenerationBaseCommand.class.getClassLoader().getResourceAsStream("version"));
+    }
 }

cli/src/main/resources/version

@@ -0,0 +1 @@
+${project.version}

deployment/pom.xml

@@ -70,6 +70,9 @@
                             <version>${quarkus.version}</version>
                         </path>
                     </annotationProcessorPaths>
+                    <compilerArgs>
+                        <arg>-AlegacyConfigRoot=true</arg>
+                    </compilerArgs>
                 </configuration>
             </plugin>
         </plugins>

pom.xml

@@ -35,7 +35,7 @@
         <maven.compiler.release>17</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <quarkus.version>3.12.2</quarkus.version>
+        <quarkus.version>3.14.4</quarkus.version>
         <sundrio.version>0.103.1</sundrio.version>
         <lombok.version>1.18.26</lombok.version>
         <kubernetes-client.version>6.13.1</kubernetes-client.version>