From 5f418187663988b148a7fd1ed570950418e6387d Mon Sep 17 00:00:00 2001 From: Marcus Andersson Date: Thu, 1 Oct 2020 20:50:17 +0200 Subject: [PATCH] Build: restoring temporary commit so we can get lerna to publish the frontend packages. (#27979) * restoring commit function. * removed spacing. --- scripts/circle-release-next-packages.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/scripts/circle-release-next-packages.sh b/scripts/circle-release-next-packages.sh index e422a22f1e4..2ef3b33b682 100755 --- a/scripts/circle-release-next-packages.sh +++ b/scripts/circle-release-next-packages.sh @@ -6,6 +6,13 @@ PACKAGES=(ui toolkit data runtime e2e e2e-selectors) # shellcheck source=./scripts/helpers/exit-if-fail.sh source "$(dirname "$0")/helpers/exit-if-fail.sh" +function prepare_version_commit () { + echo $'\nCommitting version changes. This commit will not be checked-in!' + git config --global user.email "drone@grafana.com" + git config --global user.name "Drone" + git commit -am "Version commit" +} + function unpublish_previous_canary () { _package=$1 echo $'\nUnpublishing previous canary packages' @@ -35,18 +42,22 @@ if [ -z "$count" ]; then else echo "Changes detected in ${count} packages" echo "Starting to release latest canary version" - + + # For some reason the --no-git-reset is not working as described so + # to get lerna to publish the packages we need to do a commit to the + # repository. We will not push this commit to the origin repository. + prepare_version_commit + # Frontend packages have already been versioned and built by the # build-frontend step in drone. We will only unpublish the previous # canary version and publish the current built version as the new # latest canary build. - for PACKAGE in "${PACKAGES[@]}" do unpublish_previous_canary "$PACKAGE" done echo $'\nPublishing packages' - yarn packages:publishCanary --no-git-reset + yarn packages:publishCanary fi