Skip to content

Commit

Permalink
Merge branch 'release/5.1.7'
Browse files Browse the repository at this point in the history
  • Loading branch information
JesusHdez960717 committed Jul 24, 2024
2 parents 6a9c855 + 29928a9 commit ccba3a4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 16 deletions.
19 changes: 4 additions & 15 deletions .github/workflows/build-and-publish_library.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Build and Publish Library

on:
pull_request:
types: [ closed ]
branches: [ develop, master ]
push:
branches:
- master

permissions:
contents: write
Expand Down Expand Up @@ -88,24 +88,13 @@ jobs:
- name: Determine version
id: determine_version
run: |
if [[ "${{ github.base_ref }}" == "develop" ]]; then
LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
MAJOR=$(echo $LAST_TAG | cut -d. -f1)
MINOR=$(echo $LAST_TAG | cut -d. -f2)
PATCH=$(echo $LAST_TAG | cut -d. -f3)
NEW_VERSION="${MAJOR}.${MINOR}.$((PATCH + 1))"
echo "version=${NEW_VERSION}-SNAPSHOT" >> $GITHUB_OUTPUT
echo "env=development" >> $GITHUB_OUTPUT
elif [[ "${{ github.base_ref }}" == "master" ]]; then
LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
VERSION=${LAST_TAG#v}
MAJOR=$(echo $VERSION | cut -d. -f1)
MINOR=$(echo $VERSION | cut -d. -f2)
PATCH=$(echo $VERSION | cut -d. -f3)
NEW_VERSION="${MAJOR}.${MINOR}.$((PATCH + 1))"
echo "version=${NEW_VERSION}" >> $GITHUB_OUTPUT
echo "env=production" >> $GITHUB_OUTPUT
fi
echo "env=prod" >> $GITHUB_OUTPUT
- name: Display version
run: |
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* 5.1.7:
* **PACKAGE** :sparkler: : Fix build workflow

* 5.1.6.RELEASE.20240724:
* **PACKAGE** :sparkler: : Fix build workflow

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
}

group = 'dev.root101.commons'
version = '5.1.6.RELEASE.20240724'
version = '5.1.7'

def environment = System.getenv('ENVIRONMENT') ?: 'prod'

Expand Down

0 comments on commit ccba3a4

Please sign in to comment.