buildctl: set fallback url for gha cache #5754
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
github-actions
bot
added
area/project
area/testing
area/hack
crazy-max
force-pushed
the
update-gha-cache-test
branch
from
ca875b0 to
d270bc0
Compare
crazy-max
changed the title
crazy-max
force-pushed
the
update-gha-cache-test
branch
from
d270bc0 to
a81bb08
Compare
crazy-max
commented
Feb 18, 2025
Comment on lines
+519
to
+520
| * `url`: Cache server URL (default `$ACTIONS_CACHE_URL` or fallback to `$ACTIONS_RESULTS_URL`) | ||
| * `url_v2`: Cache v2 server URL if `$ACTIONS_CACHE_SERVICE_V2` set on the runner (default `$ACTIONS_RESULTS_URL`) |
There was a problem hiding this comment.
Updated docs as well for new attribute. Not sure if we should also add version?
crazy-max
commented
Feb 18, 2025
crazy-max
force-pushed
the
update-gha-cache-test
branch
from
a81bb08 to
f9917ce
Compare
tonistiigi
reviewed
Feb 18, 2025
| return cache, errors.New("cache with type gha requires url parameter or $ACTIONS_RESULTS_URL") | ||
| // https://github.com/actions/toolkit/blob/2b08dc18f261b9fdd978b70279b85cbef81af8bc/packages/cache/src/internal/config.ts#L34-L35 | ||
| if v, ok := os.LookupEnv("ACTIONS_RESULTS_URL"); ok { | ||
| cache.Attrs["url_v2"] = v |
There was a problem hiding this comment.
why skip the error if ACTIONS_CACHE_SERVICE_V2 is set but ACTIONS_RESULTS_URL is not?
There was a problem hiding this comment.
This relates to #5754 (comment) so error would be handled from daemon side instead. Seems better to me for old daemon.
tonistiigi
reviewed
Feb 18, 2025
cmd/buildctl/build/util.go
Outdated
| if !ok { | ||
| return cache, errors.New("cache with type gha requires token parameter or $ACTIONS_RUNTIME_TOKEN") | ||
| if v, ok := os.LookupEnv("ACTIONS_RUNTIME_TOKEN"); ok { | ||
| cache.Attrs["token"] = v | ||
| } |
There was a problem hiding this comment.
My understanding is that daemon will error anyway if you don't send the token. So why skip error?
There was a problem hiding this comment.
It was to be aligned with buildx where we don't do this https://github.com/docker/buildx/blob/52f503e8068d4a09e7c1b17e4b88ae75b1f64651/util/buildflags/cache.go#L208-L231 but I can put that back if you prefer
crazy-max
force-pushed
the
update-gha-cache-test
branch
from
f9917ce to
4bbac8a
Compare
tonistiigi
reviewed
Feb 18, 2025
Signed-off-by: CrazyMax <[email protected]>
Signed-off-by: CrazyMax <[email protected]>
crazy-max
force-pushed
the
update-gha-cache-test
branch
from
4bbac8a to
1c917b4
Compare
tonistiigi
approved these changes
Feb 18, 2025
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.
relates to docker/buildx#3001 (comment)
We should always set
urlattr (if possible) when gha cache is used otherwise it will fail on BuildKit < 0.20 that doesn't supporturl_v2.Also updates gha cache tests to support cache service v2.