rollback

Author: zoff99

.github/workflows/bobtests_linux.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        api-level: [35, 33, 29, 21]
+        api-level: [29]
     permissions:
       contents: write
     if: ${{ true }}
@@ -130,20 +130,20 @@ 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 ../promo_${{ matrix.api-level }}_02.png
+              mv -v promo_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 ../promo_${{ matrix.api-level }}_03.png
+              mv -v promo_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 ../promo_${{ matrix.api-level }}_101.png
+              mv -v promo_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 ../promo_${{ matrix.api-level }}_102.png
+              mv -v promo_102.png ../
 
       - name: Upload to nightly release
         uses: ncipollo/release-action@v1
@@ -156,7 +156,8 @@ jobs:
           prerelease: true
           replacesArtifacts: true
           token: ${{ secrets.GITHUB_TOKEN }}
-          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"
+          artifacts: "promo_02.png,promo_03.png,promo_101.png,promo_102.png"
+
 
       - name: put datetime on screenshots
         run:  |
@@ -174,7 +175,7 @@ jobs:
       - name: upload screenshots
         uses: actions/upload-artifact@v4
         with:
-          name: linuxscreen_${{ matrix.api-level }}
+          name: linuxscreen
           path: |
             /home/runner/screen*.png
             /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/test_outputfiles/*.png
@@ -183,16 +184,16 @@ jobs:
         continue-on-error: true
         uses: actions/upload-artifact@v4
         with:
-          name: logcat_${{ matrix.api-level }}
+          name: logcat
           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_${{ 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
+          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
 
       - name: Upload to nightly release
         uses: ncipollo/release-action@v1
@@ -205,5 +206,5 @@ jobs:
           prerelease: true
           replacesArtifacts: true
           token: ${{ secrets.GITHUB_TOKEN }}
-          artifacts: "screen_shot_android_${{ matrix.api-level }}_02.png,screen_shot_android_${{ matrix.api-level }}_03.png"
+          artifacts: "screen_shot_android_02.png,screen_shot_android_03.png"