testing

Author: dbnicholson

.github/workflows/push.yml

@@ -60,8 +60,14 @@ jobs:
     name: Unit test apk [ ${{ matrix.runs_on }} ]
     needs: [flake8]
     runs-on: ${{ matrix.runs_on }}
+    continue-on-error: true
     strategy:
       matrix:
+        bootstrap:
+          - name: sdl2
+            target: testapps-with-numpy
+          - name: webview
+            target: testapps-webview
         include:
           - runs_on: ubuntu-latest
     steps:
@@ -79,30 +85,18 @@ jobs:
     - name: Pull docker image
       run: |
         make docker/pull
-    - name: Build multi-arch sdl2 apk Python 3 (armeabi-v7a, arm64-v8a, x86_64, x86)
-      run: |
-        mkdir -p apks
-        make docker/run/make/with-artifact/apk/testapps-with-numpy
-    - name: Rename sdl2 apk artifact to include the build platform name
-      run: |
-        mv apks/${{ env.APK_ARTIFACT_FILENAME }} apks/${{ matrix.runs_on }}-${{ env.SDL2_APK_ARTIFACT_FILENAME }}
-    - name: Upload sdl2 apk artifact
-      uses: actions/upload-artifact@v1
-      with:
-        name: ${{ matrix.runs_on }}-${{ env.SDL2_APK_ARTIFACT_FILENAME }}
-        path: apks/${{ matrix.runs_on }}-${{ env.SDL2_APK_ARTIFACT_FILENAME }}
-    - name: Build multi-arch webview apk Python 3 (armeabi-v7a, arm64-v8a, x86_64, x86)
+    - name: Build multi-arch apk Python 3 (armeabi-v7a, arm64-v8a, x86_64, x86)
       run: |
         mkdir -p apks
-        make docker/run/make/with-artifact/apk/testapps-webview
-    - name: Rename webview artifact to include the build platform name
+        make docker/run/make/with-artifact/apk/${{ matrix.bootstrap.target }}
+    - name: Rename apk artifact to include the build platform name
       run: |
-        mv apks/${{ env.APK_ARTIFACT_FILENAME }} apks/${{ matrix.runs_on }}-${{ env.WEBVIEW_APK_ARTIFACT_FILENAME }}
-    - name: Upload webview apk artifact
+        mv apks/${{ env.APK_ARTIFACT_FILENAME }} apks/${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-${{ env.APK_ARTIFACT_FILENAME }}
+    - name: Upload apk artifact
       uses: actions/upload-artifact@v1
       with:
-        name: ${{ matrix.runs_on }}-${{ env.WEBVIEW_APK_ARTIFACT_FILENAME }}
-        path: apks/${{ matrix.runs_on }}-${{ env.WEBVIEW_APK_ARTIFACT_FILENAME }}
+        name: ${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-${{ env.APK_ARTIFACT_FILENAME }}
+        path: apks/${{ matrix.runs_on }}-${{ matrix.bootsrap.name }}-${{ env.APK_ARTIFACT_FILENAME }}
 
   macos_build_apk:
     name: Unit test apk [ ${{ matrix.runs_on }} ]
@@ -113,6 +107,11 @@ jobs:
     runs-on: ${{ matrix.runs_on }}
     strategy:
       matrix:
+        bootstrap:
+          - name: sdl2
+            target: testapps-with-numpy
+          - name: webview
+            target: testapps-webview
         include:
           - runs_on: macos-latest
           - runs_on: apple-silicon-m1
@@ -141,32 +140,19 @@ jobs:
           arm64_set_path_and_python_version 3.9.7
           brew install autoconf automake libtool openssl pkg-config
           make --file ci/makefiles/osx.mk
-      - name: Build multi-arch sdl2 apk Python 3 (armeabi-v7a, arm64-v8a, x86_64, x86)
+      - name: Build multi-arch apk Python 3 (armeabi-v7a, arm64-v8a, x86_64, x86)
         run: |
           source ci/osx_ci.sh
           arm64_set_path_and_python_version 3.9.7
-          make testapps-with-numpy
-      - name: Rename sdl2 artifact to include the build platform name
+          make ${{ matrix.bootstrap.target }}
+      - name: Rename apk artifact to include the build platform name
         run: |
-          mv testapps/on_device_unit_tests/${{ env.APK_ARTIFACT_FILENAME }} ${{ matrix.runs_on }}-${{ env.SDL2_APK_ARTIFACT_FILENAME }}
-      - name: Upload sdl2 apk artifact
-        uses: actions/upload-artifact@v1
-        with:
-          name: ${{ matrix.runs_on }}-${{ env.SDL2_APK_ARTIFACT_FILENAME }}
-          path: ${{ matrix.runs_on }}-${{ env.SDL2_APK_ARTIFACT_FILENAME }}
-      - name: Build multi-arch webview apk Python 3 (armeabi-v7a, arm64-v8a, x86_64, x86)
-        run: |
-          source ci/osx_ci.sh
-          arm64_set_path_and_python_version 3.9.7
-          make testapps-webview
-      - name: Rename webview artifact to include the build platform name
-        run: |
-          mv testapps/on_device_unit_tests/${{ env.APK_ARTIFACT_FILENAME }} ${{ matrix.runs_on }}-${{ env.WEBVIEW_APK_ARTIFACT_FILENAME }}
-      - name: Upload webview apk artifact
+          mv testapps/on_device_unit_tests/${{ env.APK_ARTIFACT_FILENAME }} ${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-${{ env.APK_ARTIFACT_FILENAME }}
+      - name: Upload apk artifact
         uses: actions/upload-artifact@v1
         with:
-          name: ${{ matrix.runs_on }}-${{ env.WEBVIEW_APK_ARTIFACT_FILENAME }}
-          path: ${{ matrix.runs_on }}-${{ env.WEBVIEW_APK_ARTIFACT_FILENAME }}
+          name: ${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-${{ env.APK_ARTIFACT_FILENAME }}
+          path: ${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-${{ env.APK_ARTIFACT_FILENAME }}
 
   ubuntu_build_aab:
     name: Unit test aab [ ${{ matrix.runs_on }} ]