more API levels again

zoff99 · Jan 6, 2025 · bbb184a · bbb184a
1 parent 2f65946
commit bbb184a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/bobtests_linux.yml b/.github/workflows/bobtests_linux.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        api-level: [29]
+        api-level: [35, 33, 29, 21]
     permissions:
       contents: write
     if: ${{ true }}
@@ -121,19 +121,19 @@ jobs:
               cd ./android_promo_screens/
               ./test.sh "TRIfA" "Message your Friends and Family securely and with ease." /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/test_outputfiles/test_004b.png
               cp -av output.png promo_02.png
-              mv -v promo_02.png ../
+              mv -v promo_02.png ../promo_${{ matrix.api-level }}_02.png
               ./test.sh "TRIfA" "Send Messages and Files or just Call your Friends." /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/test_outputfiles/test_099.png
               cp -av output.png promo_03.png
-              mv -v promo_03.png ../
+              mv -v promo_03.png ../promo_${{ matrix.api-level }}_03.png
       - name: make promo screenshots 2
         run:  |
               cd ./android_promo_screens/
               ./test2.sh "TRIfA" "Message your Friends and Family securely and with ease." /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/images/101.png
               cp -av output.png promo_101.png
-              mv -v promo_101.png ../
+              mv -v promo_101.png ../promo_${{ matrix.api-level }}_101.png
               ./test2.sh "TRIfA" "Send Messages and Files or just Call your Friends." /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/images/102.png
               cp -av output.png promo_102.png
-              mv -v promo_102.png ../
+              mv -v promo_102.png ../promo_${{ matrix.api-level }}_102.png
       - name: Upload to nightly release
         uses: ncipollo/release-action@v1
         if: github.event_name == 'push' && github.ref == 'refs/heads/zoff99/dev003'
@@ -145,7 +145,7 @@ jobs:
           prerelease: true
           replacesArtifacts: true
           token: ${{ secrets.GITHUB_TOKEN }}
-          artifacts: "promo_02.png,promo_03.png,promo_101.png,promo_102.png"
+          artifacts: "promo_${{ matrix.api-level }}_02.png,promo_${{ matrix.api-level }}_03.png,promo_${{ matrix.api-level }}_101.png,promo_${{ matrix.api-level }}_102.png"
 
 
       - name: put datetime on screenshots
@@ -163,23 +163,23 @@ jobs:
       - name: upload screenshots
         uses: actions/upload-artifact@v4
         with:
-          name: linuxscreen
+          name: linuxscreen_${{ matrix.api-level }}
           path: |
             /home/runner/screen*.png
             /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/test_outputfiles/*.png
       - name: upload logcat output
         continue-on-error: true
         uses: actions/upload-artifact@v4
         with:
-          name: logcat
+          name: logcat_${{ matrix.api-level }}
           path: |
             /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/android-refimpl-app/logcat.txt
       - name: Rename artifact for nightly upload
         if: github.event_name == 'push' && github.ref == 'refs/heads/zoff99/dev003'
         run: |
           pwd
-          cp -av /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/test_outputfiles/test_004b.png screen_shot_android_02.png
-          cp -av /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/test_outputfiles/test_099.png screen_shot_android_03.png
+          cp -av /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/test_outputfiles/test_004b.png screen_shot_android_${{ matrix.api-level }}_02.png
+          cp -av /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/test_outputfiles/test_099.png screen_shot_android_${{ matrix.api-level }}_03.png
       - name: Upload to nightly release
         uses: ncipollo/release-action@v1
         if: github.event_name == 'push' && github.ref == 'refs/heads/zoff99/dev003'
@@ -191,5 +191,5 @@ jobs:
           prerelease: true
           replacesArtifacts: true
           token: ${{ secrets.GITHUB_TOKEN }}
-          artifacts: "screen_shot_android_02.png,screen_shot_android_03.png"
+          artifacts: "screen_shot_android_${{ matrix.api-level }}_02.png,screen_shot_android_${{ matrix.api-level }}_03.png"
 
diff --git a/.github/workflows/tests_linux.yml b/.github/workflows/tests_linux.yml
@@ -115,7 +115,7 @@ jobs:
     - name: upload screenshots
       uses: actions/upload-artifact@v4
       with:
-        name: linuxscreen
+        name: linuxscreen_${{ matrix.api-level }}
         path: |
           /home/runner/screen*.png
           /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/test_outputfiles/*.png
@@ -124,16 +124,16 @@ jobs:
       continue-on-error: true
       uses: actions/upload-artifact@v4
       with:
-        name: logcat
+        name: logcat_${{ matrix.api-level }}
         path: |
           /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/android-refimpl-app/logcat.txt
 
     - name: Rename artifact for nightly upload
       if: github.event_name == 'push' && github.ref == 'refs/heads/zoff99/dev003'
       run: |
         pwd
-        cp -av /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/test_outputfiles/test_099.png screen_shot_android_04.png
-        cp -av /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/test_outputfiles/test_005.png screen_shot_android_05.png
+        cp -av /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/test_outputfiles/test_099.png screen_shot_android_${{ matrix.api-level }}_04.png
+        cp -av /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/test_outputfiles/test_005.png screen_shot_android_${{ matrix.api-level }}_05.png
 
     - name: Upload to nightly release
       uses: ncipollo/release-action@v1
@@ -146,6 +146,6 @@ jobs:
         prerelease: true
         replacesArtifacts: true
         token: ${{ secrets.GITHUB_TOKEN }}
-        artifacts: "screen_shot_android_04.png,screen_shot_android_05.png"
+        artifacts: "screen_shot_android_${{ matrix.api-level }}_04.png,screen_shot_android_${{ matrix.api-level }}_05.png"