Build: build enterprise2 with OSS (#45317)

* Build: build enterprise2 with OSS
This commit is contained in:
malcolmholmes 2022-02-11 14:38:40 +00:00 committed by GitHub
parent 77a0a71929
commit 334ee9c4a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 13 deletions

View File

@ -3431,9 +3431,7 @@ steps:
- yarn install --immutable
depends_on:
- clone-enterprise
environment:
GITHUB_TOKEN:
from_secret: github_token
environment: {}
image: grafana/build-container:1.4.9
name: initialize
- commands:
@ -3766,9 +3764,7 @@ steps:
- yarn install --immutable
depends_on:
- clone-enterprise
environment:
GITHUB_TOKEN:
from_secret: github_token
environment: {}
image: grafana/build-container:1.4.9
name: initialize
- commands:
@ -3931,9 +3927,7 @@ steps:
- yarn install --immutable
depends_on:
- clone-enterprise
environment:
GITHUB_TOKEN:
from_secret: github_token
environment: {}
image: grafana/build-container:1.4.9
name: initialize
- commands:
@ -4218,6 +4212,6 @@ kind: secret
name: gcp_upload_artifacts_key
---
kind: signature
hmac: 5c4a8e18a79c5031b622d3c54a571d91683dc7ccf73115eae29dc95cf5216a19
hmac: 1d7c4a778a9dcf8f7f69100cdef990a89ef563383c7b81ea79df1a04b815343d
...

View File

@ -64,8 +64,12 @@ def initialize_step(edition, platform, ver_mode, is_downstream=False, install_de
if ver_mode == 'release':
committish = '${DRONE_TAG}'
source_commit = ' ${DRONE_TAG}'
environment = {
'GITHUB_TOKEN': from_secret(github_token),
}
elif ver_mode == 'release-branch':
committish = '${DRONE_BRANCH}'
environment = {}
else:
if is_downstream:
source_commit = ' $${SOURCE_COMMIT}'
@ -79,9 +83,7 @@ def initialize_step(edition, platform, ver_mode, is_downstream=False, install_de
'depends_on': [
'clone-enterprise',
],
'environment': {
'GITHUB_TOKEN': from_secret(github_token),
},
'environment': environment,
'commands': [
'mv bin/grabpl /tmp/',
'rmdir bin',