Skip to content

Commit

Permalink
Merge pull request #124 from XYOracleNetwork/develop
Browse files Browse the repository at this point in the history
Gradle updates for auto semantic versioning
  • Loading branch information
Phillip Lorenzo authored Feb 20, 2020
2 parents c4293f0 + 23491cc commit 1c42929
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 9 deletions.
20 changes: 17 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: CI

on:
push:
branches-ignore:
- 'master'
branches:
- 'develop'

jobs:
build:
Expand All @@ -14,4 +14,18 @@ jobs:
- name: pre-build
run: chmod +x ./gradlew
- name: build
run: ./gradlew clean assemble
run: ./gradlew :xyo-android-library:assemble
- name: check in local changes
run: |
git status
git add xyo-android-library/version.properties
- name: commit file
run: |
git config --local user.email "[email protected]"
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'
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -38,7 +38,7 @@ Including BLE, TCP/IP, Bound Witnessing, and Bridging. 
<dependency>
<groupId>network.xyo</groupId>
<artifactId>sdk-xyo-android</artifactId>
<version>3.1.25</version>
<version>3.1.26</version>
<type>pom</type>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion xyo-android-library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def increment = 0

def runTasks = gradle.startParameter.taskNames

if (':xyo-android-library:assembleRelease' in runTasks) {
if (':xyo-android-library:assemble' in runTasks) {
increment = 1
}

Expand Down
4 changes: 2 additions & 2 deletions xyo-android-library/version.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#Wed Feb 19 15:50:42 PST 2020
VERSION_PATCH=24
#Thu Feb 20 18:46:05 UTC 2020
VERSION_PATCH=26

0 comments on commit 1c42929

Please sign in to comment.