Changeset 27991


Ignore:
Timestamp:
11/02/23 19:42:55 (18 months ago)
Author:
jdquinn
Message:

CHG: More fixes for packagers for binaries

Location:
issm/trunk-jpl/packagers
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/packagers/mac/commit_for_signing-issm-mac-binaries-matlab.sh

    r27580 r27991  
    227227
    228228                # Check status
    229                 STATUS=$(grep 'Status:' ${SIGNED_REPO_COPY}/${NOTARIZATION_LOGFILE} | sed -e 's/[[:space:]]*Status: //')
    230                 if [[ "${STATUS}" == "success" ]]; then
     229                STATUS=$(grep 'status: Accepted' ${SIGNED_REPO_COPY}/${NOTARIZATION_LOGFILE} | wc -l)
     230
     231                if [[ ${STATUS} -gt 0 ]]; then
    231232                        echo "Notarization successful!"
    232233                        break

  • issm/trunk-jpl/packagers/mac/commit_for_signing-issm-mac-binaries-python-3.sh

    r27580 r27991  
    227227
    228228                # Check status
    229                 STATUS=$(grep 'Status:' ${SIGNED_REPO_COPY}/${NOTARIZATION_LOGFILE} | sed -e 's/[[:space:]]*Status: //')
    230                 if [[ "${STATUS}" == "success" ]]; then
     229                STATUS=$(grep 'status: Accepted' ${SIGNED_REPO_COPY}/${NOTARIZATION_LOGFILE} | wc -l)
     230
     231                if [[ ${STATUS} -gt 0 ]]; then
    231232                        echo "Notarization successful!"
    232233                        break

  • issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh

    r27951 r27991  
    186186rm -f ${PKG}/lib/*.a # Remove static libraries from package
    187187rm -f ${PKG}/lib/*.la # Remove libtool libraries from package
     188rm -rf ${PKG}/test/MITgcm # Remove MITgcm from package
    188189rm -rf ${PKG}/test/SandBox # Remove testing sandbox from package
    189190

  • issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh

    r27951 r27991  
    186186rm -f ${PKG}/lib/*.a # Remove static libraries from package
    187187rm -f ${PKG}/lib/*.la # Remove libtool libraries from package
     188rm -rf ${PKG}/test/MITgcm # Remove MITgcm from package
    188189rm -rf ${PKG}/test/SandBox # Remove testing sandbox from package
    189190

  • issm/trunk-jpl/packagers/mac/sign-issm-mac-binaries-matlab.sh

    r27988 r27991  
    123123        find ${PKG}/bin -type f -name *.exe; \
    124124        find ${PKG}/lib -type f -name *.mexmaci64; \
     125        find ${PKG}/test -type f -name *.pkg; \
    125126)
    126127
    … …  
    154155
    155156# Check if UUID exists in response
    156 HAS_UUID=$(grep 'RequestUUID = ' ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE}) # NOTE: Checking for "RequestUUID = " because "RequestUUID" shows up in some error messages
     157HAS_UUID=$(grep 'id: ' ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE})
    157158if [ -z "${HAS_UUID}" ]; then
    158159        echo "Notarization failed!"
    … …  
    168169
    169170# Get UUID from notarization request response
    170 UUID=$(echo ${HAS_UUID} | sed 's/[[:space:]]*RequestUUID = //')
     171UUID=$(echo ${HAS_UUID} | sed 's/[[:space:]]*id: //')
    171172echo "UUID: ${UUID}"
    172173
    … …  
    179180#
    180181echo "Checking notarization status"
     182SUCCESS=0
    181183xcrun notarytool log ${UUID} --apple-id "$AD_USERNAME" --team-id "$TEAM_ID" --password "$NOTARY_PASSWORD" &> ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE}
    182184STATUS=$(grep 'status: Accepted' ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE} | wc -l)
    … …  
    193195
    194196        echo "Notarization successful!"
     197
     198        # Set flag indicating notarization was successful
     199        SUCCESS=1
    195200else
    196201        echo "Notarization failed!"

  • issm/trunk-jpl/packagers/mac/sign-issm-mac-binaries-python-3.sh

    r27988 r27991  
    123123        find ${PKG}/bin -type f -name *.exe; \
    124124        find ${PKG}/bin -type f -name *.pyc; \
     125        find ${PKG}/test -type f -name *.pkg; \
    125126)
    126127
    … …  
    163164
    164165# Check if UUID exists in response
    165 HAS_UUID=$(grep 'RequestUUID = ' ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE}) # NOTE: Checking for "RequestUUID = " because "RequestUUID" shows up in some error messages
     166HAS_UUID=$(grep 'id: = ' ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE})
    166167if [ -z "${HAS_UUID}" ]; then
    167168        echo "Notarization failed!"
    … …  
    177178
    178179# Get UUID from notarization request response
    179 UUID=$(echo ${HAS_UUID} | sed 's/[[:space:]]*RequestUUID = //')
     180UUID=$(echo ${HAS_UUID} | sed 's/[[:space:]]*id: //')
    180181echo "UUID: ${UUID}"
    181182
    … …  
    188189#
    189190echo "Checking notarization status"
     191SUCCESS=0
    190192xcrun notarytool log ${UUID} --apple-id "$AD_USERNAME" --team-id "$TEAM_ID" --password "$NOTARY_PASSWORD" &> ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE}
    191193STATUS=$(grep 'status: Accepted' ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE} | wc -l)
    … …  
    202204
    203205        echo "Notarization successful!"
     206
     207        # Set flag indicating notarization was successful
     208        SUCCESS=1
    204209else
    205210        echo "Notarization failed!"

  • issm/trunk-jpl/packagers/win/package-issm-win-binaries-matlab.sh

    r27986 r27991  
    8787        exit 1
    8888fi
    89 
    90 echo "Moving MATLAB libraries to bin/"
    91 cp ${MATLAB_PATH}/bin/win64/libmex.dll .
    9289
    9390echo "Moving MEX-files to bin/"
Note: See TracChangeset for help on using the changeset viewer.