Skip to content

Commit 831e275

Browse files
dbnicholsondbnicholson
committed
testing
1 parent 5e74313 commit 831e275

File tree

1 file changed

+52
-82
lines changed

1 file changed

+52
-82
lines changed

‎.github/workflows/push.yml

Lines changed: 52 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ on: ['push', 'pull_request']
55
env:
66
APK_ARTIFACT_FILENAME: bdist_unit_tests_app-debug-1.1-.apk
77
AAB_ARTIFACT_FILENAME: bdist_unit_tests_app-release-1.1-.aab
8-
SDL2_APK_ARTIFACT_FILENAME: sdl2_bdist_unit_tests_app-debug-1.1-.apk
9-
SDL2_AAB_ARTIFACT_FILENAME: sdl2_bdist_unit_tests_app-release-1.1-.aab
10-
WEBVIEW_APK_ARTIFACT_FILENAME: webview_bdist_unit_tests_app-debug-1.1-.apk
11-
WEBVIEW_AAB_ARTIFACT_FILENAME: webview_bdist_unit_tests_app-release-1.1-.aab
128
PYTHONFORANDROID_PREREQUISITES_INSTALL_INTERACTIVE: 0
139

1410
jobs:
@@ -57,11 +53,17 @@ jobs:
5753
flag-name: run-${{ matrix.os }}-${{ matrix.python-version }}
5854

