Adds support for GitHub action ENV variables #21
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
2 tasks
| .map(String::trim) | ||
| .map(branch -> branch.replaceAll("[^A-Za-z0-9\\.\\_\\-]", "")) | ||
| .filter(branch -> !branch.isEmpty()) | ||
| .orElse("test"); | ||
| } | ||
|
|
||
| private Optional<String> tryGetBuildSha() { | ||
| return getEnvironmentVariable("CIRCLE_SHA1") | ||
| return getFirstAvailableEnvironmentVariable(Arrays.asList("CIRCLE_BRANCH", "GHA_BRANCH")) |
There was a problem hiding this comment.
Why would this be on BRANCH? I think we need a similar env for GHA?
There was a problem hiding this comment.
GITHUB_SHA is already available.
There was a problem hiding this comment.
reverted to previous function
| return getEnvironmentVariable("CIRCLE_BRANCH") | ||
| // Use the value of CIRCLE_BRANCH/ GHA_BRANCH environment variable if defined (that is, the branch name used | ||
| // to build in CI), otherwise for local builds use 'test' | ||
| return getFirstAvailableEnvironmentVariable(Arrays.asList("CIRCLE_BRANCH", "GHA_BRANCH")) |
There was a problem hiding this comment.
See my comment on hypertrace/attribute-service#45 (comment) - I think we should keep the plugin using standard variables. Can we move the normalization of the ref format into this code?
Comment on lines
117
to
125
| return getEnvironmentVariable("CIRCLE_BRANCH") | ||
| .map(String::trim) | ||
| .map(branch -> branch.replaceAll("[^A-Za-z0-9\\.\\_\\-]", "")) | ||
| .filter(branch -> !branch.isEmpty()) | ||
| .orElse(getEnvironmentVariable("GITHUB_REF") | ||
| .map(String::trim) | ||
| .map(branch -> branch.replaceAll("(.*)\\/", "")) | ||
| .filter(branch -> !branch.isEmpty()) | ||
| .orElse("test")); |
There was a problem hiding this comment.
What we do once we get the ref should be the same in either case - trim, normalize, replace special chars to make it a docker-acceptable format. Also, the current regex looks like it would break on branch names including slashes. How about (suggest you test this, since just writing in a browser):
Suggested change
| return getEnvironmentVariable("CIRCLE_BRANCH") | |
| .map(String::trim) | |
| .map(branch -> branch.replaceAll("[^A-Za-z0-9\\.\\_\\-]", "")) | |
| .filter(branch -> !branch.isEmpty()) | |
| .orElse(getEnvironmentVariable("GITHUB_REF") | |
| .map(String::trim) | |
| .map(branch -> branch.replaceAll("(.*)\\/", "")) | |
| .filter(branch -> !branch.isEmpty()) | |
| .orElse("test")); | |
| return getEnvironmentVariable("CIRCLE_BRANCH") | |
| .or(getEnvironmentVariable("GITHUB_REF")) | |
| .map(branch -> branch.replaceAll("refs\\/heads\\/", "")) | |
| .map(String::trim) | |
| .map(branch -> branch.replaceAll("[^A-Za-z0-9\\.\\_\\-]", "")) | |
| .filter(branch -> !branch.isEmpty()) | |
| .orElse("test")); |
hypertrace-gradle-docker-plugin/src/main/java/org/hypertrace/gradle/docker/DockerPlugin.java
Outdated
Show resolved
Hide resolved
hypertrace-gradle-docker-plugin/src/main/java/org/hypertrace/gradle/docker/DockerPlugin.java
Outdated
Show resolved
Hide resolved
…radle/docker/DockerPlugin.java Co-authored-by: Aaron Steinfeld <45047841+aaron-steinfeld@users.noreply.github.com>
aaron-steinfeld
previously approved these changes
Dec 21, 2020
| @@ -3,8 +3,11 @@ | |||
| import com.bmuschko.gradle.docker.DockerExtension; | |||
| import com.bmuschko.gradle.docker.DockerRemoteApiPlugin; | |||
| import com.bmuschko.gradle.docker.tasks.image.DockerBuildImage; | |||
|
|
|||
| import java.util.Arrays; | |||
There was a problem hiding this comment.
nit: unused imports
aaron-steinfeld
approved these changes
Dec 21, 2020
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.
This PR,