Skip to content

Commit

Permalink
- fix a problem with filter-exec
Browse files Browse the repository at this point in the history
- pack-vm now signs also plugins from Pharo/Plugins
- re-enable deploy
  • Loading branch information
estebanlm committed Jan 29, 2018
1 parent 0a7094a commit 77b4b1a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -123,7 +123,7 @@ deploy:
skip_cleanup: true
on:
repo: OpenSmalltalk/opensmalltalk-vm
branch: CogRemoveThisToEnablePharoDeployAgain
branch: Cog
condition: $FLAVOR == pharo*
- provider: releases # Deploy stable tags to GitHub releases
api_key:
Expand Down
4 changes: 2 additions & 2 deletions deploy/filter-exec.sh
Expand Up @@ -9,13 +9,13 @@ readonly BRANCH_NAME="${TRAVIS_BRANCH:-${APPVEYOR_REPO_BRANCH}}"
readonly TAG_NAME="${TRAVIS_TAG:-${APPVEYOR_REPO_TAG_NAME}}"

if [[ "${REPO_NAME}" != "OpenSmalltalk/opensmalltalk-vm" ]]; then
echo "Trying to deploy in repository: ${APPVEYOR_REPO_NAME}. Skipping."
echo "Trying to deploy in repository: ${REPO_NAME}. Skipping."
exit
fi

if [[ "${BRANCH_NAME}" != "Cog" ]] && [[ -z "${TAG_NAME}" ]]; then
echo "Skipping a deployment with the script provider because this branch is not permitted"
exit
exit
fi

`dirname $0`/$1
1 change: 1 addition & 0 deletions deploy/pack-vm.sh
Expand Up @@ -68,6 +68,7 @@ elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
path_p12="${DEPLOY_DIR}/pharo/pharo.p12"
openssl aes-256-cbc -k "${PHARO_SIGN_PASSWORD}" -in "${path_cer}.enc" -out "${path_cer}" -d
openssl aes-256-cbc -k "${PHARO_SIGN_PASSWORD}" -in "${path_p12}.enc" -out "${path_p12}" -d
macos_codesign "${APP_DIR}/Contents/MacOS/Plugins/*" "${path_cer}" "${path_p12}" "${PHARO_CERT_PASSWORD}" "${PHARO_SIGN_IDENTITY}"
macos_codesign "${APP_DIR}" "${path_cer}" "${path_p12}" "${PHARO_CERT_PASSWORD}" "${PHARO_SIGN_IDENTITY}"
elif [[ "${FLAVOR}" == "newspeak"* ]]; then
NEW_APP_DIR="${PRODUCTS_DIR}/Newspeak.app"
Expand Down

0 comments on commit 77b4b1a

Please sign in to comment.