5955
ubuntu_build_apk:
60-
name: Unit test apk [ ${{ matrix.runs_on }} ]
56+
name: Unit test apk [ ${{ matrix.runs_on }} | ${{ matrix.bootstrap.name }} ]
6157
needs: [flake8]
6258
runs-on: ${{ matrix.runs_on }}
59+
continue-on-error: true
6360
strategy:
6461
matrix:
62+
bootstrap:
63+
- name: sdl2
64+
target: testapps-with-numpy
65+
- name: webview
66+
target: testapps-webview
6567
include:
6668
- runs_on: ubuntu-latest
6769
steps:
@@ -79,40 +81,34 @@ jobs:
7981
- name: Pull docker image
8082
run: |
8183
make docker/pull
82-
- name: Build multi-arch sdl2 apk Python 3 (armeabi-v7a, arm64-v8a, x86_64, x86)
83-
run: |
84-
mkdir -p apks
85-
make docker/run/make/with-artifact/apk/testapps-with-numpy
86-
- name: Rename sdl2 apk artifact to include the build platform name
87-
run: |
88-
mv apks/${{ env.APK_ARTIFACT_FILENAME }} apks/${{ matrix.runs_on }}-${{ env.SDL2_APK_ARTIFACT_FILENAME }}
89-
- name: Upload sdl2 apk artifact
90-
uses: actions/upload-artifact@v1
91-
with:
92-
name: ${{ matrix.runs_on }}-${{ env.SDL2_APK_ARTIFACT_FILENAME }}
93-
path: apks/${{ matrix.runs_on }}-${{ env.SDL2_APK_ARTIFACT_FILENAME }}
94-
- name: Build multi-arch webview apk Python 3 (armeabi-v7a, arm64-v8a, x86_64, x86)
84+
- name: Build multi-arch apk Python 3 (armeabi-v7a, arm64-v8a, x86_64, x86)
9585
run: |
9686
mkdir -p apks
97-
make docker/run/make/with-artifact/apk/testapps-webview
98-
- name: Rename webview artifact to include the build platform name
87+
make docker/run/make/with-artifact/apk/${{ matrix.bootstrap.target }}
88+
- name: Rename apk artifact to include the build platform name
9989
run: |
100-
mv apks/${{ env.APK_ARTIFACT_FILENAME }} apks/${{ matrix.runs_on }}-${{ env.WEBVIEW_APK_ARTIFACT_FILENAME }}
101-
- name: Upload webview apk artifact
90+
mv apks/${{ env.APK_ARTIFACT_FILENAME }} apks/${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-${{ env.APK_ARTIFACT_FILENAME }}
91+
- name: Upload apk artifact
10292
uses: actions/upload-artifact@v1
10393
with:
104-
name: ${{ matrix.runs_on }}-${{ env.WEBVIEW_APK_ARTIFACT_FILENAME }}
105-
path: apks/${{ matrix.runs_on }}-${{ env.WEBVIEW_APK_ARTIFACT_FILENAME }}
94+
name: ${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-${{ env.APK_ARTIFACT_FILENAME }}
95+
path: apks/${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-${{ env.APK_ARTIFACT_FILENAME }}
10696

10797
macos_build_apk:
108-
name: Unit test apk [ ${{ matrix.runs_on }} ]
98+
name: Unit test apk [ ${{ matrix.runs_on }} | ${{ matrix.bootstrap.name }} ]
10999
needs: [flake8]
110100
defaults:
111101
run:
112102
shell: ${{ matrix.run_wrapper || 'bash --noprofile --norc -eo pipefail {0}' }}
113103
runs-on: ${{ matrix.runs_on }}
104+
continue-on-error: true
114105
strategy:
115106
matrix:
107+
bootstrap:
108+
- name: sdl2
109+
target: testapps-with-numpy
110+
- name: webview
111+
target: testapps-webview
116112
include:
117113
- runs_on: macos-latest
118114
- runs_on: apple-silicon-m1
@@ -141,39 +137,32 @@ jobs:
141137
arm64_set_path_and_python_version 3.9.7
142138
brew install autoconf automake libtool openssl pkg-config
143139
make --file ci/makefiles/osx.mk
144-
- name: Build multi-arch sdl2 apk Python 3 (armeabi-v7a, arm64-v8a, x86_64, x86)
145-
run: |
146-
source ci/osx_ci.sh
147-
arm64_set_path_and_python_version 3.9.7
148-
make testapps-with-numpy
149-
- name: Rename sdl2 artifact to include the build platform name
150-
run: |
151-
mv testapps/on_device_unit_tests/${{ env.APK_ARTIFACT_FILENAME }} ${{ matrix.runs_on }}-${{ env.SDL2_APK_ARTIFACT_FILENAME }}
152-
- name: Upload sdl2 apk artifact
153-
uses: actions/upload-artifact@v1
154-
with:
155-
name: ${{ matrix.runs_on }}-${{ env.SDL2_APK_ARTIFACT_FILENAME }}
156-
path: ${{ matrix.runs_on }}-${{ env.SDL2_APK_ARTIFACT_FILENAME }}
157-
- name: Build multi-arch webview apk Python 3 (armeabi-v7a, arm64-v8a, x86_64, x86)
140+
- name: Build multi-arch apk Python 3 (armeabi-v7a, arm64-v8a, x86_64, x86)
158141
run: |
159142
source ci/osx_ci.sh
160143
arm64_set_path_and_python_version 3.9.7
161-
make testapps-webview
162-
- name: Rename webview artifact to include the build platform name
144+
make ${{ matrix.bootstrap.target }}
145+
- name: Rename apk artifact to include the build platform name
163146
run: |
164-
mv testapps/on_device_unit_tests/${{ env.APK_ARTIFACT_FILENAME }} ${{ matrix.runs_on }}-${{ env.WEBVIEW_APK_ARTIFACT_FILENAME }}
165-
- name: Upload webview apk artifact
147+
mv testapps/on_device_unit_tests/${{ env.APK_ARTIFACT_FILENAME }} ${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-${{ env.APK_ARTIFACT_FILENAME }}
148+
- name: Upload apk artifact
166149
uses: actions/upload-artifact@v1
167150
with:
168-
name: ${{ matrix.runs_on }}-${{ env.WEBVIEW_APK_ARTIFACT_FILENAME }}
169-
path: ${{ matrix.runs_on }}-${{ env.WEBVIEW_APK_ARTIFACT_FILENAME }}
151+
name: ${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-${{ env.APK_ARTIFACT_FILENAME }}
152+
path: ${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-${{ env.APK_ARTIFACT_FILENAME }}
170153

171154
ubuntu_build_aab:
172155
name: Unit test aab [ ${{ matrix.runs_on }} ]
173156
needs: [flake8]
174157
runs-on: ${{ matrix.runs_on }}
158+
continue-on-error: true
175159
strategy:
176160
matrix:
161+
bootstrap:
162+
- name: sdl2
163+
target: testapps-with-numpy-aab
164+
- name: webview
165+
target: testapps-webview-aab
177166
include:
178167
- runs_on: ubuntu-latest
179168
steps:
@@ -191,40 +180,34 @@ jobs:
191180
- name: Pull docker image
192181
run: |
193182
make docker/pull
194-
- name: Build sdl2 Android App Bundle Python 3 (armeabi-v7a, arm64-v8a, x86_64, x86)
183+
- name: Build Android App Bundle Python 3 (armeabi-v7a, arm64-v8a, x86_64, x86)
195184
run: |
196185
mkdir -p aabs
197-
make docker/run/make/with-artifact/aab/testapps-with-numpy-aab
198-
- name: Rename sdl2 artifact to include the build platform name
186+
make docker/run/make/with-artifact/aab/${{ matrix.bootstrap.target }}
187+
- name: Rename artifact to include the build platform name
199188
run: |
200-
mv aabs/${{ env.AAB_ARTIFACT_FILENAME }} aabs/${{ matrix.runs_on }}-${{ env.SDL2_AAB_ARTIFACT_FILENAME }}
201-
- name: Upload sdl2 apk artifact
189+
mv aabs/${{ env.AAB_ARTIFACT_FILENAME }} aabs/${{ matrix.runs_on }}-${{ matrix.bootstrap.name}}-${{ env.AAB_ARTIFACT_FILENAME }}
190+
- name: Upload apk artifact
202191
uses: actions/upload-artifact@v1
203192
with:
204-
name: ${{ matrix.runs_on }}-${{ env.SDL2_AAB_ARTIFACT_FILENAME }}
205-
path: aabs/${{ matrix.runs_on }}-${{ env.SDL2_AAB_ARTIFACT_FILENAME }}
206-
- name: Build webview Android App Bundle Python 3 (armeabi-v7a, arm64-v8a, x86_64, x86)
207-
run: |
208-
mkdir -p aabs
209-
make docker/run/make/with-artifact/aab/testapps-webview-aab
210-
- name: Rename webview artifact to include the build platform name
211-
run: |
212-
mv aabs/${{ env.AAB_ARTIFACT_FILENAME }} aabs/${{ matrix.runs_on }}-${{ env.WEBVIEW_AAB_ARTIFACT_FILENAME }}
213-
- name: Upload webview apk artifact
214-
uses: actions/upload-artifact@v1
215-
with:
216-
name: ${{ matrix.runs_on }}-${{ env.WEBVIEW_AAB_ARTIFACT_FILENAME }}
217-
path: aabs/${{ matrix.runs_on }}-${{ env.WEBVIEW_AAB_ARTIFACT_FILENAME }}
193+
name: ${{ matrix.runs_on }}-${{ matrix.bootstrap.name}}-${{ env.AAB_ARTIFACT_FILENAME }}
194+
path: aabs/${{ matrix.runs_on }}-${{ matrix.bootstrap.name}}-${{ env.AAB_ARTIFACT_FILENAME }}
218195

219196
macos_build_aab:
220-
name: Unit test aab [ ${{ matrix.runs_on }} ]
197+
name: Unit test aab [ ${{ matrix.runs_on }} | ${{ matrix.bootstrap.name }} ]
221198
needs: [flake8]
222199
defaults:
223200
run:
224201
shell: ${{ matrix.run_wrapper || 'bash --noprofile --norc -eo pipefail {0}' }}
225202
runs-on: ${{ matrix.runs_on }}
203+
continue-on-error: true
226204
strategy:
227205
matrix:
206+
bootstrap:
207+
- name: sdl2
208+
target: testapps-with-numpy-aab
209+
- name: webview
210+
target: testapps-webview-aab
228211
include:
229212
- runs_on: macos-latest
230213
- runs_on: apple-silicon-m1
@@ -257,28 +240,15 @@ jobs:
257240
run: |
258241
source ci/osx_ci.sh
259242
arm64_set_path_and_python_version 3.9.7
260-
make testapps-with-numpy-aab
243+
make ${{ matrix.bootstrap.target }}
261244
- name: Rename sdl2 artifact to include the build platform name
262245
run: |
263-
mv testapps/on_device_unit_tests/${{ env.AAB_ARTIFACT_FILENAME }} ${{ matrix.runs_on }}-${{ env.SDL2_AAB_ARTIFACT_FILENAME }}
246+
mv testapps/on_device_unit_tests/${{ env.AAB_ARTIFACT_FILENAME }} ${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-${{ env.AAB_ARTIFACT_FILENAME }}
264247
- name: Upload sdl2 apk artifact
265248
uses: actions/upload-artifact@v1
266249
with:
267-
name: ${{ matrix.runs_on }}-${{ env.SDL2_AAB_ARTIFACT_FILENAME }}
268-
path: ${{ matrix.runs_on }}-${{ env.SDL2_AAB_ARTIFACT_FILENAME }}
269-
- name: Build multi-arch webview aab Python 3 (armeabi-v7a, arm64-v8a, x86_64, x86)
270-
run: |
271-
source ci/osx_ci.sh
272-
arm64_set_path_and_python_version 3.9.7
273-
make testapps-webview-aab
274-
- name: Rename webview artifact to include the build platform name
275-
run: |
276-
mv testapps/on_device_unit_tests/${{ env.AAB_ARTIFACT_FILENAME }} ${{ matrix.runs_on }}-${{ env.WEBVIEW_AAB_ARTIFACT_FILENAME }}
277-
- name: Upload webview apk artifact
278-
uses: actions/upload-artifact@v1
279-
with:
280-
name: ${{ matrix.runs_on }}-${{ env.WEBVIEW_AAB_ARTIFACT_FILENAME }}
281-
path: ${{ matrix.runs_on }}-${{ env.WEBVIEW_AAB_ARTIFACT_FILENAME }}
250+
name: ${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-${{ env.AAB_ARTIFACT_FILENAME }}
251+
path: ${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-${{ env.AAB_ARTIFACT_FILENAME }}
282252

283253
ubuntu_rebuild_updated_recipes:
284254
name: Test updated recipes for arch ${{ matrix.android_arch }} [ ubuntu-latest ]

0 commit comments

Comments
 (0)