From cd9805904a7d3b941d25ccedb642dfe1f0e49ce9 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 17 Nov 2017 16:36:57 -0800 Subject: Travis: include the symlink in the zip of Mac .app Don't try to follow the (recursive) symlink. Signed-off-by: Dirk Hohndel --- scripts/mac/after_success.sh | 2 +- scripts/release-message.sh | 38 ++++++++++++++++++++++++++++++++++++++ scripts/travis_end.sh | 38 -------------------------------------- 3 files changed, 39 insertions(+), 39 deletions(-) create mode 100644 scripts/release-message.sh delete mode 100644 scripts/travis_end.sh (limited to 'scripts') diff --git a/scripts/mac/after_success.sh b/scripts/mac/after_success.sh index 221649e4e..953b66a65 100644 --- a/scripts/mac/after_success.sh +++ b/scripts/mac/after_success.sh @@ -10,7 +10,7 @@ export VERSION=$(cd ${TRAVIS_BUILD_DIR}; ./scripts/get-version linux) cd ${TRAVIS_BUILD_DIR}/build -zip -r Subsurface-$VERSION.app.zip Subsurface.app +zip -r -y Subsurface-$VERSION.app.zip Subsurface.app echo "Submitting the folloing App for continuous build release:" ls -lh Subsurface-$VERSION.app.zip diff --git a/scripts/release-message.sh b/scripts/release-message.sh new file mode 100644 index 000000000..3a9d4945f --- /dev/null +++ b/scripts/release-message.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +# don't run this for pull requests +if [ "$TRAVIS_EVENT_TYPE" == "pull_request" ] ; then + exit 0; +fi + +if [ ! -z $UPLOADTOOL_SUFFIX ] ; then + if [ "$UPLOADTOOL_SUFFIX" = "$TRAVIS_TAG" ] ; then + RELEASE_NAME=$TRAVIS_TAG + RELEASE_TITLE="Release build ($TRAVIS_TAG)" + is_prerelease="false" + else + RELEASE_NAME="continuous-$UPLOADTOOL_SUFFIX" + RELEASE_TITLE="Continuous build ($UPLOADTOOL_SUFFIX)" + is_prerelease="true" + fi +else + RELEASE_NAME="continuous" # Do not use "latest" as it is reserved by GitHub + RELEASE_TITLE="Continuous build" + is_prerelease="true" +fi + +# update the Body of the Release to be more interesting + +VERSION=$(cd ${TRAVIS_BUILD_DIR}; ./scripts/get-version linux) +T_BUILD_REF="Travis CI build log: https://travis-ci.org/Subsurface-divelog/subsurface/builds/$TRAVIS_BUILD_ID/\n\n" +WIN_BINS="subsurface.exe and subsurface.exe.debug are just the Subsurface executable for this build, the full Windows installer is subsurface-$VERSION.exe.\n\n" +MAC_ZIP="Subsurface-$VERSION.app.zip is a zip archive containing an unsigned app folder; you will have to override Mac security settings in order to be able to run this app.\n\n" +ANDROID_APK="The Android APK is not signed with the release key, most Android phones will force you to uninstall Subsurface-mobile before you can install this APK if you already have an official binary installed on your Android device.\n\n" +MISSING_BINARIES="While the continuous builds are running not all binaries may be posted here - please reload the page in a few minutes if the binary you are looking for is missing\n." +BODY=$T_BUILD_REF$WIN_BINS$MAC_ZIP$ANDROID_APK$MISSING_BINARIES + +release_id=$(curl https://api.github.com/repos/Subsurface-divelog/subsurface/releases/tags/${RELEASE_NAME} | grep "\"id\":" | head -n 1 | tr -s " " | cut -f 3 -d" " | cut -f 1 -d ",") +release_infos=$(curl -H "Authorization: token ${GITHUB_TOKEN}" --request PATCH \ + --data '{"tag_name": "'"$RELEASE_NAME"'","name": "'"$RELEASE_TITLE"'","body": "'"$BODY"'"}' "https://api.github.com/repos/Subsurface-divelog/subsurface/releases/${release_id}") + +echo $release_infos diff --git a/scripts/travis_end.sh b/scripts/travis_end.sh deleted file mode 100644 index 3a9d4945f..000000000 --- a/scripts/travis_end.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -# don't run this for pull requests -if [ "$TRAVIS_EVENT_TYPE" == "pull_request" ] ; then - exit 0; -fi - -if [ ! -z $UPLOADTOOL_SUFFIX ] ; then - if [ "$UPLOADTOOL_SUFFIX" = "$TRAVIS_TAG" ] ; then - RELEASE_NAME=$TRAVIS_TAG - RELEASE_TITLE="Release build ($TRAVIS_TAG)" - is_prerelease="false" - else - RELEASE_NAME="continuous-$UPLOADTOOL_SUFFIX" - RELEASE_TITLE="Continuous build ($UPLOADTOOL_SUFFIX)" - is_prerelease="true" - fi -else - RELEASE_NAME="continuous" # Do not use "latest" as it is reserved by GitHub - RELEASE_TITLE="Continuous build" - is_prerelease="true" -fi - -# update the Body of the Release to be more interesting - -VERSION=$(cd ${TRAVIS_BUILD_DIR}; ./scripts/get-version linux) -T_BUILD_REF="Travis CI build log: https://travis-ci.org/Subsurface-divelog/subsurface/builds/$TRAVIS_BUILD_ID/\n\n" -WIN_BINS="subsurface.exe and subsurface.exe.debug are just the Subsurface executable for this build, the full Windows installer is subsurface-$VERSION.exe.\n\n" -MAC_ZIP="Subsurface-$VERSION.app.zip is a zip archive containing an unsigned app folder; you will have to override Mac security settings in order to be able to run this app.\n\n" -ANDROID_APK="The Android APK is not signed with the release key, most Android phones will force you to uninstall Subsurface-mobile before you can install this APK if you already have an official binary installed on your Android device.\n\n" -MISSING_BINARIES="While the continuous builds are running not all binaries may be posted here - please reload the page in a few minutes if the binary you are looking for is missing\n." -BODY=$T_BUILD_REF$WIN_BINS$MAC_ZIP$ANDROID_APK$MISSING_BINARIES - -release_id=$(curl https://api.github.com/repos/Subsurface-divelog/subsurface/releases/tags/${RELEASE_NAME} | grep "\"id\":" | head -n 1 | tr -s " " | cut -f 3 -d" " | cut -f 1 -d ",") -release_infos=$(curl -H "Authorization: token ${GITHUB_TOKEN}" --request PATCH \ - --data '{"tag_name": "'"$RELEASE_NAME"'","name": "'"$RELEASE_TITLE"'","body": "'"$BODY"'"}' "https://api.github.com/repos/Subsurface-divelog/subsurface/releases/${release_id}") - -echo $release_infos -- cgit v1.2.3-70-g09d2