Skip to content

Commit ffa2a26

Browse files
cartlandcartland
authored
Merge pull request #613 from cartland/workflow_dispatch
Add triggers to .github/workflows/
2 parents d9ac34a + 803a89a commit ffa2a26

File tree

11 files changed

+220
-40
lines changed

11 files changed

+220
-40
lines changed

‎.github/scripts/gradlew_recursive.sh‎

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

‎.github/workflows/android.yml‎

Lines changed: 201 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,220 @@
1515
name: Android CI
1616

1717
on:
18+
workflow_dispatch:
1819
push:
1920
branches: [ main ]
2021
pull_request:
2122
branches: [ main ]
2223

2324
jobs:
24-
25-
build:
26-
name: Build
27-
runs-on: ubuntu-18.04
28-
25+
camerax_basic:
26+
name: CameraXBasic
27+
runs-on: ubuntu-latest
28+
steps:
29+
- uses: actions/checkout@v4
30+
- name: set up JDK 17
31+
uses: actions/setup-java@v4
32+
with:
33+
distribution: 'zulu'
34+
java-version: '17'
35+
- name: Build project
36+
working-directory: CameraXBasic
37+
run: ./gradlew assembleDebug
38+
- name: Zip artifacts
39+
working-directory: CameraXBasic
40+
run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
41+
- name: Upload artifacts
42+
uses: actions/upload-artifact@v4
43+
with:
44+
name: camerax_basic_assemble
45+
path: CameraXBasic/assemble.zip
46+
camerax_extensions:
47+
name: CameraXExtensions
48+
runs-on: ubuntu-latest
49+
steps:
50+
- uses: actions/checkout@v4
51+
- name: set up JDK 17
52+
uses: actions/setup-java@v4
53+
with:
54+
distribution: 'zulu'
55+
java-version: '17'
56+
- name: Build project
57+
working-directory: CameraXExtensions
58+
run: ./gradlew assembleDebug
59+
- name: Zip artifacts
60+
working-directory: CameraXExtensions
61+
run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
62+
- name: Upload artifacts
63+
uses: actions/upload-artifact@v4
64+
with:
65+
name: camerax_extensions_assemble
66+
path: CameraXExtensions/assemble.zip
67+
camerax_video:
68+
name: CameraXVideo
69+
runs-on: ubuntu-latest
70+
steps:
71+
- uses: actions/checkout@v4
72+
- name: set up JDK 17
73+
uses: actions/setup-java@v4
74+
with:
75+
distribution: 'zulu'
76+
java-version: '17'
77+
- name: Build project
78+
working-directory: CameraXVideo
79+
run: ./gradlew assembleDebug
80+
- name: Zip artifacts
81+
working-directory: CameraXVideo
82+
run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
83+
- name: Upload artifacts
84+
uses: actions/upload-artifact@v4
85+
with:
86+
name: camerax_video_assemble
87+
path: CameraXVideo/assemble.zip
88+
camerax_advanced:
89+
name: CameraXAdvanced
90+
runs-on: ubuntu-latest
91+
steps:
92+
- uses: actions/checkout@v4
93+
- name: set up JDK 17
94+
uses: actions/setup-java@v4
95+
with:
96+
distribution: 'zulu'
97+
java-version: '17'
98+
- name: Build project
99+
working-directory: CameraXAdvanced
100+
run: ./gradlew assembleDebug
101+
- name: Zip artifacts
102+
working-directory: CameraXAdvanced
103+
run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
104+
- name: Upload artifacts
105+
uses: actions/upload-artifact@v4
106+
with:
107+
name: camerax_advanced_assemble
108+
path: CameraXAdvanced/assemble.zip
109+
camerax_mlkit:
110+
name: CameraX-MLKit
111+
runs-on: ubuntu-latest
112+
steps:
113+
- uses: actions/checkout@v4
114+
- name: set up JDK 17
115+
uses: actions/setup-java@v4
116+
with:
117+
distribution: 'zulu'
118+
java-version: '17'
119+
- name: Build project
120+
working-directory: CameraX-MLKit
121+
run: ./gradlew assembleDebug
122+
- name: Zip artifacts
123+
working-directory: CameraX-MLKit
124+
run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
125+
- name: Upload artifacts
126+
uses: actions/upload-artifact@v4
127+
with:
128+
name: camerax_mlkit_assemble
129+
path: CameraX-MLKit/assemble.zip
130+
camera2_basic:
131+
name: Camera2Basic
132+
runs-on: ubuntu-latest
133+
steps:
134+
- uses: actions/checkout@v4
135+
- name: set up JDK 17
136+
uses: actions/setup-java@v4
137+
with:
138+
distribution: 'zulu'
139+
java-version: '17'
140+
- name: Build project
141+
working-directory: Camera2Basic
142+
run: ./gradlew assembleDebug
143+
- name: Zip artifacts
144+
working-directory: Camera2Basic
145+
run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
146+
- name: Upload artifacts
147+
uses: actions/upload-artifact@v4
148+
with:
149+
name: camera2_basic_assemble
150+
path: Camera2Basic/assemble.zip
151+
camera2_extensions:
152+
name: Camera2Extensions
153+
runs-on: ubuntu-latest
154+
steps:
155+
- uses: actions/checkout@v4
156+
- name: set up JDK 17
157+
uses: actions/setup-java@v4
158+
with:
159+
distribution: 'zulu'
160+
java-version: '17'
161+
- name: Build project
162+
working-directory: Camera2Extensions
163+
run: ./gradlew assembleDebug
164+
- name: Zip artifacts
165+
working-directory: Camera2Extensions
166+
run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
167+
- name: Upload artifacts
168+
uses: actions/upload-artifact@v4
169+
with:
170+
name: camera2_extensions_assemble
171+
path: Camera2Extensions/assemble.zip
172+
camera2_video:
173+
name: Camera2Video
174+
runs-on: ubuntu-latest
175+
steps:
176+
- uses: actions/checkout@v4
177+
- name: set up JDK 17
178+
uses: actions/setup-java@v4
179+
with:
180+
distribution: 'zulu'
181+
java-version: '17'
182+
- name: Build project
183+
working-directory: Camera2Video
184+
run: ./gradlew assembleDebug
185+
- name: Zip artifacts
186+
working-directory: Camera2Video
187+
run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
188+
- name: Upload artifacts
189+
uses: actions/upload-artifact@v4
190+
with:
191+
name: camera2_video_assemble
192+
path: Camera2Video/assemble.zip
193+
camera2_slowmotion:
194+
name: Camera2SlowMotion
195+
runs-on: ubuntu-latest
196+
steps:
197+
- uses: actions/checkout@v4
198+
- name: set up JDK 11
199+
uses: actions/setup-java@v4
200+
with:
201+
distribution: 'zulu'
202+
java-version: '11'
203+
- name: Build project
204+
working-directory: Camera2SlowMotion
205+
run: ./gradlew assembleDebug
206+
- name: Zip artifacts
207+
working-directory: Camera2SlowMotion
208+
run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
209+
- name: Upload artifacts
210+
uses: actions/upload-artifact@v4
211+
with:
212+
name: camera2_slowmotion_assemble
213+
path: Camera2SlowMotion/assemble.zip
214+
camerautils:
215+
name: CameraUtils
216+
runs-on: ubuntu-latest
29217
steps:
30-
- uses: actions/checkout@v2
218+
- uses: actions/checkout@v4
31219
- name: set up JDK 11
32-
uses: actions/setup-java@v2
220+
uses: actions/setup-java@v4
33221
with:
34222
distribution: 'zulu'
35223
java-version: '11'
36224
- name: Build project
37-
run: .github/scripts/gradlew_recursive.sh assembleDebug
225+
working-directory: CameraUtils
226+
run: ./gradlew assembleDebug
38227
- name: Zip artifacts
228+
working-directory: CameraUtils
39229
run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
40230
- name: Upload artifacts
41-
uses: actions/upload-artifact@v1
231+
uses: actions/upload-artifact@v4
42232
with:
43-
name: assemble
44-
path: assemble.zip
233+
name: camerautils_assemble
234+
path: CameraUtils/assemble.zip

