Skip to content

Commit 83629d8

Browse files
Update .github/workflows/release.yaml
Co-authored-by: Mickael Bourgois <35171168+BourgoisMickael@users.noreply.github.com>
1 parent c0dea69 commit 83629d8

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
run: |
3939
TAG_EXISTS=$(git tag -l "${{ inputs.tag }}")
4040
if [[ -n "$TAG_EXISTS" ]]; then
41-
echo "::error::The tag ${{ inputs.tag }} has already been released"
41+
echo "::error::The tag ${{ inputs.tag }} already exists"
4242
exit 1
4343
fi
4444
- name: Ensure version is properly set

.github/workflows/tests.yaml

+12-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
---
22
name: tests
33

4-
on:
5-
push:
6-
branches-ignore:
7-
- 'development/**'
4+
on: push
85

96
permissions:
107
packages: write
@@ -27,9 +24,17 @@ jobs:
2724
run: yarn lint_md
2825
- name: lint javascript
2926
run: yarn lint
30-
- name: Set development version
31-
run: yarn version --no-git-tag-version --new-version "0.0.0-sha.${{ github.sha }}"
27+
- name: Set common env vars for npm publish
28+
run: |
29+
echo "SHORTSHA=$(echo $GITHUB_SHA | cut -c1-7)" >> $GITHUB_ENV
30+
echo "PKG_VERSION=$(yarn -s run get-version)" >> $GITHUB_ENV
31+
- name: Set version for work in progress
32+
run: yarn version --no-git-tag-version --new-version "0.0.0-sha.${SHORTSHA}"
33+
if: !github.ref_protected
34+
- name: Set version for protected branch
35+
run: yarn version --no-git-tag-version --new-version "${PKG_VERSION}-sha.${SHORTSHA}"
36+
if: github.ref_protected
3237
- name: Publish development version
33-
run: npm publish --provenance
38+
run: npm publish --provenance --tag "${{ github.ref_name }}"
3439
env:
3540
NODE_AUTH_TOKEN: ${{ github.token }}

0 commit comments

Comments
 (0)