Skip to content

Conversation

crazy-max
Copy link
Member

Follow-up #1824

Signed-off-by: CrazyMax crazy-max@users.noreply.github.com

@crazy-max crazy-max changed the title Refactor generators for GitHub Actions Refactor generators Nov 21, 2020
@tiborvass
Copy link
Collaborator

tiborvass commented Nov 21, 2020

FYI I don't know what editor you're using but since #1824 I see ^M (\r aka 0x0d) characters in validate.yml when running git show a571db42, and I can confirm it with xxd. Would you mind cleaning that up as well in this PR?

@tiborvass
Copy link
Collaborator

you can also remove buildmode="buildkit" in hack/util

@crazy-max
Copy link
Member Author

crazy-max commented Nov 21, 2020

@tiborvass

Would you mind cleaning that up as well in this PR?

IntelliJ and yes my editor was misconfigured. Fixed now.

you can also remove buildmode="buildkit" in hack/util

Actually buildmode is required for the other scripts that have not been yet refactored.

@tiborvass
Copy link
Collaborator

Actually buildmode is required for the other scripts that have not been yet refactored.

@crazy-max Fair, but right now make binaries is broken locally because buildmode=buildkit is hardcoded so it expects a running buildkit instance (which is a fine assumption in CI). Before, it was simply set to the right mode and docker would be used if no buildkit is found. So maybe set buildmode in buildxCmd() accordingly, kinda ugly though. Open to suggestions.

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
@crazy-max
Copy link
Member Author

@tiborvass I've restored the old behavior. Let me know if it looks good to you.

@tonistiigi tonistiigi merged commit f30fab2 into moby:master Nov 22, 2020
@crazy-max crazy-max deleted the ghactions-generator branch November 22, 2020 04:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants