Skip to content

Commit 5056b5f

Browse files
committed
CI fixes
1 parent 43f0325 commit 5056b5f

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

.github/workflows/bobtests_linux.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -130,20 +130,20 @@ jobs:
130130
cd ./android_promo_screens/
131131
./test.sh "TRIfA" "Message your Friends and Family securely and with ease." /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/test_outputfiles/test_004b.png
132132
cp -av output.png promo_02.png
133-
mv -v promo_02.png ../
133+
mv -v promo_02.png ../promo_${{ matrix.api-level }}_02.png
134134
./test.sh "TRIfA" "Send Messages and Files or just Call your Friends." /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/test_outputfiles/test_099.png
135135
cp -av output.png promo_03.png
136-
mv -v promo_03.png ../
136+
mv -v promo_03.png ../promo_${{ matrix.api-level }}_03.png
137137
138138
- name: make promo screenshots 2
139139
run: |
140140
cd ./android_promo_screens/
141141
./test2.sh "TRIfA" "Message your Friends and Family securely and with ease." /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/images/101.png
142142
cp -av output.png promo_101.png
143-
mv -v promo_101.png ../
143+
mv -v promo_101.png ../promo_${{ matrix.api-level }}_101.png
144144
./test2.sh "TRIfA" "Send Messages and Files or just Call your Friends." /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/images/102.png
145145
cp -av output.png promo_102.png
146-
mv -v promo_102.png ../
146+
mv -v promo_102.png ../promo_${{ matrix.api-level }}_102.png
147147
148148
- name: Upload to nightly release
149149
uses: ncipollo/release-action@v1
@@ -156,7 +156,7 @@ jobs:
156156
prerelease: true
157157
replacesArtifacts: true
158158
token: ${{ secrets.GITHUB_TOKEN }}
159-
artifacts: "promo_02.png,promo_03.png,promo_101.png,promo_102.png"
159+
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"
160160

161161

162162
- name: put datetime on screenshots
@@ -175,7 +175,7 @@ jobs:
175175
- name: upload screenshots
176176
uses: actions/upload-artifact@v4
177177
with:
178-
name: linuxscreen
178+
name: linuxscreen_${{ matrix.api-level }}
179179
path: |
180180
/home/runner/screen*.png
181181
/home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/test_outputfiles/*.png
@@ -184,16 +184,16 @@ jobs:
184184
continue-on-error: true
185185
uses: actions/upload-artifact@v4
186186
with:
187-
name: logcat
187+
name: logcat_${{ matrix.api-level }}
188188
path: |
189189
/home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/android-refimpl-app/logcat.txt
190190
191191
- name: Rename artifact for nightly upload
192192
if: github.event_name == 'push' && github.ref == 'refs/heads/zoff99/dev003'
193193
run: |
194194
pwd
195-
cp -av /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/test_outputfiles/test_004b.png screen_shot_android_02.png
196-
cp -av /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/test_outputfiles/test_099.png screen_shot_android_03.png
195+
cp -av /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/test_outputfiles/test_004b.png screen_shot_android_${{ matrix.api-level }}_02.png
196+
cp -av /home/runner/work/ToxAndroidRefImpl/ToxAndroidRefImpl/test_outputfiles/test_099.png screen_shot_android_${{ matrix.api-level }}_03.png
197197
198198
- name: Upload to nightly release
199199
uses: ncipollo/release-action@v1
@@ -206,5 +206,5 @@ jobs:
206206
prerelease: true
207207
replacesArtifacts: true
208208
token: ${{ secrets.GITHUB_TOKEN }}
209-
artifacts: "screen_shot_android_02.png,screen_shot_android_03.png"
209+
artifacts: "screen_shot_android_${{ matrix.api-level }}_02.png,screen_shot_android_${{ matrix.api-level }}_03.png"
210210

0 commit comments

Comments
 (0)