Skip to content

Commit

Permalink
Add Commits related to Snapshot build of Common Utils on 1.1 (opensea…
Browse files Browse the repository at this point in the history
…rch-project#67)

* Using 1.1 snapshot version for OpenSearch (opensearch-project#57)

Signed-off-by: Vacha <vachshah@amazon.com>

* Build snapshot build by default with the same version as OpenSearch. (opensearch-project#58)

Signed-off-by: dblock <dblock@amazon.com>

* Update build.gradle to reflect 1.1.0.0 version

Co-authored-by: Vacha <vachshah@amazon.com>
Co-authored-by: Daniel Doubrovkine (dB.) <dblock@dblock.org>
  • Loading branch information
3 people committed Sep 9, 2021
1 parent 0119874 commit 235d270
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@ jobs:
ref: '1.x'
- name: Build OpenSearch
working-directory: ./OpenSearch
run: ./gradlew publishToMavenLocal -Dbuild.snapshot=false
run: ./gradlew publishToMavenLocal

# common-utils
- name: Build and Test
run: |
./gradlew build -Dopensearch.version=1.1.0
./gradlew build -Dopensearch.version=1.1.0-SNAPSHOT
- name: Publish to Maven Local
run: |
./gradlew publishToMavenLocal -Dopensearch.version=1.1.0
./gradlew publishToMavenLocal -Dopensearch.version=1.1.0-SNAPSHOT
- name: Upload Coverage Report
uses: codecov/codecov-action@v1
Expand Down
14 changes: 12 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
buildscript {
ext {
opensearch_group = "org.opensearch"
opensearch_version = System.getProperty("opensearch.version", "1.1.0")
opensearch_version = System.getProperty("opensearch.version", "1.1.0-SNAPSHOT")
kotlin_version = System.getProperty("kotlin.version", "1.4.32")
}

Expand Down Expand Up @@ -44,7 +44,17 @@ repositories {
jcenter()
}

group 'org.opensearch.commons'
ext {
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
}

allprojects {
group 'org.opensearch.commons'
version = opensearch_version - '-SNAPSHOT' + '.0'
if (isSnapshot) {
version += "-SNAPSHOT"
}
}

sourceCompatibility = 1.8

Expand Down

0 comments on commit 235d270

Please sign in to comment.