Changing paths

dotanuki-labs · Sep 22, 2024 · f167cdb · f167cdb
1 parent 2343b6b
commit f167cdb
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git 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 → scan/action.yml b/action.yml → 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 → scan/main.sh b/src/main.sh → scan/main.sh
diff --git a/e2e/bitwarden-ios.sh → tests/bitwarden-ios.sh b/e2e/bitwarden-ios.sh → 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 → tests/cromite-android.sh b/e2e/cromite-android.sh → 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 → tests/fixtures.sh b/src/fixtures.sh → tests/fixtures.sh
diff --git a/e2e/pocketcasts-android.sh → tests/pocketcasts-android.sh b/e2e/pocketcasts-android.sh → 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 → tests/pocketcasts-ios.sh b/e2e/pocketcasts-ios.sh → 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