From 02fc3e6207e7c64d576e07469b9ebc04089c1e42 Mon Sep 17 00:00:00 2001 From: Hien To Date: Fri, 13 Sep 2024 15:30:30 +0700 Subject: [PATCH] Fix issue postinstaller not run in macos --- .github/workflows/nightly-build.yml | 1 + .github/workflows/template-build-macos.yml | 6 +++++- engine/templates/macos/create_pkg.sh | 6 +++--- engine/templates/macos/{post-installer.sh => postinstall} | 0 4 files changed, 9 insertions(+), 4 deletions(-) rename engine/templates/macos/{post-installer.sh => postinstall} (100%) diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 9d2912bdc..a1311ea37 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -97,6 +97,7 @@ jobs: update-latest-version: runs-on: ubuntu-latest + if: needs.set-public-provider.outputs.public_provider == 'aws-s3' needs: [get-update-version, set-public-provider, build-linux-x64, build-macos-x64, build-macos-arm64, build-windows-x64] steps: - name: Update latest version diff --git a/.github/workflows/template-build-macos.yml b/.github/workflows/template-build-macos.yml index c99819a27..cc06a823d 100644 --- a/.github/workflows/template-build-macos.yml +++ b/.github/workflows/template-build-macos.yml @@ -180,7 +180,11 @@ jobs: cd engine productsign --sign "Developer ID Installer: ${{ secrets.DEVELOPER_ID }}" ${{ steps.set-output-params.outputs.package_name }}.pkg ${{ steps.set-output-params.outputs.package_name }}$-signed.pkg rm ${{ steps.set-output-params.outputs.package_name }}.pkg - mv ${{ steps.set-output-params.outputs.package_name }}$-signed.pkg ${{ steps.set-output-params.outputs.package_name }}.pkg + mv ${{ steps.set-output-params.outputs.package_name }}$-signed.pkg Distribution.pkg + productbuild --synthesize --package Distribution.pkg Distribution.xml + sed -i '' 's/require-scripts="false"/require-scripts="true"/' Distribution.xml + cat Distribution.xml + productbuild --distribution Distribution.xml --sign "Developer ID Installer: ${{ secrets.DEVELOPER_ID }}" --package-path . ${{ steps.set-output-params.outputs.package_name }}.pkg xcrun notarytool submit ${{ steps.set-output-params.outputs.package_name }}.pkg --apple-id ${{ secrets.APPLE_ID }} --password ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }} --team-id ${{ secrets.APPLE_TEAM_ID }} --wait - name: Package diff --git a/engine/templates/macos/create_pkg.sh b/engine/templates/macos/create_pkg.sh index fc1a98f70..c8d506759 100644 --- a/engine/templates/macos/create_pkg.sh +++ b/engine/templates/macos/create_pkg.sh @@ -7,12 +7,12 @@ CONFIGURATION_FILE_NAME=$6 UNINSTALLER_FILE_NAME=$7 mkdir installer -mkdir scripts +mkdir Scripts cp $SOURCE_BINARY_PATH installer/$DESTINATION_BINARY_NAME export DESTINATION_BINARY_NAME -cp post-installer.sh scripts/post-installer.sh +cp postinstall Scripts/postinstall sed -i '' '2s/.*/DESTINATION_BINARY_NAME=\$DESTINATION_BINARY_NAME/' $PACKAGE_NAME/DEBIAN/postinst export DATA_FOLDER_NAME CONFIGURATION_FILE_NAME UNINSTALLER_FILE_NAME @@ -22,4 +22,4 @@ sed -i '' "3s/.*/DATA_FOLDER_NAME=$DATA_FOLDER_NAME/" installer/$UNINSTALLER_FIL sed -i '' "4s/.*/CONFIGURATION_FILE_NAME=$CONFIGURATION_FILE_NAME/" installer/$UNINSTALLER_FILE_NAME sed -i '' "5s/.*/UNINSTALLER_FILE_NAME=$UNINSTALLER_FILE_NAME/" installer/$UNINSTALLER_FILE_NAME -pkgbuild --identifier ai.cortexcpp.pkg --version $VERSION --scripts scripts --install-location /usr/local/bin --root ./installer ${PACKAGE_NAME}.pkg +pkgbuild --identifier ai.cortexcpp.pkg --version $VERSION --scripts Scripts --install-location /usr/local/bin --root ./installer ${PACKAGE_NAME}.pkg diff --git a/engine/templates/macos/post-installer.sh b/engine/templates/macos/postinstall similarity index 100% rename from engine/templates/macos/post-installer.sh rename to engine/templates/macos/postinstall