mirror of
https://github.com/Termix-SSH/Termix.git
synced 2026-10-28 06:05:24 +00:00
fix: mas pkg verify/upload steps used wrong flat path
This commit is contained in:
1 parent
86befa4977
commit
961d18455b
1 file changed
+18
-19
@@ -468,13 +468,6 @@ jobs:
|
|||||||
|
|
||||||
security find-identity -v -p codesigning $KEYCHAIN_PATH
|
security find-identity -v -p codesigning $KEYCHAIN_PATH
|
||||||
|
|
||||||
if ! security find-identity -v -p codesigning $KEYCHAIN_PATH | grep -q "3rd Party Mac Developer Installer"; then
|
|
||||||
echo "No '3rd Party Mac Developer Installer' identity found in the keychain."
|
|
||||||
echo "electron-builder needs this to wrap the signed .app into a .pkg for MAS."
|
|
||||||
echo "Check that MAC_INSTALLER_CERTIFICATE_BASE64 holds a valid, non-expired installer cert."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Build macOS App Store Package
|
- name: Build macOS App Store Package
|
||||||
if: steps.check_certs.outputs.has_certs == 'true'
|
if: steps.check_certs.outputs.has_certs == 'true'
|
||||||
env:
|
env:
|
||||||
@@ -549,17 +542,24 @@ jobs:
|
|||||||
- name: Verify macOS sharp packaging
|
- name: Verify macOS sharp packaging
|
||||||
run: |
|
run: |
|
||||||
artifacts=(release/termix_macos_*_dmg.dmg)
|
artifacts=(release/termix_macos_*_dmg.dmg)
|
||||||
if [ -f release/termix_macos_universal_mas.pkg ]; then
|
MAS_PKG=$(find release -name "termix_macos_universal_mas.pkg" -type f | head -n 1)
|
||||||
artifacts+=(release/termix_macos_universal_mas.pkg)
|
if [ -n "$MAS_PKG" ]; then
|
||||||
|
artifacts+=("$MAS_PKG")
|
||||||
fi
|
fi
|
||||||
node scripts/verify-macos-sharp.cjs "${artifacts[@]}"
|
node scripts/verify-macos-sharp.cjs "${artifacts[@]}"
|
||||||
|
|
||||||
|
- name: Locate macOS MAS PKG
|
||||||
|
id: locate_mas_pkg
|
||||||
|
run: |
|
||||||
|
MAS_PKG=$(find release -name "termix_macos_universal_mas.pkg" -type f | head -n 1)
|
||||||
|
echo "path=$MAS_PKG" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
- name: Upload macOS MAS PKG
|
- name: Upload macOS MAS PKG
|
||||||
if: steps.check_certs.outputs.has_certs == 'true' && hashFiles('release/termix_macos_universal_mas.pkg') != '' && (inputs.artifact_destination == 'file' || inputs.artifact_destination == 'release' || inputs.artifact_destination == 'submit')
|
if: steps.check_certs.outputs.has_certs == 'true' && steps.locate_mas_pkg.outputs.path != '' && (inputs.artifact_destination == 'file' || inputs.artifact_destination == 'release' || inputs.artifact_destination == 'submit')
|
||||||
uses: actions/upload-artifact@v7
|
uses: actions/upload-artifact@v7
|
||||||
with:
|
with:
|
||||||
name: termix_macos_universal_mas
|
name: termix_macos_universal_mas
|
||||||
path: release/termix_macos_universal_mas.pkg
|
path: ${{ steps.locate_mas_pkg.outputs.path }}
|
||||||
retention-days: 30
|
retention-days: 30
|
||||||
if-no-files-found: warn
|
if-no-files-found: warn
|
||||||
|
|
||||||
@@ -1073,13 +1073,6 @@ jobs:
|
|||||||
|
|
||||||
security find-identity -v -p codesigning $KEYCHAIN_PATH
|
security find-identity -v -p codesigning $KEYCHAIN_PATH
|
||||||
|
|
||||||
if ! security find-identity -v -p codesigning $KEYCHAIN_PATH | grep -q "3rd Party Mac Developer Installer"; then
|
|
||||||
echo "No '3rd Party Mac Developer Installer' identity found in the keychain."
|
|
||||||
echo "electron-builder needs this to wrap the signed .app into a .pkg for MAS."
|
|
||||||
echo "Check that MAC_INSTALLER_CERTIFICATE_BASE64 holds a valid, non-expired installer cert."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Check for App Store Connect API credentials
|
- name: Check for App Store Connect API credentials
|
||||||
id: check_asc_creds
|
id: check_asc_creds
|
||||||
run: |
|
run: |
|
||||||
@@ -1183,7 +1176,13 @@ jobs:
|
|||||||
|
|
||||||
- name: Verify macOS sharp packaging
|
- name: Verify macOS sharp packaging
|
||||||
if: steps.check_certs.outputs.has_certs == 'true'
|
if: steps.check_certs.outputs.has_certs == 'true'
|
||||||
run: node scripts/verify-macos-sharp.cjs release/termix_macos_universal_mas.pkg
|
run: |
|
||||||
|
MAS_PKG=$(find release -name "termix_macos_universal_mas.pkg" -type f | head -n 1)
|
||||||
|
if [ -z "$MAS_PKG" ]; then
|
||||||
|
echo "MAS pkg not found under release/; aborting."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
node scripts/verify-macos-sharp.cjs "$MAS_PKG"
|
||||||
|
|
||||||
- name: Generate App Store release notes
|
- name: Generate App Store release notes
|
||||||
id: asc_notes
|
id: asc_notes
|
||||||
|
|||||||
Reference in new issue
Block a user