Skip to content

Commit b5e3e88

Browse files
authored
Merge branch 'master' into issue-731-linkDomain
2 parents 4259a68 + 37002ca commit b5e3e88

File tree

2 files changed

+13
-24
lines changed

2 files changed

+13
-24
lines changed

.github/workflows/pull_request.yml

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,11 @@ on:
88
branches: [ master ]
99

1010
concurrency:
11-
group: ci-${{ github.ref }}
11+
group: ci-pull-request-${{ github.ref }}
1212
cancel-in-progress: true
1313

1414
jobs:
15-
lintAndApiChecks:
16-
runs-on: macos-latest
17-
steps:
18-
- uses: actions/checkout@v4
19-
with:
20-
ref: ${{ github.head_ref }}
21-
- name: Set up JDK
22-
uses: actions/setup-java@v4
23-
with:
24-
distribution: 'zulu'
25-
java-version: '17'
26-
- uses: maxim-lobanov/setup-xcode@v1
27-
with:
28-
xcode-version: latest-stable
29-
- name: Lint Kotlin
30-
run: ./gradlew lintKotlin
31-
- name: Api File Update
32-
run: ./gradlew apiCheck
3315
jobMatrixSetup:
34-
needs: lintAndApiChecks
3516
runs-on: macos-latest
3617
outputs:
3718
emulator_jobs_matrix: ${{ steps.dataStep.outputs.emulator_jobs_matrix }}

.github/workflows/pull_request_target.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name: Pull Request Target
1+
name: Lint and API Checks
22

33
on:
44
pull_request_target:
55
branches: [ master ]
66

77
concurrency:
8-
group: ci-${{ github.ref }}
8+
group: ci-lint-api-check-${{ github.ref }}
99
cancel-in-progress: true
1010

1111
jobs:
@@ -15,13 +15,21 @@ jobs:
1515
contents: write
1616
steps:
1717
- uses: actions/checkout@v4
18-
with:
19-
ref: ${{ github.head_ref }}
2018
- name: Set up JDK
2119
uses: actions/setup-java@v4
2220
with:
2321
distribution: 'zulu'
2422
java-version: '17'
23+
cache: gradle
24+
- name: Cocoapods cache
25+
uses: actions/cache@v4
26+
with:
27+
path: |
28+
~/.cocoapods
29+
~/Library/Caches/CocoaPods
30+
*/build/cocoapods
31+
*/build/classes
32+
key: cocoapods-cache-v2
2533
- uses: maxim-lobanov/setup-xcode@v1
2634
with:
2735
xcode-version: latest-stable

0 commit comments

Comments
 (0)