Merge pull request #57 from faberNovel/feature/prepare_action_release

Feature/prepare action release
faberNovel · May 13, 2020 · 74a59fd · 74a59fd
2 parents 89ce451 + b9f07f4
commit 74a59fd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci_action.yml b/.github/workflows/ci_action.yml
@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Test action
-        uses: ./action
+        uses: ./
         id: docker-android-action
         with:
           exec: sh tests/run_tests.sh --android-api 29 --android-ndk --android-build-tools 29.0.3
@@ -28,7 +28,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Test action
-        uses: ./action
+        uses: ./
         id: docker-android-action
         with:
           exec: |

diff --git a/action/action.yml → action.yml b/action/action.yml → action.yml
@@ -10,7 +10,7 @@ inputs:
     required: true
 runs:
   using: 'docker'
-  image: 'Dockerfile'
+  image: 'action/Dockerfile'
   args:
     - ${{ inputs.docker-android-tag }}
     - ${{ inputs.exec }}
diff --git a/action/entrypoint.sh b/action/entrypoint.sh
@@ -14,4 +14,4 @@ docker run \
   -e HOME -e GITHUB_JOB -e GITHUB_REF -e GITHUB_SHA -e GITHUB_REPOSITORY -e GITHUB_REPOSITORY_OWNER -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_ACTOR -e GITHUB_WORKFLOW -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e GITHUB_EVENT_NAME -e GITHUB_WORKSPACE -e GITHUB_ACTION -e GITHUB_EVENT_PATH -e RUNNER_OS -e RUNNER_TOOL_CACHE -e RUNNER_TEMP -e RUNNER_WORKSPACE -e ACTIONS_RUNTIME_URL -e ACTIONS_RUNTIME_TOKEN -e ACTIONS_CACHE_URL -e GITHUB_ACTIONS=true -e CI=true \
   --rm \
   $full_image_name \
-  $exec
+  /bin/sh -c "$exec"