From c3f277a6fe71ed1a1415901ee6e6ee30ba334e09 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Thu, 1 Oct 2020 17:37:56 +0200 Subject: [PATCH] Drone: Fix releasing of next NPM packages (#27965) * CI: Upgrade build pipeline tool Signed-off-by: Arve Knudsen * Drone: Don't bump NPM package version as part of script Signed-off-by: Arve Knudsen * cleaned up release next packages script. * made the comment a bit better. Co-authored-by: Marcus Andersson --- .circleci/config.yml | 2 +- .drone.yml | 10 +++--- .../scripts/deploy.sh | 2 +- .../grafana-plugin-ci-e2e/scripts/deploy.sh | 2 +- .../grafana-plugin-ci/scripts/deploy.sh | 2 +- scripts/circle-release-next-packages.sh | 33 ++++--------------- scripts/lib.star | 2 +- 7 files changed, 16 insertions(+), 37 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 29833ff28ca..f8644c05a68 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,7 +47,7 @@ commands: - run: name: "Install Grafana build pipeline tool" command: | - VERSION=0.5.15 + VERSION=0.5.16 curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v${VERSION}/grabpl chmod +x grabpl mv grabpl /tmp diff --git a/.drone.yml b/.drone.yml index b77f321e86b..f14a0eae991 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,7 +16,7 @@ steps: - name: initialize image: grafana/build-container:1.2.27 commands: - - curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.15/grabpl + - curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.16/grabpl - chmod +x grabpl - mkdir -p bin - mv grabpl bin @@ -241,7 +241,7 @@ steps: image: grafana/ci-wix:0.1.1 commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.15/windows/grabpl.exe -OutFile grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.16/windows/grabpl.exe -OutFile grabpl.exe trigger: event: @@ -265,7 +265,7 @@ steps: - name: initialize image: grafana/build-container:1.2.27 commands: - - curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.15/grabpl + - curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.16/grabpl - chmod +x grabpl - mkdir -p bin - mv grabpl bin @@ -586,7 +586,7 @@ steps: image: grafana/ci-wix:0.1.1 commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.15/windows/grabpl.exe -OutFile grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.16/windows/grabpl.exe -OutFile grabpl.exe - name: build-windows-installer image: grafana/ci-wix:0.1.1 @@ -634,7 +634,7 @@ steps: - name: initialize image: grafana/build-container:1.2.27 commands: - - curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.15/grabpl + - curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.16/grabpl - chmod +x grabpl - mkdir -p bin - mv grabpl bin diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh index e2917865917..22c6facdfc3 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh +++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh @@ -43,7 +43,7 @@ get_file "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-l "b4138199aa755ebfe171b57cc46910b13258ace5fbc4eaa099c42607cd0bff32" chmod +x /usr/local/bin/cc-test-reporter -curl -fL -o /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.15/grabpl" +curl -fL -o /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.16/grabpl" apk add --no-cache git # Install Mage diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh index a0a997d7800..e961830b07d 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh +++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh @@ -44,7 +44,7 @@ get_file "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-l "b4138199aa755ebfe171b57cc46910b13258ace5fbc4eaa099c42607cd0bff32" chmod 755 /usr/local/bin/cc-test-reporter -wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.15/grabpl" +wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.16/grabpl" chmod +x /usr/local/bin/grabpl # Install Mage diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh index 330988532a4..a2ecd3c83a3 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh +++ b/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh @@ -27,7 +27,7 @@ get_file "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-l "b4138199aa755ebfe171b57cc46910b13258ace5fbc4eaa099c42607cd0bff32" chmod +x /usr/local/bin/cc-test-reporter -wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.15/grabpl" +wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.16/grabpl" chmod +x /usr/local/bin/grabpl # Install Mage diff --git a/scripts/circle-release-next-packages.sh b/scripts/circle-release-next-packages.sh index b0e7fac64e4..6e07a0686a3 100755 --- a/scripts/circle-release-next-packages.sh +++ b/scripts/circle-release-next-packages.sh @@ -6,17 +6,6 @@ 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 parse_git_hash() { - git rev-parse --short HEAD 2> /dev/null | sed "s/\(.*\)/\1/" -} - -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' @@ -38,14 +27,6 @@ function unpublish_previous_canary () { fi } -# Get current version from lerna.json -PACKAGE_VERSION=$(grep '"version"' lerna.json | cut -d '"' -f 4) -# Get current commit's short hash -GIT_SHA=$(parse_git_hash) - -echo "Commit: ${GIT_SHA}" -echo "Current lerna.json version: ${PACKAGE_VERSION}" - # check if there were any changes to packages between current and previous commit count=$(git diff HEAD~1..HEAD --name-only -- packages | awk '{c++} END {print c}') count="1" @@ -53,14 +34,12 @@ if [ -z "$count" ]; then echo "No changes in packages, skipping packages publishing" else echo "Changes detected in ${count} packages" - echo "Releasing packages under ${PACKAGE_VERSION}-${GIT_SHA}" - ./node_modules/.bin/lerna version "${PACKAGE_VERSION}-${GIT_SHA}" --exact --no-git-tag-version --no-push --force-publish -y - echo $'\nGit status:' - git status -s - - prepare_version_commit - - echo $'\nBuilding packages' + echo "Starting to release latest canary version" + + # 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 diff --git a/scripts/lib.star b/scripts/lib.star index 3faf07d3879..0b2bbfccbdb 100644 --- a/scripts/lib.star +++ b/scripts/lib.star @@ -3,7 +3,7 @@ publish_image = 'grafana/grafana-ci-deploy:1.2.6' grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2' alpine_image = 'alpine:3.12' windows_image = 'mcr.microsoft.com/windows:1809' -grabpl_version = '0.5.15' +grabpl_version = '0.5.16' git_image = 'alpine/git:v2.26.2' dockerize_version = '0.6.1' wix_image = 'grafana/ci-wix:0.1.1'