Skip to content

Commit

Permalink
Merge pull request #361 from ytai/ShowOS
Browse files Browse the repository at this point in the history
Bump android action
  • Loading branch information
hannesa2 authored May 9, 2024
2 parents 6f0ab81 + 3bfacf7 commit 52d4fe1
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Android-CI-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
distribution: 'adopt'
java-version: 11
- name: Install Android SDK
uses: malinskiy/action-android/install-sdk@release/0.1.4
uses: hannesa2/action-android/[email protected].16.7
- name: Build project
run: ./gradlew clean build
env:
Expand Down
23 changes: 15 additions & 8 deletions .github/workflows/Android-CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ on: [ pull_request ]

jobs:
buildTest:
name: Build & Test JDK ${{ matrix.java_version }}
runs-on: macOS-latest
name: Test
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
java_version: [ 11 ]
os: [ macOS-13 ]
java_version: [ 17 ]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -21,13 +23,13 @@ jobs:
java-version: ${{ matrix.java_version }}
- uses: gradle/wrapper-validation-action@v3
- name: Install Android SDK
uses: malinskiy/action-android/install-sdk@release/0.1.4
uses: hannesa2/action-android/[email protected].16.7
- name: Run tests
run: ./gradlew test
env:
VERSION: ${{ github.ref }}
- name: Run instrumentation tests
uses: malinskiy/action-android/emulator-run-cmd@release/0.1.4
uses: hannesa2/action-android/[email protected].16.7
env:
VERSION: ${{ github.ref }}
with:
Expand Down Expand Up @@ -58,7 +60,12 @@ jobs:
applications/**/build/outputs/androidTest-results/connected
Check:
name: Check
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest ]
java_version: [ 17 ]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -68,9 +75,9 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: 11
java-version: ${{ matrix.java_version }}
- name: Install Android SDK
uses: malinskiy/action-android/install-sdk@release/0.1.4
uses: hannesa2/action-android/[email protected].16.7
- name: Code checks
run: ./gradlew check
- name: Archive Lint report
Expand Down

0 comments on commit 52d4fe1

Please sign in to comment.