Skip to content

Commit b3bc892

Browse files
authored
Merge branch 'master' into feature/firestor-add-databaseid
2 parents 33298ae + 414c0fc commit b3bc892

File tree

2 files changed

+19
-42
lines changed

2 files changed

+19
-42
lines changed

.github/workflows/pull_request.yml

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,34 @@ on:
77
pull_request:
88
branches: [ master ]
99

10+
concurrency:
11+
group: ci-${{ github.ref }}
12+
cancel-in-progress: true
13+
1014
jobs:
11-
lint:
12-
runs-on: ubuntu-latest
15+
lintAndApiChecks:
16+
runs-on: macos-latest
17+
permissions:
18+
contents: write
1319
steps:
1420
- uses: actions/checkout@v4
21+
with:
22+
ref: ${{ github.head_ref }}
1523
- name: Set up JDK
1624
uses: actions/setup-java@v4
1725
with:
1826
distribution: 'zulu'
1927
java-version: '17'
20-
- name: ktLint
21-
run: ./gradlew lintKotlin
22-
apiCheck:
23-
runs-on: ubuntu-latest
24-
steps:
25-
- uses: actions/checkout@v4
26-
- name: Set up JDK
27-
uses: actions/setup-java@v4
28-
with:
29-
distribution: 'zulu'
30-
java-version: '17'
31-
- name: Run Api Check
32-
run: ./gradlew apiCheck
28+
- uses: maxim-lobanov/setup-xcode@v1
29+
with:
30+
xcode-version: latest-stable
31+
- name: Format Kotlin
32+
run: ./gradlew formatKotlin
33+
- name: Api File Update
34+
run: ./gradlew apiDump
35+
- uses: stefanzweifel/git-auto-commit-action@v6
3336
jobMatrixSetup:
37+
needs: lintAndApiChecks
3438
runs-on: macos-latest
3539
outputs:
3640
emulator_jobs_matrix: ${{ steps.dataStep.outputs.emulator_jobs_matrix }}

.github/workflows/push.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)