Skip to content

Commit 2c7e27e

Browse files
authored
ci: revert CI to a single workflow file (#2705)
1 parent 7810025 commit 2c7e27e

File tree

3 files changed

+8
-34
lines changed

3 files changed

+8
-34
lines changed

.github/workflows/build_pull_request.yml renamed to .github/workflows/android.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
name: build_pull_request.sh
1+
name: Android CI
22

33
on:
44
pull_request:
5+
push:
56

67
concurrency:
7-
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
8+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
89
cancel-in-progress: true
910

1011
jobs:
@@ -29,3 +30,7 @@ jobs:
2930
run: ./copy_mock_google_services_json.sh
3031
- name: Build with Gradle (Pull Request)
3132
run: ./build_pull_request.sh
33+
if: github.event_name == 'pull_request'
34+
- name: Build with Gradle (Push)
35+
run: ./gradlew clean ktlint assemble
36+
if: github.event_name != 'pull_request'

.github/workflows/build_branch.yml

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

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ Please read and follow the steps in the [CONTRIBUTING.md](CONTRIBUTING.md)
3939
[![SAM Score][sam-score-badge]][sam-score]
4040

4141
[gh-actions]: https://github.com/firebase/quickstart-android/actions
42-
[gh-actions-badge]: https://github.com/firebase/quickstart-android/actions/workflows/build_branch.yml/badge.svg?branch=master&event=push
42+
[gh-actions-badge]: https://github.com/firebase/quickstart-android/actions/workflows/android.yml/badge.svg?branch=master&event=push
4343
[sam-score]: https://ossbot.computer/samscore.html
4444
[sam-score-badge]: https://ossbot.computer/samscorebadge?org=firebase&repo=quickstart-android

0 commit comments

Comments
 (0)