From 81a4f4addf9b1bb9dd893271aca6d5d11aefd4d6 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Mon, 1 Jun 2020 20:32:18 +0200 Subject: [PATCH] CircleCI: Fix builds of forked PRs (#25272) Signed-off-by: Arve Knudsen (cherry picked from commit b2745c3e23102fcb94db3af9e344e9d68ab0e45e) --- .circleci/config.yml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3b648d96a0a..ff5eb73b216 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -74,7 +74,7 @@ jobs: - run: name: Exit if enterprise and forked PR command: | - if [[ "<< parameters.edition >>" == "enterprise" && -n "$CIRCLE_PR_NUMBER" ]]; then + if [[ "<< parameters.edition >>" == "enterprise" && -n "$CIRCLE_PR_NUMBER" ]]; then echo "Nothing to do for forked PRs, so marking this step successful" circleci step halt fi @@ -88,15 +88,15 @@ jobs: command: | if [[ -n $CIRCLE_TAG ]]; then # A release build - /tmp/grabpl build-backend --github-token $GITHUB_GRAFANABOT_TOKEN --edition << parameters.edition >> \ + /tmp/grabpl build-backend --github-token "${GITHUB_GRAFANABOT_TOKEN}" --edition << parameters.edition >> \ --variants << parameters.variant >> $CIRCLE_TAG elif [[ $CIRCLE_BRANCH == "chore/test-release-pipeline" ]]; then # We're testing the release pipeline - /tmp/grabpl build-backend --github-token $GITHUB_GRAFANABOT_TOKEN --edition << parameters.edition >> \ + /tmp/grabpl build-backend --github-token "${GITHUB_GRAFANABOT_TOKEN}" --edition << parameters.edition >> \ --variants << parameters.variant >> v7.0.0-test else # A master or PR build - /tmp/grabpl build-backend --github-token $GITHUB_GRAFANABOT_TOKEN --edition << parameters.edition >> \ + /tmp/grabpl build-backend --github-token "${GITHUB_GRAFANABOT_TOKEN}" --edition << parameters.edition >> \ --variants << parameters.variant >> --build-id $CIRCLE_WORKFLOW_ID fi - run: @@ -126,7 +126,7 @@ jobs: - run: name: Exit if enterprise and forked PR command: | - if [[ "<< parameters.edition >>" == "enterprise" && -n "$CIRCLE_PR_NUMBER" ]]; then + if [[ "<< parameters.edition >>" == "enterprise" && -n "$CIRCLE_PR_NUMBER" ]]; then echo "Nothing to do for forked PRs, so marking this step successful" circleci step halt fi @@ -158,13 +158,13 @@ jobs: command: | if [[ -n $CIRCLE_TAG ]]; then # A release build - /tmp/grabpl build-frontend --github-token $GITHUB_GRAFANABOT_TOKEN --edition << parameters.edition >> $CIRCLE_TAG + /tmp/grabpl build-frontend --github-token "${GITHUB_GRAFANABOT_TOKEN}" --edition << parameters.edition >> $CIRCLE_TAG elif [[ $CIRCLE_BRANCH == "chore/test-release-pipeline" ]]; then # We're testing the release pipeline - /tmp/grabpl build-frontend --github-token $GITHUB_GRAFANABOT_TOKEN --edition << parameters.edition >> 7.0.0-test + /tmp/grabpl build-frontend --github-token "${GITHUB_GRAFANABOT_TOKEN}" --edition << parameters.edition >> 7.0.0-test else # A master or PR build - /tmp/grabpl build-frontend --github-token $GITHUB_GRAFANABOT_TOKEN --edition << parameters.edition >> --build-id $CIRCLE_WORKFLOW_ID + /tmp/grabpl build-frontend --github-token "${GITHUB_GRAFANABOT_TOKEN}" --edition << parameters.edition >> --build-id $CIRCLE_WORKFLOW_ID fi - run: name: Move artifacts @@ -192,7 +192,7 @@ jobs: - run: name: Exit if enterprise and forked PR command: | - if [[ "<< parameters.edition >>" == "enterprise" && -n "$CIRCLE_PR_NUMBER" ]]; then + if [[ "<< parameters.edition >>" == "enterprise" && -n "$CIRCLE_PR_NUMBER" ]]; then echo "Nothing to do for forked PRs, so marking this step successful" circleci step halt fi @@ -414,20 +414,20 @@ jobs: export GRAFANA_API_KEY=$GRAFANA_COM_API_KEY if [[ -n $CIRCLE_TAG ]]; then # A release build - /tmp/grabpl package --github-token $GITHUB_GRAFANABOT_TOKEN --jobs 2 --edition oss --sign $CIRCLE_TAG + /tmp/grabpl package --github-token "${GITHUB_GRAFANABOT_TOKEN}" --jobs 2 --edition oss --sign $CIRCLE_TAG elif [[ $CIRCLE_BRANCH == "chore/test-release-pipeline" ]]; then # We're testing the release pipeline - /tmp/grabpl package --github-token $GITHUB_GRAFANABOT_TOKEN --jobs 2 --edition oss --sign v7.0.0-test + /tmp/grabpl package --github-token "${GITHUB_GRAFANABOT_TOKEN}" --jobs 2 --edition oss --sign v7.0.0-test elif [[ $CIRCLE_BRANCH == "master" ]]; then # A master build - /tmp/grabpl package --github-token $GITHUB_GRAFANABOT_TOKEN --jobs 2 --edition oss --sign --build-id $CIRCLE_WORKFLOW_ID + /tmp/grabpl package --github-token "${GITHUB_GRAFANABOT_TOKEN}" --jobs 2 --edition oss --sign --build-id $CIRCLE_WORKFLOW_ID elif [[ -n "$CIRCLE_PR_NUMBER" ]]; then # A forked PR build, don't sign as it requires an API secret - /tmp/grabpl package --github-token $GITHUB_GRAFANABOT_TOKEN --jobs 2 --edition oss --build-id $CIRCLE_WORKFLOW_ID --variants \ + /tmp/grabpl package --github-token "${GITHUB_GRAFANABOT_TOKEN}" --jobs 2 --edition oss --build-id $CIRCLE_WORKFLOW_ID --variants \ linux-x64,linux-x64-musl,osx64,win64 else # A non-forked PR build - /tmp/grabpl package --github-token $GITHUB_GRAFANABOT_TOKEN --jobs 2 --edition oss --sign --build-id $CIRCLE_WORKFLOW_ID --variants \ + /tmp/grabpl package --github-token "${GITHUB_GRAFANABOT_TOKEN}" --jobs 2 --edition oss --sign --build-id $CIRCLE_WORKFLOW_ID --variants \ linux-x64,linux-x64-musl,osx64,win64 fi - run: @@ -476,20 +476,20 @@ jobs: if [[ -n $CIRCLE_TAG ]]; then # A release build - /tmp/grabpl package --github-token $GITHUB_GRAFANABOT_TOKEN --jobs 2 --edition enterprise --sign $CIRCLE_TAG + /tmp/grabpl package --github-token "${GITHUB_GRAFANABOT_TOKEN}" --jobs 2 --edition enterprise --sign $CIRCLE_TAG elif [[ $CIRCLE_BRANCH == "chore/test-release-pipeline" ]]; then # We're testing the release pipeline - /tmp/grabpl package --github-token $GITHUB_GRAFANABOT_TOKEN --jobs 2 --edition enterprise --sign v7.0.0-test + /tmp/grabpl package --github-token "${GITHUB_GRAFANABOT_TOKEN}" --jobs 2 --edition enterprise --sign v7.0.0-test elif [[ $CIRCLE_BRANCH == "master" ]]; then # A master build - /tmp/grabpl package --github-token $GITHUB_GRAFANABOT_TOKEN --jobs 2 --edition enterprise --sign --build-id $CIRCLE_WORKFLOW_ID + /tmp/grabpl package --github-token "${GITHUB_GRAFANABOT_TOKEN}" --jobs 2 --edition enterprise --sign --build-id $CIRCLE_WORKFLOW_ID elif [[ -n "$CIRCLE_PR_NUMBER" ]]; then # A forked PR build, don't sign as it requires an API secret - /tmp/grabpl package --github-token $GITHUB_GRAFANABOT_TOKEN --jobs 2 --edition enterprise --build-id $CIRCLE_WORKFLOW_ID --variants \ + /tmp/grabpl package --github-token "${GITHUB_GRAFANABOT_TOKEN}" --jobs 2 --edition enterprise --build-id $CIRCLE_WORKFLOW_ID --variants \ linux-x64,linux-x64-musl,osx64,win64 else # A PR build - /tmp/grabpl package --github-token $GITHUB_GRAFANABOT_TOKEN --jobs 2 --edition enterprise --sign --build-id $CIRCLE_WORKFLOW_ID --variants \ + /tmp/grabpl package --github-token "${GITHUB_GRAFANABOT_TOKEN}" --jobs 2 --edition enterprise --sign --build-id $CIRCLE_WORKFLOW_ID --variants \ linux-x64,linux-x64-musl,osx64,win64 fi - run: @@ -608,7 +608,7 @@ jobs: - run: name: Exit if enterprise and forked PR command: | - if [[ "<< parameters.edition >>" == "enterprise" && -n "$CIRCLE_PR_NUMBER" ]]; then + if [[ "<< parameters.edition >>" == "enterprise" && -n "$CIRCLE_PR_NUMBER" ]]; then echo "Nothing to do for forked PRs, so marking this step successful" circleci step halt fi