wip(ci): test stuff

Liftric · Aug 15, 2024 · 8504f0a · 8504f0a
1 parent 07e8ea5
commit 8504f0a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -29,7 +29,7 @@ jobs:
           wget https://github.com/OctopusDeploy/OctopusCLI/releases/download/v9.1.7/OctopusTools.9.1.7.linux-x64.tar.gz
           mkdir -p $HOME/.local/bin
           tar -xzf OctopusTools.9.1.7.linux-x64.tar.gz -C $HOME/.local/bin
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
+          echo "$HOME/.local/bin" >> $PATH
       - name: Build
         run: ./gradlew build
       - name: Validate

diff --git a/src/main/kotlin/com/liftric/octopusdeploy/shell.kt b/src/main/kotlin/com/liftric/octopusdeploy/shell.kt
@@ -8,19 +8,19 @@ internal fun shell(cmd: String, logger: Logger): ShellResult = File(".").shell(c
 internal fun File.shell(cmd: String, logger: Logger): ShellResult {
     val tmpDir = System.getProperty("java.io.tmpdir")
     // GitHub Workflow Fix for Integration Test
-    val env = System.getenv().toMutableMap()
-    env["GITHUB_PATH"]?.let { githubPath ->
-        env["PATH"] = "${env["PATH"]}:$githubPath"
-    }
-    val envArray = env.map { (key, value) -> "$key=$value" }.toTypedArray()
+//    val env = System.getenv().toMutableMap()
+//    env["GITHUB_PATH"]?.let { githubPath ->
+//        env["PATH"] = "${env["PATH"]}:$githubPath"
+//    }
+//    val envArray = env.map { (key, value) -> "$key=$value" }.toTypedArray()
 
     // DOTNET_BUNDLE_EXTRACT_BASE_DIR is a workaround for https://github.com/dotnet/runtime/issues/3846
     val cmdarray = arrayOf("sh", "-c", "DOTNET_BUNDLE_EXTRACT_BASE_DIR=$tmpDir $cmd")
     val cmdDir = this
     logger.debug("shell: cmdarray='${cmdarray.toList()}'")
     logger.debug("shell: cmdDir='$cmdDir'")
     logger.debug("shell: tmpDir='$tmpDir'")
-    val process = Runtime.getRuntime().exec(cmdarray, envArray, cmdDir)
+    val process = Runtime.getRuntime().exec(cmdarray, emptyArray(), cmdDir)
     val exitCode = process.waitFor()
     val inputText = process.inputStream.bufferedReader().readText().trim()
     val errorText = process.errorStream.bufferedReader().readText().trim()