Update GitHub workflow working directories to match the new Gradle bu…

…ild structure.
trafi · Jan 19, 2021 · 27d3304 · 27d3304
1 parent 8823f46
commit 27d3304
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/.github/workflows/android_tests.yml b/.github/workflows/android_tests.yml
@@ -31,7 +31,6 @@ jobs:
            emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim
            disable-animations: true
            script: ./gradlew executeScreenshotTests
-           working-directory: ./android
 
       -  name: Publish artifacts
          if: always()

diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml
@@ -17,32 +17,24 @@ jobs:
         if: always()
         uses: eskatos/gradle-command-action@v1
         with:
-          build-root-directory: android
-          wrapper-directory: android
           arguments: ktlintCheck
       - name: Lint
         if: always()
         uses: eskatos/gradle-command-action@v1
         with:
-          build-root-directory: android
-          wrapper-directory: android
           arguments: lint
       - name: Retain lint artifacts
         uses: actions/upload-artifact@v2
         with:
           name: lint
-          path: android/routes/ui/build/reports/lint-results.html
+          path: android/**/build/reports/lint-results.html
       - name: Test
         if: always()
         uses: eskatos/gradle-command-action@v1
         with:
-          build-root-directory: android
-          wrapper-directory: android
           arguments: test
       - name: Assemble
         if: always()
         uses: eskatos/gradle-command-action@v1
         with:
-          build-root-directory: android
-          wrapper-directory: android
           arguments: assemble
diff --git a/.github/workflows/ios_tests.yml b/.github/workflows/ios_tests.yml
@@ -16,9 +16,13 @@ jobs:
       - uses: devbotsxyz/xcode-select@v1
 
       - uses: actions/checkout@v2
+
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 11
 
       - name: Build xcframework
-        run: cd common && ./gradlew xcframeworkSimulator && cd ..
+        run: ./gradlew xcframeworkSimulator
 
       - name: Test
         run: xcodebuild -scheme MaaS-Package test -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 8' | xcpretty

diff --git a/.github/workflows/record_android_tests.yml b/.github/workflows/record_android_tests.yml
@@ -28,7 +28,6 @@ jobs:
            emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim
            disable-animations: true
            script: ./gradlew executeScreenshotTests -Precord
-           working-directory: ./android
 
       - name: Git Auto Commit
         uses: stefanzweifel/[email protected]