fix: agent version used in build so gha properly evaluates env var #201
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
Co-authored-by: Robb Kidd <robbkidd@honeycomb.io>
Co-authored-by: Robb Kidd <robbkidd@honeycomb.io>
if this somehow still doesnt work with i_made_this_up... (╯°□°）╯︵ ┻━┻ Co-authored-by: Robb Kidd <robbkidd@honeycomb.io>
- take shell and git out of the equation - make version uses variable with hardcoded string - make build uses hardcoded string Co-authored-by: Robb Kidd <robbkidd@honeycomb.io>
Adds RELEASE_VERISON as an optional build argument to the Dockerfile. RELEASE_VERSION is still computed by the Makefile. For the docker-build make target, pass in the version with --build-arg. For the docker/build-and-publish GitHub Action in our Release workflow, compute the RELEASE_VERSION with our make version target, set it in the environment for the workflow per GitHub docs[1], and pass in the arg with the build-args: key for the action. [1] https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#environment-files
JamieDanielson
changed the title
even though it breaks my heart Co-authored-by: JamieDanielson <jamieedanielson@gmail.com>
JamieDanielson
added a commit
that referenced
this pull request
Sep 18, 2023
## Which problem is this PR solving? - Reverts #186 - Reverts #187 ## Short description of the changes As seen in #192 (and attempted to fix in #201), GitHub Actions checkout action doesn't include git tag history, so computing current version from tags doesn't work at the moment. We are temporarily reverting this to expedite a new release using hardcoded version values, and will revisit this later. ## How to verify that this has the expected result `honeycomb.agent_version` shows the `vX.Y.Z` version in use, in agent container logs and telemetry. --------- Co-authored-by: Robb Kidd <robbkidd@honeycomb.io>
| push: false | ||
| platforms: linux/amd64 | ||
| # platforms: linux/amd64,linux/arm64 - don't build arm64 on PRs for now | ||
| cache-from: type=gha |
There was a problem hiding this comment.
This disables docker layer caching between builds - does this prevent git tags being detected correctly?
There was a problem hiding this comment.
Yeah, this doesn't seem to be related to our issue. Was just trying different settings to try to determine why the tag wasn't rendering as expected. I've set this PR back to draft as we'll be putting it down for now after removing the build interpreting version in #206
robbkidd
changed the title
robbkidd
changed the title
robbkidd
changed the title
|
I'm going to close this PR because it's a bit distracting right now as an open PR; the issue is still open and this can be picked back up when it makes sense to do so. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Which problem is this PR solving?
Short description of the changes
RELEASE_VERSIONvariable toREL_VERSIONin case it's being used already in GHA workflow somewhere.How to verify that this has the expected result
Review the output in the action for docker-build on the PR. Search for "ldflags" and confirm the
"-X main.Version=ca4d958"instead shows"-X main.Version=v0.0.14-alpha-6-gca4d958"instead ofca4d958.(It should be v0.0.15-alpha but the previous tag was not annotated)