@@ -248,12 +248,12 @@ jobs:
248
248
ditto -c -k --keepParent ${{github.workspace}}/build/package/GpgFrontend.app ${{github.workspace}}/build/GpgFrontend.app.zip
249
249
hdiutil create ${{github.workspace}}/build/tmp.dmg -ov \
250
250
-volname "GpgFrontend" -fs HFS+ -srcfolder ${{github.workspace}}/build/package/
251
- mkdir ${{github.workspace}}/build/final -artifact
252
- create-dmg --codesign "${{secrets.GPGFRONTEND_XOCDE_CODE_SIGN_IDENTITY}}" --volicon "${{github.workspace}}/resource/lfs/icns/GpgFrontend.icns" --volname GpgFrontend --app-drop-link 600 185 --window-size 800 400 ${{github.workspace}}/build/final -artifact/GpgFrontend.dmg ${{github.workspace}}/build/package/GpgFrontend.app
253
- mv ${{github.workspace}}/build/final -artifact/GpgFrontend.dmg \
254
- ${{github.workspace}}/build/final -artifact/GpgFrontend-${{env.sha_short}}-x86_64.dmg
251
+ mkdir ${{github.workspace}}/build/upload -artifact
252
+ create-dmg --codesign "${{secrets.GPGFRONTEND_XOCDE_CODE_SIGN_IDENTITY}}" --volicon "${{github.workspace}}/resource/lfs/icns/GpgFrontend.icns" --volname GpgFrontend --app-drop-link 600 185 --window-size 800 400 ${{github.workspace}}/build/upload -artifact/GpgFrontend.dmg ${{github.workspace}}/build/package/GpgFrontend.app
253
+ mv ${{github.workspace}}/build/upload -artifact/GpgFrontend.dmg \
254
+ ${{github.workspace}}/build/upload -artifact/GpgFrontend-${{matrix.os}} -${{env.sha_short}}-x86_64.dmg
255
255
mv ${{github.workspace}}/build/GpgFrontend.app.zip \
256
- ${{github.workspace}}/build/GpgFrontend-${{env.sha_short}}-x86_64.zip
256
+ ${{github.workspace}}/build/GpgFrontend-${{matrix.os}}-${{ env.sha_short}}-x86_64.zip
257
257
if : runner.os == 'macOS'
258
258
259
259
- name : Notarize Release Build (macOS)
@@ -262,7 +262,7 @@ jobs:
262
262
--apple-id ${{secrets.APPLE_DEVELOPER_ID}} \
263
263
--team-id ${{secrets.APPLE_DEVELOPER_TEAM_ID}} \
264
264
--password ${{secrets.APPLE_DEVELOPER_ID_SECRET}} \
265
- ${{github.workspace}}/build/GpgFrontend-${{env.sha_short}}-x86_64.zip
265
+ ${{github.workspace}}/build/GpgFrontend-${{matrix.os}}-${{ env.sha_short}}-x86_64.zip
266
266
echo "BUILD_TYPE_LOWER=$(echo ${BUILD_TYPE} | tr '[:upper:]' '[:lower:]')" >> ${GITHUB_ENV}
267
267
echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> ${GITHUB_ENV}
268
268
if : runner.os == 'macOS'
@@ -277,8 +277,8 @@ jobs:
277
277
- name : Copy Modules & Package App Image (Linux)
278
278
run : |
279
279
cmake -E copy_directory ${{github.workspace}}/modules/build/artifacts/modules ${{github.workspace}}/build/artifacts/AppDir/usr/modules
280
- mkdir ${{github.workspace}}/build/final -artifact
281
- cd ${{github.workspace}}/build/final -artifact
280
+ mkdir ${{github.workspace}}/build/upload -artifact
281
+ cd ${{github.workspace}}/build/upload -artifact
282
282
wget -c -nv https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
283
283
chmod u+x linuxdeployqt-continuous-x86_64.AppImage
284
284
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
@@ -355,14 +355,14 @@ jobs:
355
355
uses : actions/upload-artifact@master
356
356
with :
357
357
name : gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE_LOWER}}-${{env.SHORT_SHA}}
358
- path : ${{github.workspace}}/build/final -artifact/Gpg_Frontend*.AppImage*
358
+ path : ${{github.workspace}}/build/upload -artifact/Gpg_Frontend*.AppImage*
359
359
if : runner.os == 'Linux'
360
360
361
361
- name : Upload Artifact (macOS)
362
362
uses : actions/upload-artifact@master
363
363
with :
364
364
name : gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE_LOWER}}-${{env.SHORT_SHA}}
365
- path : ${{github.workspace}}/build/final -artifact/*
365
+ path : ${{github.workspace}}/build/upload -artifact/*
366
366
if : runner.os == 'macOS'
367
367
368
368
- name : Upload Artifact (Windows)
0 commit comments