Skip to content

Commit 2f12698

Browse files
authored
Merge pull request #75 from bsospace/development
development
2 parents 0d7fadc + a695fed commit 2f12698

3 files changed

Lines changed: 4 additions & 8 deletions

File tree

.github/workflows/bump-and-release.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,11 @@ jobs:
7575
echo "No tags found. Defaulting to v0.0.0"
7676
CURRENT_VERSION="0.0.0"
7777
else
78-
echo "Found latest tag: $LATEST_TAG"
79-
80-
# --- จุดที่แก้ไข (เพิ่ม ; then) ---
8178
if [ "$same_tag" == "false" ]; then
8279
CURRENT_VERSION="${LATEST_TAG_DAV#v}"
8380
else
8481
CURRENT_VERSION="${LATEST_TAG#v}"
8582
fi
86-
# -----------------------------
8783
fi
8884
8985
echo "version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
@@ -114,7 +110,7 @@ jobs:
114110
115111
# === DEVELOPMENT ===
116112
elif [ "$TARGET_BRANCH" == "development" ]; then
117-
if [[ "$CURRENT_VERSION" == *"-dev."* && "$SAME_TAG" == "true" ]]; then
113+
if [[ "$SOURCE_BRANCH" == feat/* && "$SAME_TAG" == "true" ]]; then
118114
NEW_VERSION="$MAJOR.$((MINOR + 1)).0-dev.1"
119115
elif [[ "$CURRENT_VERSION" == *"-dev."* || "$SOURCE_BRANCH" == "main" ]]; then
120116
LAST_NUM=${CURRENT_VERSION##*.}

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "version-bump",
3-
"version": "0.11.0",
3+
"version": "0.12.0-dev.1",
44
"description": "",
55
"main": "index.js",
66
"scripts": {

0 commit comments

Comments
 (0)