From f167cdb3dc9bf6c52af23bc0a91c072717ed2d3b Mon Sep 17 00:00:00 2001 From: Ubiratan Soares Date: Sun, 22 Sep 2024 20:01:13 +0200 Subject: [PATCH] Changing paths --- .github/workflows/ci.yml | 14 +++++++------- action.yml => scan/action.yml | 2 +- {src => scan}/main.sh | 0 {e2e => tests}/bitwarden-ios.sh | 2 +- {e2e => tests}/cromite-android.sh | 2 +- {src => tests}/fixtures.sh | 0 {e2e => tests}/pocketcasts-android.sh | 3 ++- {e2e => tests}/pocketcasts-ios.sh | 3 ++- 8 files changed, 14 insertions(+), 12 deletions(-) rename action.yml => scan/action.yml (81%) rename {src => scan}/main.sh (100%) rename {e2e => tests}/bitwarden-ios.sh (90%) rename {e2e => tests}/cromite-android.sh (89%) rename {src => tests}/fixtures.sh (100%) rename {e2e => tests}/pocketcasts-android.sh (87%) rename {e2e => tests}/pocketcasts-ios.sh (88%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 89e9e0d..e242797 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,22 +37,22 @@ jobs: uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Test scanning standalone Android apk - run: ./e2e/pocketcasts-android.sh + run: ./tests/pocketcasts-android.sh env: APPSWEEP_API_KEY: ${{ secrets.APPSWEEP_DOTANUKI_POCKETCASTS_ANDROID_KEY }} - name: Test scanning standalone iOS xcarchive - run: ./e2e/pocketcasts-ios.sh + run: ./tests/pocketcasts-ios.sh env: APPSWEEP_API_KEY: ${{ secrets.APPSWEEP_DOTANUKI_POCKETCASTS_IOS_KEY }} - name: Test scanning iOS ipa plus dSyms - run: ./e2e/bitwarden-ios.sh + run: ./tests/bitwarden-ios.sh env: APPSWEEP_API_KEY: ${{ secrets.APPSWEEP_DOTANUKI_BITWARDEN_IOS_KEY }} - name: Test scanning Android apk plus mappings - run: ./e2e/cromite-android.sh + run: ./tests/cromite-android.sh env: APPSWEEP_API_KEY: ${{ secrets.APPSWEEP_DOTANUKI_CROMITE_ANDROID_KEY }} @@ -65,15 +65,15 @@ jobs: uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Prepares fixtures - run: ./src/fixtures.sh + run: ./tests/fixtures.sh - name: Component test for iOS GHA - uses: ./ + uses: /scan with: archive-file: .tmp/pocket-casts-ios.xcarchive - name: Component test for Android GHA - uses: ./ + uses: /scan with: archive-file: .tmp/pocket-casts-android.apk wait-for-summary: true diff --git a/action.yml b/scan/action.yml similarity index 81% rename from action.yml rename to scan/action.yml index 1f75713..1cfbb0a 100644 --- a/action.yml +++ b/scan/action.yml @@ -23,4 +23,4 @@ runs: using: "composite" steps: - shell: bash - run: ${{ github.action_path }}src/main.sh --archive ${{ inputs.archive-file }} --extras ${{ inputs.symbols }} --summary ${{ inputs.wait-for-summary }} + run: ${{ github.action_path }}/main.sh --archive ${{ inputs.archive-file }} --extras ${{ inputs.symbols }} --summary ${{ inputs.wait-for-summary }} diff --git a/src/main.sh b/scan/main.sh similarity index 100% rename from src/main.sh rename to scan/main.sh diff --git a/e2e/bitwarden-ios.sh b/tests/bitwarden-ios.sh similarity index 90% rename from e2e/bitwarden-ios.sh rename to tests/bitwarden-ios.sh index 0b23228..2cdd2e2 100755 --- a/e2e/bitwarden-ios.sh +++ b/tests/bitwarden-ios.sh @@ -24,4 +24,4 @@ curl -fsSL -o "$actual_dir/.tmp/$ipa" -C - "$ipa_download_url" curl -fsSL -o "$actual_dir/.tmp/$dsyms_zip" -C - "$dsyms_download_url" unzip -d "$actual_dir/.tmp/dsyms" "$actual_dir/.tmp/$dsyms_zip" >/dev/null 2>&1 -src/main.sh --archive "$actual_dir/.tmp/$ipa" --extras "$actual_dir/.tmp/dsyms" +"$actual_dir"/scan/main.sh --archive "$actual_dir/.tmp/$ipa" --extras "$actual_dir/.tmp/dsyms" diff --git a/e2e/cromite-android.sh b/tests/cromite-android.sh similarity index 89% rename from e2e/cromite-android.sh rename to tests/cromite-android.sh index e7a78a8..dc0a24f 100755 --- a/e2e/cromite-android.sh +++ b/tests/cromite-android.sh @@ -23,4 +23,4 @@ rm -rf "$actual_dir/.tmp" && mkdir "$actual_dir/.tmp" curl -fsSL -o "$actual_dir/.tmp/$apk" -C - "$apk_download_url" curl -fsSL -o "$actual_dir/.tmp/$mappings" -C - "$mappings_download_url" -src/main.sh --archive "$actual_dir/.tmp/$apk" --extras "$actual_dir/.tmp/$mappings" +"$actual_dir"/scan/main.sh --archive "$actual_dir/.tmp/$apk" --extras "$actual_dir/.tmp/$mappings" diff --git a/src/fixtures.sh b/tests/fixtures.sh similarity index 100% rename from src/fixtures.sh rename to tests/fixtures.sh diff --git a/e2e/pocketcasts-android.sh b/tests/pocketcasts-android.sh similarity index 87% rename from e2e/pocketcasts-android.sh rename to tests/pocketcasts-android.sh index 523cfaa..353e1be 100755 --- a/e2e/pocketcasts-android.sh +++ b/tests/pocketcasts-android.sh @@ -16,4 +16,5 @@ actual_dir=$(pwd) rm -rf "$actual_dir/.tmp" && mkdir "$actual_dir/.tmp" curl -fsSL -o "$actual_dir/.tmp/$package" -C - "$download_url" -src/main.sh --archive "$actual_dir/.tmp/$package" --summary + +"$actual_dir"/scan/main.sh --archive "$actual_dir/.tmp/$package" --summary diff --git a/e2e/pocketcasts-ios.sh b/tests/pocketcasts-ios.sh similarity index 88% rename from e2e/pocketcasts-ios.sh rename to tests/pocketcasts-ios.sh index 2166ad3..e9fc02a 100755 --- a/e2e/pocketcasts-ios.sh +++ b/tests/pocketcasts-ios.sh @@ -16,4 +16,5 @@ actual_dir=$(pwd) rm -rf "$actual_dir/.tmp" && mkdir "$actual_dir/.tmp" curl -fsSL -o "$actual_dir/.tmp/$package" -C - "$download_url" -src/main.sh --archive "$actual_dir/.tmp/$package" --summary + +"$actual_dir"/scan/main.sh --archive "$actual_dir/.tmp/$package" --summary