Skip to content

Commit 81e7823

Browse files
authored
Merge branch 'main' into profileEditA11y
2 parents a1bf91f + 29f025d commit 81e7823

File tree

5 files changed

+675
-179
lines changed

5 files changed

+675
-179
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
strategy:
1616
matrix:
17-
node-version: [20, 22]
17+
node-version: [22, 24]
1818
steps:
1919
- uses: actions/checkout@v6
2020
- name: Use Node.js ${{ matrix.node-version }}
@@ -26,7 +26,7 @@ jobs:
2626
- run: npm run build
2727
- run: npm run doc
2828
- name: Save build
29-
if: matrix.node-version == 20
29+
if: matrix.node-version == 22
3030
uses: actions/upload-artifact@v7
3131
with:
3232
name: build
@@ -63,33 +63,14 @@ jobs:
6363
PR_URL: ${{github.event.pull_request.html_url}}
6464
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
6565

66-
npm-publish-build:
66+
npm-publish-dev:
6767
needs: build
68-
runs-on: ubuntu-latest
69-
permissions:
70-
id-token: write # Required for OIDC
71-
contents: read
72-
steps:
73-
- uses: actions/download-artifact@v8
74-
with:
75-
name: build
76-
- uses: actions/setup-node@v6
77-
with:
78-
node-version: 20
79-
registry-url: 'https://registry.npmjs.org'
80-
- name: Update npm to latest (required for OIDC)
81-
run: npm install -g npm@latest
82-
- uses: rlespinasse/github-slug-action@v4.x
83-
- name: Append commit hash to package version
84-
run: 'sed -i -E "s/(\"version\": *\"[^\"]+)/\1-${GITHUB_SHA_SHORT}/" package.json'
85-
- name: Disable pre- and post-publish actions
86-
run: 'sed -i -E "s/\"((pre|post)publish)/\"ignore:\1/" package.json'
87-
- name: Publish to npm
88-
if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]'
89-
run: npm publish --tag ${{ env.GITHUB_REF_SLUG }}
90-
68+
uses: SolidOS/solidos/.github/workflows/publish-prerelease.yml@main
69+
with:
70+
node_version: 22
71+
9172
npm-publish-latest:
92-
needs: [build, npm-publish-build]
73+
needs: [build]
9374
runs-on: ubuntu-latest
9475
if: github.ref == 'refs/heads/main'
9576
permissions:
@@ -101,7 +82,7 @@ jobs:
10182
name: build
10283
- uses: actions/setup-node@v6
10384
with:
104-
node-version: 20
85+
node-version: 22
10586
registry-url: 'https://registry.npmjs.org'
10687
- name: Update npm to latest (required for OIDC)
10788
run: npm install -g npm@latest

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v20.19.2
1+
v22.22.0

0 commit comments

Comments
 (0)