Skip to content

Commit

Permalink
Merge branch 'feature/compose-sdk' of github.com:hCaptcha/hcaptcha-an…
Browse files Browse the repository at this point in the history
…droid-sdk into feature/compose-sdk
  • Loading branch information
CAMOBAP committed May 18, 2024
2 parents 8eeccc0 + 50f5f2b commit 665eae3
Showing 1 changed file with 33 additions and 33 deletions.
66 changes: 33 additions & 33 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ jobs:
name: 'Test Unit'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: adopt
- uses: gradle/gradle-build-action@v2
- uses: gradle/gradle-build-action@v3
with:
cache-read-only: false
- name: 'Build'
Expand Down Expand Up @@ -66,12 +66,12 @@ jobs:
target: 30
appcompat: 1.3.1
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: adopt
- uses: gradle/gradle-build-action@v2
- uses: gradle/gradle-build-action@v3
with:
cache-read-only: false
- run: |
Expand All @@ -89,16 +89,16 @@ jobs:
api-level: [30]
target: [default]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: adopt
- uses: gradle/gradle-build-action@v2
- uses: gradle/gradle-build-action@v3
with:
cache-read-only: false
- name: 'Cache AVD'
uses: actions/cache@v3
uses: actions/cache@v4
id: avd-cache
with:
path: |
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:
brew install parallel
parallel --retries 3 ::: "./gradlew test:connectedCheck"
- if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: androidTest-results
path: |
Expand All @@ -154,16 +154,16 @@ jobs:
api-level: [30]
target: [default]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: adopt
- uses: gradle/gradle-build-action@v2
- uses: gradle/gradle-build-action@v3
with:
cache-read-only: false
- name: 'Cache AVD'
uses: actions/cache@v3
uses: actions/cache@v4
id: avd-cache
with:
path: |
Expand Down Expand Up @@ -201,7 +201,7 @@ jobs:
brew install parallel
parallel --retries 3 ::: "./gradlew test:connectedCheck -P testingMinimizedBuild=true -P android.enableR8.fullMode=false"
- if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: androidTest-minified-results
path: |
Expand All @@ -211,23 +211,23 @@ jobs:
test-benchmark:
name: 'Test Benchmark'
runs-on: ubuntu-latest
timeout-minutes: 20
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
api-level: [30]
target: [default]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: adopt
- uses: gradle/gradle-build-action@v2
- uses: gradle/gradle-build-action@v3
with:
cache-read-only: false
- name: 'Cache AVD'
uses: actions/cache@v3
uses: actions/cache@v4
id: avd-cache
with:
path: |
Expand Down Expand Up @@ -269,13 +269,13 @@ jobs:
compare-with: benchmark/build/outputs/connected_android_test_additional_output/releaseAndroidTest/connected/test(AVD) - 10/com_hcaptcha_sdk_bench_test-benchmarkData.json
- name: Log diff benchmark reuslts
run: echo "${{ steps.diff-benchmark.outputs.markdown-table }}"
- uses: peter-evans/find-comment@v2
- uses: peter-evans/find-comment@v3
if: github.ref != 'refs/heads/main'
id: find_comment
with:
issue-number: ${{ github.event.pull_request.number }}
body-includes: Benchmark report
- uses: peter-evans/create-or-update-comment@v2
- uses: peter-evans/create-or-update-comment@v4
if: ${{ github.ref != 'refs/heads/main' && (steps.diff-benchmark.outputs.markdown-table != null || steps.find_comment.outputs.comment-id != null) }}
with:
body: |
Expand All @@ -286,7 +286,7 @@ jobs:
comment-id: ${{ steps.find_comment.outputs.comment-id }}
issue-number: ${{ github.event.pull_request.number }}
token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: benchmark-json-output
path: benchmark/build/outputs/connected_android_test_additional_output
Expand All @@ -296,17 +296,17 @@ jobs:
needs: [ test ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: adopt
- uses: gradle/gradle-build-action@v2
- uses: gradle/gradle-build-action@v3
with:
cache-read-only: false
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
Expand All @@ -322,14 +322,14 @@ jobs:
if: github.ref != 'refs/heads/main'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: adopt
- uses: gradle/gradle-build-action@v2
- uses: gradle/gradle-build-action@v3
with:
cache-read-only: false
- name: 'Build'
Expand All @@ -346,12 +346,12 @@ jobs:
with:
old-file-path: sdk-main.aar
new-file-path: sdk-pr.aar
- uses: peter-evans/find-comment@v2
- uses: peter-evans/find-comment@v3
id: find_comment
with:
issue-number: ${{ github.event.pull_request.number }}
body-includes: Diffuse report
- uses: peter-evans/create-or-update-comment@v2
- uses: peter-evans/create-or-update-comment@v4
if: ${{ steps.diffuse.outputs.diff-raw != null || steps.find_comment.outputs.comment-id != null }}
with:
body: |
Expand Down

0 comments on commit 665eae3

Please sign in to comment.