Skip to content

Commit

Permalink
Update to avoid processing CYGWIN_WORKSPACE
Browse files Browse the repository at this point in the history
This was copied from the non-docker case but I don't believe it's part of the same logic, so skipping for simplicity

Signed-off-by: Stewart X Addison <[email protected]>
  • Loading branch information
sxa committed Aug 22, 2024
1 parent c073b6c commit ea362dd
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions pipelines/build/common/openjdk_build_pipeline.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -2117,10 +2117,7 @@ class Build {
}
if (buildConfig.TARGET_OS == 'windows') {
def workspace = 'C:/workspace/openjdk-build/'
if (env.CYGWIN_WORKSPACE) {
workspace = env.CYGWIN_WORKSPACE
}
context.echo("Switched to using workspace path ${workspace}")
context.echo("Switched to using non-default workspace path ${workspace}")
context.ws(workspace) {
context.docker.image(buildConfig.DOCKER_IMAGE).inside(buildConfig.DOCKER_ARGS+" "+dockerRunArg) {
buildScripts(
Expand Down Expand Up @@ -2162,7 +2159,7 @@ class Build {
if (env.CYGWIN_WORKSPACE) {
workspace = env.CYGWIN_WORKSPACE
}
context.echo("Switching to using workspace path ${workspace}")
context.echo("Switched to using non-default workspace path ${workspace}")
context.ws(workspace) {
buildScripts(
cleanWorkspace,
Expand Down

0 comments on commit ea362dd

Please sign in to comment.