Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
98b94d38
Unverified
Commit
98b94d38
authored
Oct 07, 2020
by
Arve Knudsen
Committed by
GitHub
Oct 07, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Drone: Fix release pipelines (#28084)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
parent
a2e676f6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
10 deletions
+24
-10
.drone.yml
+5
-5
scripts/lib.star
+19
-5
No files found.
.drone.yml
View file @
98b94d38
...
...
@@ -1057,7 +1057,7 @@ steps:
commands
:
-
git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
-
cd grafana-enterprise
-
git checkout ${DRONE_
COMMIT
}
-
git checkout ${DRONE_
TAG
}
environment
:
GITHUB_TOKEN
:
from_secret
:
github_token
...
...
@@ -1069,7 +1069,7 @@ steps:
-
chmod +x grabpl
-
mv grabpl /tmp
-
mv grafana-enterprise /tmp/
-
/tmp/grabpl init-enterprise /tmp/grafana-enterprise
-
/tmp/grabpl init-enterprise /tmp/grafana-enterprise
${DRONE_TAG}
-
mkdir bin
-
mv /tmp/grabpl bin/
-
./bin/grabpl verify-version ${DRONE_TAG}
...
...
@@ -1336,7 +1336,7 @@ steps:
commands
:
-
git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
-
cd grafana-enterprise
-
git checkout $
$env:DRONE_COMMIT
-
git checkout $
{DRONE_TAG}
environment
:
GITHUB_TOKEN
:
from_secret
:
github_token
...
...
@@ -1812,7 +1812,7 @@ steps:
commands
:
-
git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
-
cd grafana-enterprise
-
git checkout
${DRONE_COMMIT}
-
git checkout
master
environment
:
GITHUB_TOKEN
:
from_secret
:
github_token
...
...
@@ -2085,7 +2085,7 @@ steps:
commands
:
-
git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
-
cd grafana-enterprise
-
git checkout
$$env:DRONE_COMMIT
-
git checkout
master
environment
:
GITHUB_TOKEN
:
from_secret
:
github_token
...
...
scripts/lib.star
View file @
98b94d38
...
...
@@ -111,10 +111,18 @@ def init_steps(edition, platform, ver_mode, is_downstream=False, install_deps=Tr
'yarn install --frozen-lockfile --no-progress',
])
if edition == 'enterprise':
if is_downstream:
source_commit = ' $${SOURCE_COMMIT}'
else:
if ver_mode == 'release':
committish = '${DRONE_TAG}'
source_commit = ' ${DRONE_TAG}'
elif ver_mode == 'test-release':
committish = 'master'
source_commit = ''
else:
if is_downstream:
source_commit = ' $${SOURCE_COMMIT}'
else:
source_commit = ''
committish = '${DRONE_COMMIT}'
steps = [
identify_runner_step,
{
...
...
@@ -128,7 +136,7 @@ def init_steps(edition, platform, ver_mode, is_downstream=False, install_deps=Tr
'commands': [
'git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"',
'cd grafana-enterprise',
'git checkout
${DRONE_COMMIT}'
,
'git checkout
{}'.format(committish)
,
],
},
{
...
...
@@ -863,6 +871,12 @@ def get_windows_steps(edition, ver_mode, is_downstream=False):
})
if edition == 'enterprise':
if ver_mode == 'release':
committish = '${DRONE_TAG}'
elif ver_mode == 'test-release':
committish = 'master'
else:
committish = '$$env:DRONE_COMMIT'
# For enterprise, we have to clone both OSS and enterprise and merge the latter into the former
clone_commands = [
'git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"',
...
...
@@ -870,7 +884,7 @@ def get_windows_steps(edition, ver_mode, is_downstream=False):
if not is_downstream:
clone_commands.extend([
'cd grafana-enterprise',
'git checkout
$$env:DRONE_COMMIT'
,
'git checkout
{}'.format(committish)
,
])
steps.insert(0, {
'name': 'clone',
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment