From 6c4ecd6ce87bda6c61baeb3887a8163842ab4acd Mon Sep 17 00:00:00 2001 From: Sravan Kumar Lakkimsetti Date: Sat, 23 Nov 2019 21:42:19 +0530 Subject: Bug 553095 - Integrate Mac Notarization with platform build process Change-Id: Id1252049796af6c5ec4958e87ef0907c6832660e Signed-off-by: Sravan Kumar Lakkimsetti --- production/build-functions.shsource | 10 +++------- production/publish-equinox.sh | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/production/build-functions.shsource b/production/build-functions.shsource index 739d2e266..6e884cfd5 100755 --- a/production/build-functions.shsource +++ b/production/build-functions.shsource @@ -688,11 +688,7 @@ fn-notarize-macbuild () PRIMARY_BUNDLE_ID="$(echo ${DMG} | sed 's/-macosx-cocoa-x86_64.dmg//g')" - RESPONSE=\ - $(curl -s -X POST \ - -F file=@${DMG} \ - -F 'options={"primaryBundleId": "'${PRIMARY_BUNDLE_ID}'", "staple": true};type=application/json' \ - http://172.30.206.146:8383/macos-notarization-service/notarize) + RESPONSE=$(curl -s -X POST -F file=@${DMG} -F 'options={"primaryBundleId": "'${PRIMARY_BUNDLE_ID}'", "staple": true};type=application/json' http://172.30.206.146:8383/macos-notarization-service/notarize) UUID=$(echo ${RESPONSE} | /shared/common/jq/1.6/jq -r '.uuid') @@ -738,7 +734,7 @@ fn-gather-sdk () cp org.eclipse.sdk.ide-macosx.cocoa.x86_64.dmg "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.dmg cp org.eclipse.sdk.ide-win32.win32.x86_64.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-win32-x86_64.zip popd -# fn-notarize-macbuild "$BUILD_DIR" eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.dmg + fn-notarize-macbuild "$BUILD_DIR" eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.dmg else echo " ERROR: $TARGET_PRODUCTS did not exist in fn-gather-sdks" fi @@ -775,7 +771,7 @@ fn-gather-platform () cp org.eclipse.platform.ide-macosx.cocoa.x86_64.dmg "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.dmg cp org.eclipse.platform.ide-win32.win32.x86_64.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-win32-x86_64.zip popd -# fn-notarize-macbuild "$BUILD_DIR" eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.dmg + fn-notarize-macbuild "$BUILD_DIR" eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.dmg else echo " ERROR: $TARGET_PRODUCTS did not exist in fn-gather-platform" fi diff --git a/production/publish-equinox.sh b/production/publish-equinox.sh index daa1c67d7..6e859e4bd 100755 --- a/production/publish-equinox.sh +++ b/production/publish-equinox.sh @@ -91,7 +91,7 @@ fn-eq-gather-starterkit () cp -v org.eclipse.rt.osgistarterkit.product-win32.win32.x86_64.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86_64.zip popd -# fn-notarize-macbuild "$DROP_DIR" EclipseRT-OSGi-StarterKit-${BUILD_ID}-macosx-cocoa-x86_64.dmg + fn-notarize-macbuild "$DROP_DIR" EclipseRT-OSGi-StarterKit-${BUILD_ID}-macosx-cocoa-x86_64.dmg else echo " ERROR: $TARGET_PRODUCTS did not exist in fn-eq-gather-starterkit" return 1 -- cgit v1.2.3