Skip to content

Commit

Permalink
Fix build to succeed with opensearch_version provided
Browse files Browse the repository at this point in the history
Signed-off-by: Marc Handalian <handalm@amazon.com>
  • Loading branch information
mch2 committed Aug 20, 2021
1 parent 83aafb1 commit cd5077c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
with:
repository: 'opensearch-project/OpenSearch'
path: OpenSearch
ref: '1.0'
ref: '1.x'
- name: Build OpenSearch
working-directory: ./OpenSearch
run: ./gradlew publishToMavenLocal -Dbuild.snapshot=false
Expand Down
9 changes: 3 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
buildscript {

ext {
opensearch_version = System.getProperty("opensearch.version", "1.0.0")
opensearch_version = System.getProperty("opensearch.version", "1.1.0")
}

// Used to resolve build file dependencies
Expand Down Expand Up @@ -68,7 +68,7 @@ spotbugsTest {
}

ext {
opensearchVersion = '1.0.0'
opensearchVersion = '1.1.0'
isSnapshot = "true" == System.getProperty("build.snapshot", "true")

// The RCA branch that will be built. Default value is main.
Expand Down Expand Up @@ -348,12 +348,9 @@ task buildRca() {
workingDir("$licenseDir")
commandLine 'rm', "-f", "performanceanalyzer-rca-1.0.0.0.jar.sha1"
}
exec {
workingDir("$projectDir")
commandLine './gradlew', 'updateShas'
}
}
}
buildRca.finalizedBy updateShas

// This value is set by the unpackRca task
def rcaArtifactsDir
Expand Down

0 comments on commit cd5077c

Please sign in to comment.