Skip to content

N
nexpie-grafana-theme
Commit b2745c3e by Arve Knudsen Committed by GitHub
Options

CircleCI: Fix builds of forked PRs (#25272) 

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
parent df7647b2
Showing with 20 additions and 20 deletions
.circleci/config.yml
...@@ -74,7 +74,7 @@ jobs: ...@@ -74,7 +74,7 @@ jobs:
- run: - run:
name: Exit if enterprise and forked PR name: Exit if enterprise and forked PR
command: | 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" echo "Nothing to do for forked PRs, so marking this step successful"
circleci step halt circleci step halt
fi fi
...@@ -88,15 +88,15 @@ jobs: ...@@ -88,15 +88,15 @@ jobs:
command: | command: |
if [[ -n $CIRCLE_TAG ]]; then if [[ -n $CIRCLE_TAG ]]; then
# A release build # 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 --variants << parameters.variant >> $CIRCLE_TAG
elif [[ $CIRCLE_BRANCH == "chore/test-release-pipeline" ]]; then elif [[ $CIRCLE_BRANCH == "chore/test-release-pipeline" ]]; then
# We're testing the release pipeline # 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 --variants << parameters.variant >> v7.0.0-test
else else
# A master or PR build # 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 --variants << parameters.variant >> --build-id $CIRCLE_WORKFLOW_ID
fi fi
- run: - run:
...@@ -126,7 +126,7 @@ jobs: ...@@ -126,7 +126,7 @@ jobs:
- run: - run:
name: Exit if enterprise and forked PR name: Exit if enterprise and forked PR
command: | 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" echo "Nothing to do for forked PRs, so marking this step successful"
circleci step halt circleci step halt
fi fi
...@@ -158,13 +158,13 @@ jobs: ...@@ -158,13 +158,13 @@ jobs:
command: | command: |
if [[ -n $CIRCLE_TAG ]]; then if [[ -n $CIRCLE_TAG ]]; then
# A release build # 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 elif [[ $CIRCLE_BRANCH == "chore/test-release-pipeline" ]]; then
# We're testing the release pipeline # 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 else
# A master or PR build # 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 fi
- run: - run:
name: Move artifacts name: Move artifacts
...@@ -192,7 +192,7 @@ jobs: ...@@ -192,7 +192,7 @@ jobs:
- run: - run:
name: Exit if enterprise and forked PR name: Exit if enterprise and forked PR
command: | 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" echo "Nothing to do for forked PRs, so marking this step successful"
circleci step halt circleci step halt
fi fi
...@@ -414,20 +414,20 @@ jobs: ...@@ -414,20 +414,20 @@ jobs:
export GRAFANA_API_KEY=$GRAFANA_COM_API_KEY export GRAFANA_API_KEY=$GRAFANA_COM_API_KEY
if [[ -n $CIRCLE_TAG ]]; then if [[ -n $CIRCLE_TAG ]]; then
# A release build # 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 elif [[ $CIRCLE_BRANCH == "chore/test-release-pipeline" ]]; then
# We're testing the release pipeline # 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 elif [[ $CIRCLE_BRANCH == "master" ]]; then
# A master build # 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 elif [[ -n "$CIRCLE_PR_NUMBER" ]]; then
# A forked PR build, don't sign as it requires an API secret # 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 linux-x64,linux-x64-musl,osx64,win64
else else
# A non-forked PR build # 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 linux-x64,linux-x64-musl,osx64,win64
fi fi
- run: - run:
...@@ -476,20 +476,20 @@ jobs: ...@@ -476,20 +476,20 @@ jobs:
if [[ -n $CIRCLE_TAG ]]; then if [[ -n $CIRCLE_TAG ]]; then
# A release build # 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 elif [[ $CIRCLE_BRANCH == "chore/test-release-pipeline" ]]; then
# We're testing the release pipeline # 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 elif [[ $CIRCLE_BRANCH == "master" ]]; then
# A master build # 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 elif [[ -n "$CIRCLE_PR_NUMBER" ]]; then
# A forked PR build, don't sign as it requires an API secret # 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 linux-x64,linux-x64-musl,osx64,win64
else else
# A PR build # 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 linux-x64,linux-x64-musl,osx64,win64
fi fi
- run: - run:
...@@ -608,7 +608,7 @@ jobs: ...@@ -608,7 +608,7 @@ jobs:
- run: - run:
name: Exit if enterprise and forked PR name: Exit if enterprise and forked PR
command: | 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" echo "Nothing to do for forked PRs, so marking this step successful"
circleci step halt circleci step halt
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment