diff options
author | Trumeet <17158086+Trumeet@users.noreply.github.com> | 2021-01-09 11:19:35 -0800 |
---|---|---|
committer | Trumeet <17158086+Trumeet@users.noreply.github.com> | 2021-01-09 11:19:35 -0800 |
commit | 40320a4bdb063c3da7bf12295328ed3db30dd143 (patch) | |
tree | cac0757343b2c111a27172f3f2976a4f47b65a12 | |
parent | 7e416649ab806bde720c323f82afc0e066377c0e (diff) | |
download | dn42peering-40320a4bdb063c3da7bf12295328ed3db30dd143.tar dn42peering-40320a4bdb063c3da7bf12295328ed3db30dd143.tar.gz dn42peering-40320a4bdb063c3da7bf12295328ed3db30dd143.tar.bz2 dn42peering-40320a4bdb063c3da7bf12295328ed3db30dd143.zip |
build: use dynamic version name
-rw-r--r-- | .github/workflows/publish.yml | 8 | ||||
-rw-r--r-- | agent/build.gradle | 2 | ||||
-rw-r--r-- | build.gradle | 1 | ||||
-rw-r--r-- | central/build.gradle | 2 | ||||
-rw-r--r-- | rpc-common/build.gradle | 2 |
5 files changed, 10 insertions, 5 deletions
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 142207f..bfec7c5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,8 +15,10 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.8 + - name: Generate tag + run: echo "CUSTOM_BUILD=${GITHUB_REF##*/}" >> $GITHUB_ENV - name: Build - run: ./gradlew :central:distTar + run: ./gradlew -Pbuild_ver=$CUSTOM_BUILD :central:distTar - uses: ncipollo/release-action@v1.7.3 with: allowUpdates: true @@ -30,8 +32,10 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.8 + - name: Generate tag + run: echo "CUSTOM_BUILD=${GITHUB_REF##*/}" >> $GITHUB_ENV - name: Build - run: ./gradlew :agent:distTar + run: ./gradlew -Pbuild_ver=$CUSTOM_BUILD :agent:distTar - uses: ncipollo/release-action@v1.7.3 with: allowUpdates: true diff --git a/agent/build.gradle b/agent/build.gradle index 570c479..ccd5471 100644 --- a/agent/build.gradle +++ b/agent/build.gradle @@ -6,7 +6,7 @@ plugins { } group 'moe.yuuta' -version '1.0' +version project.ver sourceCompatibility = 1.8 targetCompatibility = 1.8 diff --git a/build.gradle b/build.gradle index cc98403..5f1545a 100644 --- a/build.gradle +++ b/build.gradle @@ -16,5 +16,6 @@ project.ext { vertxVersion = "4.0.1-SNAPSHOT" grpcVersion = '1.34.1' protobufVersion = '3.14.0' + ver = project.hasProperty("build_ver") ? project.getProperty("build_ver") : "dev" } diff --git a/central/build.gradle b/central/build.gradle index c4eb3b0..c0ed922 100644 --- a/central/build.gradle +++ b/central/build.gradle @@ -4,7 +4,7 @@ plugins { } group 'moe.yuuta' -version '1.0' +version project.ver sourceCompatibility = 1.8 targetCompatibility = 1.8 diff --git a/rpc-common/build.gradle b/rpc-common/build.gradle index 81bf422..f3843fc 100644 --- a/rpc-common/build.gradle +++ b/rpc-common/build.gradle @@ -5,7 +5,7 @@ plugins { } group 'moe.yuuta' -version '1.0' +version project.ver def protocVersion = protobufVersion |