[CI] macOS: fix dmg name

CE-Programming · Sep 2, 2023 · d72ddd3 · d72ddd3
1 parent 822ef8f
commit d72ddd3
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/.github/workflows/build.mac.workflow.yml b/.github/workflows/build.mac.workflow.yml
@@ -59,8 +59,8 @@ jobs:
         cd build
         qmake ../gui/qt && make -j4
         macdeployqt CEmu.app
-        mkdir -p /tmp/CEmu-nightly_mac_${{matrix.qtvershort}}/
-        mv CEmu.app /tmp/CEmu-nightly_mac_${{matrix.qtvershort}}/
+        mkdir -p /tmp/CEmu-nightly_mac_qt${{matrix.qtvershort}}/
+        mv CEmu.app /tmp/CEmu-nightly_mac_qt${{matrix.qtvershort}}/
 
     - name: "Codesign CEmu.app"
       env:
@@ -77,7 +77,7 @@ jobs:
           security unlock-keychain -p $MACOS_KEYCHAIN_PWD build.keychain
           security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign
           security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $MACOS_KEYCHAIN_PWD build.keychain
-          /usr/bin/codesign --deep --force --verify --verbose --sign "$MACOS_CODESIGN_IDENT" --timestamp --options runtime /tmp/CEmu-nightly_mac_${{matrix.qtvershort}}/CEmu.app
+          /usr/bin/codesign --deep --force --verify --verbose --sign "$MACOS_CODESIGN_IDENT" --timestamp --options runtime /tmp/CEmu-nightly_mac_qt${{matrix.qtvershort}}/CEmu.app
 
     - name: "Create the DMG"
       run: |
@@ -90,8 +90,8 @@ jobs:
               --icon-size 64 \
               --icon 'CEmu.app' 125 200 \
               --app-drop-link 400 200 \
-              'CEmu-nightly_mac_${{matrix.qtvershort}}.dmg' \
-              '/tmp/CEmu-nightly_mac_${{matrix.qtvershort}}/'"
+              'CEmu-nightly_mac_qt${{matrix.qtvershort}}.dmg' \
+              '/tmp/CEmu-nightly_mac_qt${{matrix.qtvershort}}/'"
           eval "create-dmg $createDmgArgs" || eval "create-dmg $createDmgArgs" # We also retry just in case...
 
     - name: "[macOS] Notarize and staple DMG"
@@ -103,14 +103,14 @@ jobs:
         APPLE_NOTARIZATION_TEAMID: ${{ secrets.APPLE_NOTARIZATION_TEAMID }}
       run: |
         xcrun notarytool store-credentials "notarytool-profile" --apple-id "$APPLE_NOTARIZATION_USERNAME" --team-id "$APPLE_NOTARIZATION_TEAMID" --password "$APPLE_NOTARIZATION_PASSWORD"
-        xcrun notarytool submit "CEmu-nightly_mac_${{matrix.qtvershort}}.dmg" --keychain-profile "notarytool-profile" --wait
-        xcrun stapler staple "CEmu-nightly_mac_${{matrix.qtvershort}}.dmg"
+        xcrun notarytool submit "CEmu-nightly_mac_qt${{matrix.qtvershort}}.dmg" --keychain-profile "notarytool-profile" --wait
+        xcrun stapler staple "CEmu-nightly_mac_qt${{matrix.qtvershort}}.dmg"
 
     - name: Upload dmg as artifact
       uses: actions/upload-artifact@v3
       with:
-          name: CEmu-nightly_mac_${{matrix.qtvershort}}
-          path: CEmu-nightly_mac_${{matrix.qtvershort}}.dmg
+          name: CEmu-nightly_mac_qt${{matrix.qtvershort}}
+          path: CEmu-nightly_mac_qt${{matrix.qtvershort}}.dmg
 
     - name: Update nightly release
       if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
@@ -120,4 +120,4 @@ jobs:
         prerelease: true
         token: ${{secrets.GITHUB_TOKEN}}
         files: |
-          CEmu-nightly_mac_${{matrix.qtvershort}}.dmg
+          CEmu-nightly_mac_qt${{matrix.qtvershort}}.dmg