Skip to content

Add Commits related to Snapshot build of Common Utils on 1.1 #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
adityaj1107 wants to merge 2 commits into from
Closed

Add Commits related to Snapshot build of Common Utils on 1.1 #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f8f611
Using 1.1 snapshot version for OpenSearch (#57)
VachaShah Aug 16, 2021
f851b8e
Build snapshot build by default with the same version as OpenSearch. …
dblock Aug 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,23 @@ jobs:
with:
repository: 'opensearch-project/OpenSearch'
path: OpenSearch
<<<<<<< HEAD
ref: '1.0'
=======
ref: '1.x'
>>>>>>> cc02f23... Build snapshot build by default with the same version as OpenSearch. (#58)
- 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.0.0
./gradlew build -Dopensearch.version=1.1.0-SNAPSHOT

- name: Publish to Maven Local
run: |
./gradlew publishToMavenLocal -Dopensearch.version=1.0.0
./gradlew publishToMavenLocal -Dopensearch.version=1.1.0-SNAPSHOT

- name: Upload Coverage Report
uses: codecov/codecov-action@v1
Expand Down
16 changes: 12 additions & 4 deletions build.gradle
View file
Open in desktop
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.0.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 Expand Up @@ -146,8 +156,6 @@ task javadocJar(type: Jar) {
from javadoc.destinationDir
}

version '1.0.0.0'

publishing {
publications {
shadow(MavenPublication) {
Expand Down