Skip to content

Commit 8f27ce0

Browse files
arriolacarriolac
authored
Remove runs-on and timeout-minutes config from JetNews.yml (#832)
* Revert "Revert "Reuse build workflow (#819)" (#824)" This reverts commit 17db314. * Remove runs-on and timeout-minutes config from JetNews.yml.
1 parent 5dd149f commit 8f27ce0

File tree

7 files changed

+30
-433
lines changed

7 files changed

+30
-433
lines changed

‎.github/workflows/Crane.yaml

Lines changed: 5 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -11,72 +11,16 @@ on:
1111
paths:
1212
- '.github/workflows/Crane.yaml'
1313
- 'Crane/**'
14-
concurrency:
15-
group: crane-build-${{ github.ref }}
16-
cancel-in-progress: true
14+
workflow_dispatch:
1715
env:
1816
SAMPLE_PATH: Crane
1917

2018
jobs:
2119
build:
22-
runs-on: ubuntu-latest
23-
timeout-minutes: 30
24-
25-
steps:
26-
- name: Checkout
27-
uses: actions/checkout@v2
28-
29-
- name: Copy CI gradle.properties
30-
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
31-
32-
- name: Set up JDK 11
33-
uses: actions/setup-java@v1
34-
with:
35-
java-version: 11
36-
37-
- name: Generate cache key
38-
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
39-
40-
- uses: actions/cache@v2
41-
with:
42-
path: |
43-
~/.gradle/caches/modules-*
44-
~/.gradle/caches/jars-*
45-
~/.gradle/caches/build-cache-*
46-
key: gradle-${{ hashFiles('checksum.txt') }}
47-
48-
- name: Check spotless
49-
working-directory: ${{ env.SAMPLE_PATH }}
50-
run: ./gradlew spotlessCheck --stacktrace
51-
52-
- name: Check lint
53-
working-directory: ${{ env.SAMPLE_PATH }}
54-
run: ./gradlew lintDebug --stacktrace
55-
56-
- name: Build debug
57-
working-directory: ${{ env.SAMPLE_PATH }}
58-
run: ./gradlew assembleDebug --stacktrace
59-
60-
- name: Build release
61-
working-directory: ${{ env.SAMPLE_PATH }}
62-
run: ./gradlew assembleRelease --stacktrace
63-
64-
- name: Run local tests
65-
working-directory: ${{ env.SAMPLE_PATH }}
66-
run: ./gradlew testDebug --stacktrace
67-
68-
- name: Upload build outputs (APKs)
69-
uses: actions/upload-artifact@v2
70-
with:
71-
name: build-outputs
72-
path: ${{ env.SAMPLE_PATH }}/app/build/outputs
73-
74-
- name: Upload build reports
75-
if: always()
76-
uses: actions/upload-artifact@v2
77-
with:
78-
name: build-reports
79-
path: ${{ env.SAMPLE_PATH }}/app/build/reports
20+
uses: android/compose-samples/.github/workflows/build-sample.yml@main
21+
with:
22+
name: Crane
23+
path: Crane
8024

8125
test:
8226
needs: build

‎.github/workflows/JetNews.yaml

Lines changed: 4 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -11,72 +11,15 @@ on:
1111
paths:
1212
- '.github/workflows/JetNews.yaml'
1313
- 'JetNews/**'
14-
concurrency:
15-
group: jetnews-build-${{ github.ref }}
16-
cancel-in-progress: true
1714
env:
1815
SAMPLE_PATH: JetNews
1916

2017
jobs:
2118
build:
22-
runs-on: ubuntu-latest
23-
timeout-minutes: 30
24-
25-
steps:
26-
- name: Checkout
27-
uses: actions/checkout@v2
28-
29-
- name: Copy CI gradle.properties
30-
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
31-
32-
- name: Set up JDK 11
33-
uses: actions/setup-java@v1
34-
with:
35-
java-version: 11
36-
37-
- name: Generate cache key
38-
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
39-
40-
- uses: actions/cache@v2
41-
with:
42-
path: |
43-
~/.gradle/caches/modules-*
44-
~/.gradle/caches/jars-*
45-
~/.gradle/caches/build-cache-*
46-
key: gradle-${{ hashFiles('checksum.txt') }}
47-
48-
- name: Check spotless
49-
working-directory: ${{ env.SAMPLE_PATH }}
50-
run: ./gradlew spotlessCheck --stacktrace
51-
52-
- name: Check lint
53-
working-directory: ${{ env.SAMPLE_PATH }}
54-
run: ./gradlew lintDebug --stacktrace
55-
56-
- name: Build debug
57-
working-directory: ${{ env.SAMPLE_PATH }}
58-
run: ./gradlew assembleDebug --stacktrace
59-
60-
- name: Build release
61-
working-directory: ${{ env.SAMPLE_PATH }}
62-
run: ./gradlew assembleRelease --stacktrace
63-
64-
- name: Run local tests
65-
working-directory: ${{ env.SAMPLE_PATH }}
66-
run: ./gradlew testDebug --stacktrace
67-
68-
- name: Upload build outputs (APKs)
69-
uses: actions/upload-artifact@v2
70-
with:
71-
name: build-outputs
72-
path: ${{ env.SAMPLE_PATH }}/app/build/outputs
73-
74-
- name: Upload build reports
75-
if: always()
76-
uses: actions/upload-artifact@v2
77-
with:
78-
name: build-reports
79-
path: ${{ env.SAMPLE_PATH }}/app/build/reports
19+
uses: android/compose-samples/.github/workflows/build-sample.yml@main
20+
with:
21+
name: JetNews
22+
path: JetNews
8023

8124
androidTest:
8225
needs: build

‎.github/workflows/Jetcaster.yaml

Lines changed: 5 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -11,69 +11,11 @@ on:
1111
paths:
1212
- '.github/workflows/Jetcaster.yaml'
1313
- 'Jetcaster/**'
14-
concurrency:
15-
group: jetcaster-build-${{ github.ref }}
16-
cancel-in-progress: true
17-
env:
18-
SAMPLE_PATH: Jetcaster
14+
workflow_dispatch:
1915

2016
jobs:
2117
build:
22-
runs-on: ubuntu-latest
23-
timeout-minutes: 30
24-
25-
steps:
26-
- name: Checkout
27-
uses: actions/checkout@v2
28-
29-
- name: Copy CI gradle.properties
30-
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
31-
32-
- name: Set up JDK 11
33-
uses: actions/setup-java@v1
34-
with:
35-
java-version: 11
36-
37-
- name: Generate cache key
38-
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
39-
40-
- uses: actions/cache@v2
41-
with:
42-
path: |
43-
~/.gradle/caches/modules-*
44-
~/.gradle/caches/jars-*
45-
~/.gradle/caches/build-cache-*
46-
key: gradle-${{ hashFiles('checksum.txt') }}
47-
48-
- name: Check spotless
49-
working-directory: ${{ env.SAMPLE_PATH }}
50-
run: ./gradlew spotlessCheck --stacktrace
51-
52-
- name: Check lint
53-
working-directory: ${{ env.SAMPLE_PATH }}
54-
run: ./gradlew lintDebug --stacktrace
55-
56-
- name: Build debug
57-
working-directory: ${{ env.SAMPLE_PATH }}
58-
run: ./gradlew assembleDebug --stacktrace
59-
60-
- name: Build release
61-
working-directory: ${{ env.SAMPLE_PATH }}
62-
run: ./gradlew assembleRelease --stacktrace
63-
64-
- name: Run local tests
65-
working-directory: ${{ env.SAMPLE_PATH }}
66-
run: ./gradlew testDebug --stacktrace
67-
68-
- name: Upload build outputs (APKs)
69-
uses: actions/upload-artifact@v2
70-
with:
71-
name: build-outputs
72-
path: ${{ env.SAMPLE_PATH }}/app/build/outputs
73-
74-
- name: Upload build reports
75-
if: always()
76-
uses: actions/upload-artifact@v2
77-
with:
78-
name: build-reports
79-
path: ${{ env.SAMPLE_PATH }}/app/build/reports
18+
uses: android/compose-samples/.github/workflows/build-sample.yml@main
19+
with:
20+
name: Jetcaster
21+
path: Jetcaster

‎.github/workflows/Jetchat.yaml

Lines changed: 4 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -11,72 +11,15 @@ on:
1111
paths:
1212
- '.github/workflows/Jetchat.yaml'
1313
- 'Jetchat/**'
14-
concurrency:
15-
group: jetchat-build-${{ github.ref }}
16-
cancel-in-progress: true
1714
env:
1815
SAMPLE_PATH: Jetchat
1916

2017
jobs:
2118
build:
22-
runs-on: ubuntu-latest
23-
timeout-minutes: 30
24-
25-
steps:
26-
- name: Checkout
27-
uses: actions/checkout@v2
28-
29-
- name: Copy CI gradle.properties
30-
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
31-
32-
- name: Set up JDK 11
33-
uses: actions/setup-java@v1
34-
with:
35-
java-version: 11
36-
37-
- name: Generate cache key
38-
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
39-
40-
- uses: actions/cache@v2
41-
with:
42-
path: |
43-
~/.gradle/caches/modules-*
44-
~/.gradle/caches/jars-*
45-
~/.gradle/caches/build-cache-*
46-
key: gradle-${{ hashFiles('checksum.txt') }}
47-
48-
- name: Check spotless
49-
working-directory: ${{ env.SAMPLE_PATH }}
50-
run: ./gradlew spotlessCheck --stacktrace
51-
52-
- name: Check lint
53-
working-directory: ${{ env.SAMPLE_PATH }}
54-
run: ./gradlew lintDebug --stacktrace
55-
56-
- name: Build debug
57-
working-directory: ${{ env.SAMPLE_PATH }}
58-
run: ./gradlew assembleDebug --stacktrace
59-
60-
- name: Build release
61-
working-directory: ${{ env.SAMPLE_PATH }}
62-
run: ./gradlew assembleRelease --stacktrace
63-
64-
- name: Run local tests
65-
working-directory: ${{ env.SAMPLE_PATH }}
66-
run: ./gradlew testDebug --stacktrace
67-
68-
- name: Upload build outputs (APKs)
69-
uses: actions/upload-artifact@v2
70-
with:
71-
name: build-outputs
72-
path: ${{ env.SAMPLE_PATH }}/app/build/outputs
73-
74-
- name: Upload build reports
75-
if: always()
76-
uses: actions/upload-artifact@v2
77-
with:
78-
name: build-reports
79-
path: ${{ env.SAMPLE_PATH }}/app/build/reports
19+
uses: android/compose-samples/.github/workflows/build-sample.yml@main
20+
with:
21+
name: Jetchat
22+
path: Jetchat
8023

8124
test:
8225
needs: build

‎.github/workflows/Jetsnack.yaml

Lines changed: 4 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -11,69 +11,10 @@ on:
1111
paths:
1212
- '.github/workflows/Jetsnack.yaml'
1313
- 'Jetsnack/**'
14-
concurrency:
15-
group: jetsnack-build-${{ github.ref }}
16-
cancel-in-progress: true
17-
env:
18-
SAMPLE_PATH: Jetsnack
1914

2015
jobs:
2116
build:
22-
runs-on: ubuntu-latest
23-
timeout-minutes: 30
24-
25-
steps:
26-
- name: Checkout
27-
uses: actions/checkout@v2
28-
29-
- name: Copy CI gradle.properties
30-
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
31-
32-
- name: Set up JDK 11
33-
uses: actions/setup-java@v1
34-
with:
35-
java-version: 11
36-
37-
- name: Generate cache key
38-
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
39-
40-
- uses: actions/cache@v2
41-
with:
42-
path: |
43-
~/.gradle/caches/modules-*
44-
~/.gradle/caches/jars-*
45-
~/.gradle/caches/build-cache-*
46-
key: gradle-${{ hashFiles('checksum.txt') }}
47-
48-
- name: Check spotless
49-
working-directory: ${{ env.SAMPLE_PATH }}
50-
run: ./gradlew spotlessCheck --stacktrace
51-
52-
- name: Check lint
53-
working-directory: ${{ env.SAMPLE_PATH }}
54-
run: ./gradlew lintDebug --stacktrace
55-
56-
- name: Build debug
57-
working-directory: ${{ env.SAMPLE_PATH }}
58-
run: ./gradlew assembleDebug --stacktrace
59-
60-
- name: Build release
61-
working-directory: ${{ env.SAMPLE_PATH }}
62-
run: ./gradlew assembleRelease --stacktrace
63-
64-
- name: Run local tests
65-
working-directory: ${{ env.SAMPLE_PATH }}
66-
run: ./gradlew testDebug --stacktrace
67-
68-
- name: Upload build outputs (APKs)
69-
uses: actions/upload-artifact@v2
70-
with:
71-
name: build-outputs
72-
path: ${{ env.SAMPLE_PATH }}/app/build/outputs
73-
74-
- name: Upload build reports
75-
if: always()
76-
uses: actions/upload-artifact@v2
77-
with:
78-
name: build-reports
79-
path: ${{ env.SAMPLE_PATH }}/app/build/reports
17+
uses: android/compose-samples/.github/workflows/build-sample.yml@main
18+
with:
19+
name: Jetsnack
20+
path: Jetsnack

0 commit comments

Comments
 (0)