Skip to content

Commit 780a717

Browse files
authored
Merge branch 'development' into chore/bump-version-1.9.2
2 parents 7a3c365 + 0d7297e commit 780a717

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

‎.github/workflows/back-merge-pr.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
- name: Open back-merge PR if needed
2727
env:
2828
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
29+
REPO: ${{ github.repository }}
2930
run: |
3031
set -euo pipefail
3132
git fetch origin development master
@@ -38,7 +39,7 @@ jobs:
3839
exit 0
3940
fi
4041
41-
EXISTING=$(gh pr list --repo "${{ github.repository }}" \
42+
EXISTING=$(gh pr list --repo "$REPO" \
4243
--base development \
4344
--head master \
4445
--state open \
@@ -50,7 +51,7 @@ jobs:
5051
exit 0
5152
fi
5253
53-
gh pr create --repo "${{ github.repository }}" \
54+
gh pr create --repo "$REPO" \
5455
--base development \
5556
--head master \
5657
--title "chore: back-merge master into development" \

‎.github/workflows/check-version-bump.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ jobs:
1414
fetch-depth: 0
1515
- name: Validate version and changelog updates
1616
shell: bash
17+
env:
18+
BASE_SHA: ${{ github.event.pull_request.base.sha }}
19+
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
1720
run: |
1821
set -euo pipefail
1922
2023
VERSION_FILE="package.json"
2124
CHANGELOG_FILE="CHANGELOG.md"
22-
BASE_SHA="${{ github.event.pull_request.base.sha }}"
23-
HEAD_SHA="${{ github.event.pull_request.head.sha }}"
2425
2526
mapfile -t CHANGED_FILES < <(git diff --name-only "$BASE_SHA" "$HEAD_SHA")
2627
if [ "${#CHANGED_FILES[@]}" -eq 0 ]; then

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ jobs:
3333
- name: Update npm
3434
run: npm install -g npm@latest
3535
- name: Release
36-
run: npm publish --access public --tag ${{ github.event.release.prerelease && 'beta' || 'latest' }}
36+
env:
37+
NPM_TAG: ${{ github.event.release.prerelease && 'beta' || 'latest' }}
38+
run: npm publish --access public --tag "$NPM_TAG"
3739

3840
publish-github:
3941
if: ${{ startsWith(github.event.release.tag_name, 'v') && !github.event.release.draft }}
@@ -64,6 +66,7 @@ jobs:
6466
- name: Update npm
6567
run: npm install -g npm@latest
6668
- name: Release
67-
run: npm publish --access public --tag ${{ github.event.release.prerelease && 'beta' || 'latest' }}
69+
run: npm publish --access public --tag "$NPM_TAG"
6870
env:
71+
NPM_TAG: ${{ github.event.release.prerelease && 'beta' || 'latest' }}
6972
NODE_AUTH_TOKEN: ${{ github.token }}

0 commit comments

Comments
 (0)