‎.github/workflows/copy-branch.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ name: Duplicates main to old master branch
55
# Controls when the action will run. Triggers the workflow on push or pull request
66
# events but only for the main branch
77
on:
8+
workflow_dispatch:
89
push:
910
branches: [ main ]
1011

‎.java-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
17

‎Camera2Basic/.java-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
17

‎Camera2Basic/app/build.gradle‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ apply plugin: 'kotlin-kapt'
2020
apply plugin: "androidx.navigation.safeargs"
2121

2222
android {
23+
defaultConfig {
24+
vectorDrawables.useSupportLibrary = true
25+
}
26+
buildFeatures {
27+
viewBinding true
28+
}
2329
namespace "com.example.android.camera2.basic"
2430
compileSdk 34
2531
defaultConfig {
@@ -32,12 +38,12 @@ android {
3238
}
3339

3440
compileOptions {
35-
sourceCompatibility rootProject.ext.java_version
36-
targetCompatibility rootProject.ext.java_version
41+
sourceCompatibility JavaVersion.VERSION_17
42+
targetCompatibility JavaVersion.VERSION_17
3743
}
3844

3945
kotlinOptions {
40-
jvmTarget = "$rootProject.ext.java_version"
46+
jvmTarget = "17"
4147
}
4248

4349
buildTypes {
@@ -53,6 +59,8 @@ android {
5359
}
5460
}
5561

62+
63+
5664
dependencies {
5765
implementation project(':utils')
5866

‎Camera2SlowMotion/.java-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
11

‎CameraUtils/.java-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
11

‎CameraXExtensions/.java-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
17

‎CameraXExtensions/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#Wed Aug 03 16:12:29 EDT 2022
1818
distributionBase=GRADLE_USER_HOME
19-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
19+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
2020
distributionPath=wrapper/dists
2121
zipStorePath=wrapper/dists
2222
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)