From ffdbe60da0132dba5f93aed822821ee4048e2f61 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Tue, 11 Feb 2020 09:19:34 +0100 Subject: [PATCH] CircleCI: Include build ID in version for new master pipeline (#22013) * CircleCI: Include build ID in version for new master pipeline --- .circleci/config.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 446e5dfda50..911e8811d73 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -71,8 +71,9 @@ jobs: command: ./scripts/ci-job-started.sh - run: name: Build Grafana backend - # TODO: Don't use $CIRCLE_TAG for master - command: /tmp/workspace/bin/grabpl build-backend --edition << parameters.edition >> --variants << parameters.variant >> $CIRCLE_TAG + command: | + /tmp/workspace/bin/grabpl build-backend --edition << parameters.edition >> \ + --variants << parameters.variant >> --build-id $CIRCLE_WORKFLOW_ID - run: name: Move artifacts command: mkdir -p << parameters.edition >> && mv bin << parameters.edition >>/ @@ -248,7 +249,7 @@ jobs: command: cp -r /tmp/workspace/oss/* . - run: name: Package Grafana - command: /tmp/workspace/bin/grabpl package --edition oss + command: /tmp/workspace/bin/grabpl package --edition oss --build-id $CIRCLE_WORKFLOW_ID - run: name: Move artifacts command: | @@ -281,7 +282,7 @@ jobs: command: cp -r /tmp/workspace/enterprise/* . - run: name: Package Grafana - command: /tmp/workspace/bin/grabpl package --edition enterprise + command: /tmp/workspace/bin/grabpl package --edition enterprise --build-id $CIRCLE_WORKFLOW_ID - run: name: Move artifacts command: |