Skip to content

Commit 77ed82a

Browse files
authored
Merge branch 'main' into profileEditA11y
2 parents 2d694e9 + 7b68429 commit 77ed82a

4 files changed

Lines changed: 485 additions & 284 deletions

File tree

.github/workflows/ci.yml

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
strategy:
1919
matrix:
20-
node-version: [20, 22]
20+
node-version: [22, 24]
2121

2222
steps:
2323
- uses: actions/checkout@v6
@@ -30,8 +30,8 @@ jobs:
3030
- run: npm test
3131
- run: npm run build --if-present
3232
- name: Save build
33-
if: matrix.node-version == 20
34-
uses: actions/upload-artifact@v7
33+
if: matrix.node-version == 22
34+
uses: actions/upload-artifact@v6
3535
with:
3636
name: build
3737
path: |
@@ -54,33 +54,14 @@ jobs:
5454
PR_URL: ${{github.event.pull_request.html_url}}
5555
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
5656

57-
npm-publish-build:
58-
needs: build
59-
runs-on: ubuntu-latest
60-
permissions:
61-
id-token: write
62-
contents: read
63-
steps:
64-
- uses: actions/download-artifact@v8
65-
with:
66-
name: build
67-
- uses: actions/setup-node@v6
68-
with:
69-
node-version: 20
70-
registry-url: 'https://registry.npmjs.org'
71-
- name: Update npm to latest (required for OIDC)
72-
run: npm install -g npm@latest
73-
- uses: rlespinasse/github-slug-action@v3.x
74-
- name: Append commit hash to package version
75-
run: 'sed -i -E "s/(\"version\": *\"[^\"]+)/\1-${GITHUB_SHA_SHORT}/" package.json'
76-
- name: Disable pre- and post-publish actions
77-
run: 'sed -i -E "s/\"((pre|post)publish)/\"ignore:\1/" package.json'
78-
- name: Publish to npm
79-
if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]'
80-
run: npm publish --tag ${{ env.GITHUB_REF_SLUG }}
57+
npm-publish-dev:
58+
needs: build
59+
uses: SolidOS/solidos/.github/workflows/publish-prerelease.yml@main
60+
with:
61+
node_version: 22
8162

8263
npm-publish-latest:
83-
needs: [build, npm-publish-build]
64+
needs: [build]
8465
runs-on: ubuntu-latest
8566
if: github.ref == 'refs/heads/main'
8667
permissions:
@@ -92,7 +73,7 @@ jobs:
9273
name: build
9374
- uses: actions/setup-node@v6
9475
with:
95-
node-version: 20
76+
node-version: 22
9677
registry-url: 'https://registry.npmjs.org'
9778
- name: Update npm to latest (required for OIDC)
9879
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)