Skip to content

Commit df78f8f

Browse files
committed
Merge branch 'main' of github.com:gfrancine/p5.js into main
2 parents bd946bd + dfa707e commit df78f8f

4 files changed

Lines changed: 22 additions & 14 deletions

File tree

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: New p5.js release
1+
name: New p5.js v1 release
22
# Requires secrets `NPM_TOKEN` and `ACCESS_TOKEN` to be set
33

44
permissions:
@@ -23,12 +23,16 @@ jobs:
2323
persist-credentials: false
2424
- uses: actions/setup-node@3235b876344d2a9aa001b8d1453c930bba69e610 # v3
2525
with:
26-
node-version: 22
27-
- name: Get semver info
26+
node-version: 22 # Keep at 22 purposefully for v1
27+
- name: Check prerelease
2828
id: semver
29-
uses: akshens/semver-tag@8e427cd48c699c97d021df4946f3a0e65af5047e # v4
30-
with:
31-
version: ${{ github.ref_name }}
29+
shell: bash
30+
run: |
31+
if [[ "${{ github.ref_name }}" == *"-rc"* ]]; then
32+
echo "is-prerelease=true" >> $GITHUB_OUTPUT
33+
else
34+
echo "is-prerelease=false" >> $GITHUB_OUTPUT
35+
fi
3236
3337
- name: Get version number
3438
id: version-number
@@ -110,7 +114,7 @@ jobs:
110114
uses: ad-m/github-push-action@40bf560936a8022e68a3c00e7d2abefaf01305a6 # v0.6.0
111115
with:
112116
github_token: ${{ secrets.ACCESS_TOKEN }}
113-
branch: main
117+
branch: v1
114118
directory: website/
115119
repository: processing/p5.js-website
116120

.github/workflows/release-workflow-v2.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,15 @@ jobs:
2424
- uses: actions/setup-node@3235b876344d2a9aa001b8d1453c930bba69e610 # v3
2525
with:
2626
node-version: 22
27-
- name: Get semver info
27+
- name: Check prerelease
2828
id: semver
29-
uses: akshens/semver-tag@8e427cd48c699c97d021df4946f3a0e65af5047e # v4
30-
with:
31-
version: ${{ github.ref_name }}
29+
shell: bash
30+
run: |
31+
if [[ "${{ github.ref_name }}" == *"-rc"* ]]; then
32+
echo "is-prerelease=true" >> $GITHUB_OUTPUT
33+
else
34+
echo "is-prerelease=false" >> $GITHUB_OUTPUT
35+
fi
3236
3337
- name: Get version number
3438
id: version-number

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
@@ -20,7 +20,7 @@
2020
"test/**/*.js": "eslint",
2121
"utils/**/*.{js,mjs}": "eslint"
2222
},
23-
"version": "2.3.0",
23+
"version": "2.3.1-rc.1",
2424
"dependencies": {
2525
"@davepagurek/bezier-path": "^0.0.7",
2626
"@japont/unicode-range": "^1.0.0",

0 commit comments

Comments
 (0)