Stash changes from verify-gen-cue

This commit is contained in:
dsotirakis
2022-10-05 17:17:30 +03:00
parent 865919f6df
commit edcab90efd
2 changed files with 4 additions and 4 deletions
+3 -3
View File
@@ -372,7 +372,7 @@ steps:
- cd -
- git fetch https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git "refs/tags/*:refs/tags/*"
&& git fetch
- git rebase origin/main
- git stash && git rebase origin/main
- if git show-ref --tags $${TEST_TAG} --quiet; then git tag -d $${TEST_TAG} && git
push --delete https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git $${TEST_TAG};
fi
@@ -1238,7 +1238,7 @@ steps:
- cd -
- git fetch https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git "refs/tags/*:refs/tags/*"
&& git fetch
- git rebase origin/main
- git stash && git rebase origin/main
- if git show-ref --tags $${TEST_TAG} --quiet; then git tag -d $${TEST_TAG} && git
push --delete https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git $${TEST_TAG};
fi
@@ -5338,6 +5338,6 @@ kind: secret
name: packages_secret_access_key
---
kind: signature
hmac: 83d0f265160c3006dbf7c7c5098a893b0b821b43deb5c8db5ce9f5217a868321
hmac: 1b6874e508d7d7e5ae795e15eeeae142f99a54057edd706345cc59e65c94f048
...
+1 -1
View File
@@ -1210,7 +1210,7 @@ def trigger_test_release():
'git tag $${TEST_TAG} && git push origin $${TEST_TAG}',
'cd -',
'git fetch https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git "refs/tags/*:refs/tags/*" && git fetch',
'git rebase origin/main',
'git stash && git rebase origin/main',
'if git show-ref --tags $${TEST_TAG} --quiet; then git tag -d $${TEST_TAG} && git push --delete https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git $${TEST_TAG}; fi',
'git tag $${TEST_TAG} && git push https://$${GITHUB_TOKEN}@github.com/grafana/grafana.git $${TEST_TAG}',
],