jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't submit release automatically when running on SC

Browse Source 
Summary:
Our SC release job failed when submitting directly from the prepare-release script, as the jf context wasn't properly setup. So instead we reuse the code we already have for that in SandcastleFlipperAutoReleaseCommand.

However, for manual releases we still do submit automatically and in name of the current user.

Reviewed By: passy

Differential Revision: D20384247

fbshipit-source-id: ed5eca180f009611f2890f8cb665bf203789d189
This commit is contained in:
Michel Weststrate
2020-03-11 04:48:35 -07:00
committed by Facebook GitHub Bot
parent 525d1982e5
commit 724fb79fe7
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/prepare-release.sh
View File

@@ -38,7 +38,8 @@ fi
echo "✨ Making a new release..." echo "✨ Making a new release..."
REVISION="$1" # When starting this job from SandcastleFlipperAutoReleaseCommand, we pass in the revision to release
SANDCASTLE_REVISION="$1"
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
SONAR_DIR="$DIR/../" SONAR_DIR="$DIR/../"
FLIPPERKIT_PODSPEC_PATH="$SONAR_DIR/FlipperKit.podspec" FLIPPERKIT_PODSPEC_PATH="$SONAR_DIR/FlipperKit.podspec"
@@ -51,7 +52,7 @@ OLD_VERSION_POD_ARG=$(< "$FLIPPER_PODSPEC_PATH" grep "$FLIPPERKIT_VERSION_TAG ="
OLD_VERSION="${OLD_VERSION_POD_ARG##* }" OLD_VERSION="${OLD_VERSION_POD_ARG##* }"
# if we got called with a rev argument, we got triggered from our automatic sandcastle job # if we got called with a rev argument, we got triggered from our automatic sandcastle job
if [ "$REVISION" != "" ]; if [ "$SANDCASTLE_REVISION" != "" ];
then then
# In future, bump majors instead of minors? # In future, bump majors instead of minors?
echo "Automatically bumping version to next minor in package.json" echo "Automatically bumping version to next minor in package.json"
@@ -128,6 +129,13 @@ Reviewers: flipper\n\n\
Tags: accept2ship" Tags: accept2ship"
)" )"
# Submit diffs if [ "$SANDCASTLE_REVISION" == "" ];
then
# Submit diffs, we only do this when running locally.
# From SandcastleFlipperAutoReleaseCommand, the diffs are submitted
# later by using the bot context
echo "Submitting diffs for review..." echo "Submitting diffs for review..."
jf submit -n -r.^::. jf submit -n -r.^::.
else
echo "Skip submitting diffs, as this diffs should be submitted by SC"
fi