Merge pull request #17982 from glefloch/fix/release-job-jbang

Export JBANG_REPO env variable for release test ci job
quarkusio · Jun 17, 2021 · c965b72 · c965b72
2 parents 05b3caa + 1b0c2ff
commit c965b72
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -12,6 +12,7 @@ jobs:
     if: github.repository == 'quarkusio/quarkus'
     env:
       MAVEN_OPTS: -Xmx2048m -XX:MaxMetaspaceSize=1000m
+      JBANG_REPO: $HOME/release/repository
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/devtools/cli/src/main/java/io/quarkus/cli/build/JBangRunner.java b/devtools/cli/src/main/java/io/quarkus/cli/build/JBangRunner.java
@@ -14,7 +14,6 @@
 import io.quarkus.cli.common.RegistryClientMixin;
 import io.quarkus.cli.common.RunModeOption;
 import io.quarkus.devtools.project.BuildTool;
-import io.quarkus.registry.config.RegistriesConfigLocator;
 
 public class JBangRunner implements BuildSystemRunner {
     static final String[] windowsWrapper = { "jbang.cmd", "jbang.ps1" };
@@ -72,7 +71,6 @@ public BuildCommandArgs prepareBuild(BuildOptions buildOptions, RunModeOption ru
             args.add("--native");
         }
         args.add("build");
-        setJbangProperties(args, false);
         args.addAll(params);
         args.add(getMainPath());
         return prependExecutable(args);
@@ -126,10 +124,4 @@ String getMainPath() {
         }
         return mainPath;
     }
-
-    void setJbangProperties(ArrayDeque<String> args, boolean batchMode) {
-        ExecuteUtil.propagatePropertyIfSet("maven.repo.local", args);
-        ExecuteUtil.propagatePropertyIfSet(RegistriesConfigLocator.CONFIG_FILE_PATH_PROPERTY, args);
-        ExecuteUtil.propagatePropertyIfSet("io.quarkus.maven.secondary-local-repo", args);
-    }
 }