Skip to content

Commit 4350abf

Browse files
authored
fix(workflow): 🐛 fixed issue of empty version while releasing pre-release version (#157)
1 parent 6c9e3f4 commit 4350abf

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

.github/workflows/pre-release.yml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ jobs:
2323

2424
outputs:
2525
new-version: ${{ steps.version.outputs.version }}
26-
previous-version: ${{ steps.version.outputs.previous_version }}
2726

2827
steps:
2928
- name: Check out Git repository
@@ -38,12 +37,6 @@ jobs:
3837
- name: Install dependencies
3938
run: yarn install
4039

41-
- name: Get the previous release version
42-
id: old_version
43-
run: |
44-
export MVN_OLD_VERSION=$(node -pe "require('./package.json').version")
45-
echo "::set-output name=previous_version::$MVN_OLD_VERSION"
46-
4740
- name: Update pre-release version
4841
run: yarn prerelease
4942

@@ -53,7 +46,7 @@ jobs:
5346
export MVN_VERSION=$(node -pe "require('./website/package.json').version")
5447
echo "::set-output name=version::$MVN_VERSION"
5548
56-
- name: Upload updated package.json to artifacts
49+
- name: Upload updated version related files to artifacts
5750
uses: actions/upload-artifact@v3
5851
with:
5952
name: target
@@ -65,7 +58,7 @@ jobs:
6558
pre-release-snapshot:
6659
runs-on: ubuntu-latest
6760
needs: prepare-pre-release
68-
61+
if: needs.prepare-pre-release.outputs.new-version != null
6962
steps:
7063
- name: Check out Git repository
7164
uses: actions/checkout@v3
@@ -94,7 +87,7 @@ jobs:
9487
name: target
9588

9689
- name: Maven command to update snapshot version
97-
run: mvn build-helper:parse-version versions:set -f core-java/pom.xml -DnewVersion=${{ needs.prepare-release.outputs.new-version }}-SNAPSHOT versions:commit
90+
run: mvn build-helper:parse-version versions:set -f core-java/pom.xml -DnewVersion=${{ needs.prepare-pre-release.outputs.new-version }}-SNAPSHOT versions:commit
9891

9992
- name: Build the artifacts
10093
run: mvn clean install -f core-java/pom.xml -DskipTests -Dcheckstyle.skip
@@ -153,7 +146,7 @@ jobs:
153146
name: target
154147

155148
- name: Maven command to update pre-release version
156-
run: mvn build-helper:parse-version versions:set -f core-java/pom.xml -DnewVersion=${{ needs.prepare-release.outputs.new-version }} versions:commit
149+
run: mvn build-helper:parse-version versions:set -f core-java/pom.xml -DnewVersion=${{ needs.prepare-pre-release.outputs.new-version }} versions:commit
157150

158151
- name: Build the artifacts
159152
run: mvn clean install -f core-java/pom.xml -DskipTests -Dcheckstyle.skip
@@ -234,7 +227,7 @@ jobs:
234227
- name: Create and Push Tag
235228
uses: EndBug/add-and-commit@v9
236229
with:
237-
tag: v${{ needs.prepare-release.outputs.new-version }}
230+
tag: v${{ needs.prepare-pre-release.outputs.new-version }}
238231
message: 🎉 Pre-release released to Maven central [skip ci]
239232
default_author: user_info
240233
push: true

.github/workflows/release.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,11 @@ jobs:
5353
echo "::set-output name=version::$MVN_VERSION"
5454
5555
- name: Generate Change log
56+
if: steps.version.outputs.version != null
5657
run: |
5758
yarn changelog --from ${{ steps.old_version.outputs.previous_version }} --next-version v${{ steps.version.outputs.version }} > CHANGELOG.md
5859
59-
- name: Upload updated package.json to artifacts
60+
- name: Upload updated version related files to artifacts
6061
uses: actions/upload-artifact@v3
6162
with:
6263
name: target
@@ -69,7 +70,7 @@ jobs:
6970
release-snapshot:
7071
runs-on: ubuntu-latest
7172
needs: prepare-release
72-
73+
if: needs.prepare-release.outputs.new-version != null
7374
steps:
7475
- name: Check out Git repository
7576
uses: actions/checkout@v3

0 commit comments

Comments
 (0)