Merge branch 'master' into release/v2

* master: Prepare for release 2.3.2. Fix escaped environment variables in script.
ReactiveCircus · Feb 4, 2020 · bdf1f83 · bdf1f83
2 parents 5dd12aa + d3a226f
commit bdf1f83
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -46,5 +46,6 @@ jobs:
         emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -camera-back none
         disable-animations: true
         script: |
+          echo $GITHUB_REPOSITORY
           ./gradlew help
           ./gradlew connectedDebugAndroidTest
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## v2.3.2
+
+* Fixed an issue where environment variables are escaped in script.
+
 ## v2.3.1
 
 * Bumped Android Build tools to 29.0.3.

diff --git a/lib/main.js b/lib/main.js
@@ -84,7 +84,7 @@ function run() {
             // execute the custom script
             try {
                 for (const script of scripts) {
-                    yield exec.exec(`${script}`);
+                    yield exec.exec(`sh -c \\"${script}"`);
                 }
             }
             catch (error) {

diff --git a/src/main.ts b/src/main.ts
@@ -79,7 +79,7 @@ async function run() {
     // execute the custom script
     try {
       for (const script of scripts) {
-        await exec.exec(`${script}`);
+        await exec.exec(`sh -c \\"${script}"`);
       }
     } catch (error) {
       core.setFailed(error.message);