From 1b938c2777efe492bb3be01d30c95c3306584fb1 Mon Sep 17 00:00:00 2001 From: pllearns Date: Thu, 20 Feb 2020 09:40:08 -0800 Subject: [PATCH 1/8] Workflow reconfiguration attempt to automate version bumping with persistent value for master branch --- .github/workflows/ci.yml | 18 ++++++++++++++++-- .github/workflows/release.yml | 2 +- README.md | 4 ++-- xyo-android-library/build.gradle | 2 +- xyo-android-library/version.properties | 4 ++-- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c93a3bd..524e082 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,8 +2,8 @@ name: CI on: push: - branches-ignore: - - 'master' + branches: + - 'develop' jobs: build: @@ -15,3 +15,17 @@ jobs: run: chmod +x ./gradlew - name: build run: ./gradlew clean assemble + - name: check in local changes + run: | + git status + git add version.properties + - name: commit file + run: | + git config --local user.email "action@github.com" + git config --local user.name "GitHub Action" + git commit -m "version bump" -a + - name: push changes + uses: ad-m/github-push-action@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branch: 'develop' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2b02c34..f0d3517 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: run: ./gradlew install - name: assemble run: ./gradlew :xyo-android-library:assembleRelease - - name: bump version + - name: print version run: | echo "##[set-output name=version;]$(gradle -q printVersion)" id: release_version diff --git a/README.md b/README.md index eacc0c5..b474734 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Including BLE, TCP/IP, Bound Witnessing, and Bridging.  ## Gradle Build ```gradle - compile 'network.xyo:sdk-xyo-android:3.1.25' + compile 'network.xyo:sdk-xyo-android:3.1.26' ``` ## Maven Build @@ -38,7 +38,7 @@ Including BLE, TCP/IP, Bound Witnessing, and Bridging.  network.xyo sdk-xyo-android - 3.1.25 + 3.1.26 pom diff --git a/xyo-android-library/build.gradle b/xyo-android-library/build.gradle index 26d1540..9a4ffa2 100644 --- a/xyo-android-library/build.gradle +++ b/xyo-android-library/build.gradle @@ -35,7 +35,7 @@ def increment = 0 def runTasks = gradle.startParameter.taskNames -if (':xyo-android-library:assembleRelease' in runTasks) { +if ('clean assemble' in runTasks) { increment = 1 } diff --git a/xyo-android-library/version.properties b/xyo-android-library/version.properties index f34b353..4bc9abf 100644 --- a/xyo-android-library/version.properties +++ b/xyo-android-library/version.properties @@ -1,2 +1,2 @@ -#Wed Feb 19 15:50:42 PST 2020 -VERSION_PATCH=24 +#Thu Feb 20 09:19:50 PST 2020 +VERSION_PATCH=25 From b402587321bbff839da093e1a998f896a2674658 Mon Sep 17 00:00:00 2001 From: pllearns Date: Thu, 20 Feb 2020 09:49:25 -0800 Subject: [PATCH 2/8] change git add command --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 524e082..ff48843 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: - name: check in local changes run: | git status - git add version.properties + git add xyo-android-library/version.properties - name: commit file run: | git config --local user.email "action@github.com" From 01580ffe00ecec0bd6bc4c26024eb2d279434eac Mon Sep 17 00:00:00 2001 From: pllearns Date: Thu, 20 Feb 2020 09:54:40 -0800 Subject: [PATCH 3/8] update command to start version bump --- xyo-android-library/build.gradle | 2 +- xyo-android-library/version.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xyo-android-library/build.gradle b/xyo-android-library/build.gradle index 9a4ffa2..bc744b2 100644 --- a/xyo-android-library/build.gradle +++ b/xyo-android-library/build.gradle @@ -35,7 +35,7 @@ def increment = 0 def runTasks = gradle.startParameter.taskNames -if ('clean assemble' in runTasks) { +if (':xyo-android-library:clean assemble' in runTasks) { increment = 1 } diff --git a/xyo-android-library/version.properties b/xyo-android-library/version.properties index 4bc9abf..5c686bd 100644 --- a/xyo-android-library/version.properties +++ b/xyo-android-library/version.properties @@ -1,2 +1,2 @@ -#Thu Feb 20 09:19:50 PST 2020 +#Thu Feb 20 09:53:48 PST 2020 VERSION_PATCH=25 From a8726b8baffc87d0cc1eef6d0b7f49077d7cb53b Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 20 Feb 2020 17:59:04 +0000 Subject: [PATCH 4/8] version bump --- xyo-android-library/version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xyo-android-library/version.properties b/xyo-android-library/version.properties index 5c686bd..75a4eac 100644 --- a/xyo-android-library/version.properties +++ b/xyo-android-library/version.properties @@ -1,2 +1,2 @@ -#Thu Feb 20 09:53:48 PST 2020 +#Thu Feb 20 17:55:43 UTC 2020 VERSION_PATCH=25 From f4da58ac79fc1a2e9d0b2a066508f35621f368eb Mon Sep 17 00:00:00 2001 From: pllearns Date: Thu, 20 Feb 2020 10:35:25 -0800 Subject: [PATCH 5/8] change bump command --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff48843..4c79549 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: - name: pre-build run: chmod +x ./gradlew - name: build - run: ./gradlew clean assemble + run: ./gradlew :xyo-android-library:clean assemble - name: check in local changes run: | git status From fca78e1ca276e7ec6b7f0ef83c129e0f70ac0f31 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 20 Feb 2020 18:40:35 +0000 Subject: [PATCH 6/8] version bump --- xyo-android-library/version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xyo-android-library/version.properties b/xyo-android-library/version.properties index 75a4eac..5296298 100644 --- a/xyo-android-library/version.properties +++ b/xyo-android-library/version.properties @@ -1,2 +1,2 @@ -#Thu Feb 20 17:55:43 UTC 2020 +#Thu Feb 20 18:37:16 UTC 2020 VERSION_PATCH=25 From b8e3c6498c4aa76e9335072ded7249cf798c3560 Mon Sep 17 00:00:00 2001 From: pllearns Date: Thu, 20 Feb 2020 10:44:01 -0800 Subject: [PATCH 7/8] change command to initiate bump --- .github/workflows/ci.yml | 2 +- xyo-android-library/build.gradle | 2 +- xyo-android-library/version.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4c79549..a023081 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: - name: pre-build run: chmod +x ./gradlew - name: build - run: ./gradlew :xyo-android-library:clean assemble + run: ./gradlew :xyo-android-library:assemble - name: check in local changes run: | git status diff --git a/xyo-android-library/build.gradle b/xyo-android-library/build.gradle index bc744b2..837ecd7 100644 --- a/xyo-android-library/build.gradle +++ b/xyo-android-library/build.gradle @@ -35,7 +35,7 @@ def increment = 0 def runTasks = gradle.startParameter.taskNames -if (':xyo-android-library:clean assemble' in runTasks) { +if (':xyo-android-library:assemble' in runTasks) { increment = 1 } diff --git a/xyo-android-library/version.properties b/xyo-android-library/version.properties index 75a4eac..3e5ab97 100644 --- a/xyo-android-library/version.properties +++ b/xyo-android-library/version.properties @@ -1,2 +1,2 @@ -#Thu Feb 20 17:55:43 UTC 2020 +#Thu Feb 20 10:43:08 PST 2020 VERSION_PATCH=25 From 23491cc8cffb73f96bfcd9a9b49ee50a974a75b7 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 20 Feb 2020 18:47:00 +0000 Subject: [PATCH 8/8] version bump --- xyo-android-library/version.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xyo-android-library/version.properties b/xyo-android-library/version.properties index 5296298..2fd7f59 100644 --- a/xyo-android-library/version.properties +++ b/xyo-android-library/version.properties @@ -1,2 +1,2 @@ -#Thu Feb 20 18:37:16 UTC 2020 -VERSION_PATCH=25 +#Thu Feb 20 18:46:05 UTC 2020 +VERSION_PATCH=26