ci: enable CD for commits to main #640
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rfratto
commented
Apr 22, 2024
| # for use in Docker image tags. | ||
|
|
||
| TAG=$(sh ./tools/image-tag) | ||
| echo ${TAG//+/-} |
There was a problem hiding this comment.
This was being done in a few different places, but also it got complicated to do in the Drone config so I extracted it out to a new script to reduce how many times we have to copy the same sanitization replacement.
rfratto
commented
Apr 22, 2024
| @@ -1,4 +1,4 @@ | |||
| #!/usr/bin/env bash | |||
| #!/usr/bin/env sh | |||
There was a problem hiding this comment.
The automation for CD uses alpine which doesn't have Bash installed, and it has always used sh. To make sure we continue to support sh I'm explicitly setting it here.
rfratto
added
the
backport-to-agent:no
mattdurham
reviewed
Apr 23, 2024
| { | ||
| "git_committer_name": "updater-for-ci[bot]", | ||
| "git_author_name": "updater-for-ci[bot]", | ||
| "git_committer_email": "119986603+updater-for-ci[bot]@users.noreply.github.com", |
There was a problem hiding this comment.
any danger in exposing this?
There was a problem hiding this comment.
I doubt it, you still need the private key to be able to do anything and other teams have been using the same workflow with the same settings AFAIK (including grafana/agent).
rfratto
added a commit
that referenced
this pull request
Apr 23, 2024
`sh` (as executed by Alpine) understands `set -o pipefail`, but other installations of sh do not. This commit partially reverts the change from #640 so that the scripts expect bash, and that our usage of alpine installs bash before executing the tools/image-tag-docker script.
rfratto
added a commit
that referenced
this pull request
Apr 23, 2024
`sh` (as executed by Alpine) understands `set -o pipefail`, but other installations of sh do not. This commit partially reverts the change from #640 so that the scripts expect bash, and that our usage of alpine installs bash before executing the tools/image-tag-docker script.
rfratto
added a commit
to rfratto/alloy
that referenced
this pull request
Apr 23, 2024
… versions PR grafana#640 neglected to notice that using Docker-compatible tag names overwrote the behavior for the version baked into the binary, causing binaries to start reporting invalid semantic version strings.
hainenber
pushed a commit
to hainenber/alloy
that referenced
this pull request
May 1, 2024
hainenber
pushed a commit
to hainenber/alloy
that referenced
this pull request
May 1, 2024
`sh` (as executed by Alpine) understands `set -o pipefail`, but other installations of sh do not. This commit partially reverts the change from grafana#640 so that the scripts expect bash, and that our usage of alpine installs bash before executing the tools/image-tag-docker script.
hainenber
pushed a commit
to hainenber/alloy
that referenced
this pull request
May 1, 2024
… versions (grafana#653) PR grafana#640 neglected to notice that using Docker-compatible tag names overwrote the behavior for the version baked into the binary, causing binaries to start reporting invalid semantic version strings.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Re-enables continuous delivery for main commits for internal testing.