Skip to content

Commit 6ab9bc7

Browse files
authored
Merge branch 'main' into digg
2 parents d71fa97 + 1b396e1 commit 6ab9bc7

File tree

2 files changed

+23
-19
lines changed

2 files changed

+23
-19
lines changed

.github/workflows/ci.yml

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
name: CI
2-
permissions:
3-
contents: write
4-
pull-requests: write
2+
53
on:
64
push:
75
branches:
@@ -16,9 +14,7 @@ jobs:
1614
runs-on: ubuntu-latest
1715
strategy:
1816
matrix:
19-
node-version:
20-
- 20.x
21-
- 22.x
17+
node-version: [20, 22]
2218
steps:
2319
- uses: actions/checkout@v6
2420
- name: Use Node.js ${{ matrix.node-version }}
@@ -30,7 +26,7 @@ jobs:
3026
- run: npm run build
3127
- run: npm run doc
3228
- name: Save build
33-
if: matrix.node-version == '20.x'
29+
if: matrix.node-version == 20
3430
uses: actions/upload-artifact@v6
3531
with:
3632
name: build
@@ -67,39 +63,47 @@ jobs:
6763
npm-publish-build:
6864
needs: build
6965
runs-on: ubuntu-latest
66+
permissions:
67+
id-token: write # Required for OIDC
68+
contents: read
7069
steps:
7170
- uses: actions/download-artifact@v7
7271
with:
7372
name: build
7473
- uses: actions/setup-node@v6
7574
with:
76-
node-version: 20.x
75+
node-version: 20
76+
registry-url: 'https://registry.npmjs.org'
77+
- name: Update npm to latest (required for OIDC)
78+
run: npm install -g npm@latest
7779
- uses: rlespinasse/github-slug-action@v4.x
7880
- name: Append commit hash to package version
7981
run: 'sed -i -E "s/(\"version\": *\"[^\"]+)/\1-${GITHUB_SHA_SHORT}/" package.json'
8082
- name: Disable pre- and post-publish actions
8183
run: 'sed -i -E "s/\"((pre|post)publish)/\"ignore:\1/" package.json'
82-
- uses: JS-DevTools/npm-publish@v4.1.4
84+
- name: Publish to npm
8385
if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]'
84-
with:
85-
token: ${{ secrets.NPM_TOKEN }}
86-
tag: ${{ env.GITHUB_REF_SLUG }}
86+
run: npm publish --tag ${{ env.GITHUB_REF_SLUG }}
8787

8888
npm-publish-latest:
8989
needs: [build, npm-publish-build]
9090
runs-on: ubuntu-latest
9191
if: github.ref == 'refs/heads/main'
92+
permissions:
93+
id-token: write # Required for OIDC
94+
contents: read
9295
steps:
9396
- uses: actions/download-artifact@v7
9497
with:
9598
name: build
9699
- uses: actions/setup-node@v6
97100
with:
98-
node-version: 20.x
101+
node-version: 20
102+
registry-url: 'https://registry.npmjs.org'
103+
- name: Update npm to latest (required for OIDC)
104+
run: npm install -g npm@latest
99105
- name: Disable pre- and post-publish actions
100106
run: 'sed -i -E "s/\"((pre|post)publish)/\"ignore:\1/" package.json'
101-
- uses: JS-DevTools/npm-publish@v4.1.4
102-
if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]'
103-
with:
104-
token: ${{ secrets.NPM_TOKEN }}
105-
tag: latest
107+
- name: Publish to npm
108+
if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]'
109+
run: npm publish --tag latest

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
},
4343
"repository": {
4444
"type": "git",
45-
"url": "git+https://github.com/solidos/solid-ui.git"
45+
"url": "git+https://github.com/SolidOS/solid-ui.git"
4646
},
4747
"keywords": [
4848
"solid",

0 commit comments

Comments
 (0)