Skip to content

Commit 741f3c4

Browse files
authored
Setup OIDC (#185)
This PR sets up OIDC publishing by merging the workflows first
1 parent e1b609d commit 741f3c4

3 files changed

Lines changed: 18 additions & 49 deletions

File tree

.github/workflows/release-insiders.yml

Lines changed: 0 additions & 42 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: Release
22

33
on:
4+
push:
5+
branches: [main]
46
release:
57
types: [published]
68

@@ -14,7 +16,7 @@ jobs:
1416

1517
strategy:
1618
matrix:
17-
node-version: [22]
19+
node-version: [24]
1820

1921
steps:
2022
- uses: actions/checkout@v4
@@ -32,11 +34,20 @@ jobs:
3234
- name: Test
3335
run: npm test
3436

35-
- name: Calculate environment variables
37+
- name: Resolve release metadata
3638
run: |
37-
echo "RELEASE_CHANNEL=$(npm run release-channel --silent)" >> $GITHUB_ENV
39+
if [ "${{ github.event_name }}" = "release" ]; then
40+
echo "RELEASE_KIND=release" >> $GITHUB_ENV
41+
echo "RELEASE_CHANNEL=$(npm run release-channel --silent)" >> $GITHUB_ENV
42+
else
43+
echo "RELEASE_KIND=insiders" >> $GITHUB_ENV
44+
echo "INSIDERS_VERSION=0.0.0-insiders.$(git rev-parse --short HEAD)" >> $GITHUB_ENV
45+
echo "RELEASE_CHANNEL=insiders" >> $GITHUB_ENV
46+
fi
47+
48+
- name: Version based on commit
49+
if: env.RELEASE_KIND == 'insiders'
50+
run: npm version "$INSIDERS_VERSION" --force --no-git-tag-version
3851

3952
- name: Publish
40-
run: npm publish --provenance --tag ${{ env.RELEASE_CHANNEL }}
41-
env:
42-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
53+
run: npm publish --provenance --tag "$RELEASE_CHANNEL"

scripts/release-channel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
let version =
1111
process.argv[2] || process.env.npm_package_version || require('../package.json').version
1212

13-
let match = /\d+\.\d+\.\d+-(.*)\.\d+/g.exec(version)
13+
let match = /\d+\.\d+\.\d+-(.*)(\.\d+)?/g.exec(version)
1414
if (match) {
1515
console.log(match[1])
1616
} else {

0 commit comments

Comments
 (0)