From f12b7bdc615d1cca7e4d787d2577f8e21aef05ab Mon Sep 17 00:00:00 2001 From: Todd Anderson Date: Mon, 4 Mar 2024 16:25:51 -0600 Subject: [PATCH] ci: more release please changes --- .github/actions/ci/action.yml | 47 ++++++----------------------------- .github/workflows/ci.yml | 2 +- 2 files changed, 9 insertions(+), 40 deletions(-) diff --git a/.github/actions/ci/action.yml b/.github/actions/ci/action.yml index 7dabbb13..5cbe3642 100644 --- a/.github/actions/ci/action.yml +++ b/.github/actions/ci/action.yml @@ -28,36 +28,15 @@ runs: - name: Setup Android SDK uses: android-actions/setup-android@v3 - # - name: Build - # shell: bash - # id: build - # run: ./gradlew jar - # - # - name: Run Unit Tests - # if: inputs.run_tests == 'true' - # shell: bash - # run: ./gradlew test + - name: Build + shell: bash + id: build + run: ./gradlew jar -# - name: Enable KVM group perms -# # https://github.blog/changelog/2023-02-23-hardware-accelerated-android-virtualization-on-actions-windows-and-linux-larger-hosted-runners/ -# # Starting on February 23, 2023, Actions users of GitHub-hosted larger Linux runners will be able to make use of hardware acceleration for Android testing -# shell: bash -# run: | -# echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules -# sudo udevadm control --reload-rules -# sudo udevadm trigger --name-match=kvm - -# - name: Determine emulator target -# id: determine-target -# shell: bash -# run: | -# TARGET="google_apis" -# if [[ ${{ matrix.api-level }} -ge 30 ]]; then -# TARGET="aosp_atd" -# elif [[ ${{ matrix.api-level }} -le 27 ]]; then -# TARGET="default" -# fi -# echo "TARGET=$TARGET" >> "$GITHUB_OUTPUT" + - name: Run Unit Tests + if: inputs.run_tests == 'true' + shell: bash + run: ./gradlew test - name: Perform instrumented API Level 33 Test uses: reactivecircus/android-emulator-runner@v2 @@ -68,13 +47,3 @@ runs: emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -logcat-output ${{ github.workspace }}/app/build/reports/avd33.log disable-animations: true script: ./gradlew connectedDebugAndroidTest - - - # - name: Run Android Instrumentation Tests - # uses: reactivecircus/android-emulator-runner@v2 - # if: ${{ inputs.run_tests == 'true' }} - # with: - # api-level: ${{ inputs.android_api_level }} - # target: google_apis - # arch: x86_64 - # script: ./gradlew connectedDebugAndroidTest \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d1d3d81f..16e27994 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,7 @@ name: Build and Test on: workflow_dispatch: push: - branches: [ 'main' ] + branches: [ 'main','ta/sc-234641/release-please'] paths-ignore: - '**.md' # Do not need to run CI for markdown changes. pull_request: