Skip to content

Commit 0978688

Browse files
authored
Merge pull request #412 from traPtitech/use-oidc-to-npm-publish
2 parents fb4e487 + 15b3606 commit 0978688

1 file changed

Lines changed: 12 additions & 5 deletions

File tree

.github/workflows/release.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
permissions:
1414
contents: write
15+
id-token: write
1516
steps:
1617
- name: checkout
1718
uses: actions/checkout@v5
@@ -21,14 +22,21 @@ jobs:
2122
node-version-file: "package.json"
2223
cache: "npm"
2324
registry-url: "https://registry.npmjs.org"
25+
26+
# TODO: temporary workaround
27+
# Trusted publishing requires npm CLI version 11.5.1 or later.
28+
# see: https://docs.npmjs.com/trusted-publishers
29+
- name: update npm
30+
run: npm install -g npm@latest
31+
2432
- name: npm ci
2533
run: npm ci
2634
- name: build
2735
run: npm run build
2836
- name: Check diff
2937
run: |
30-
OLD_SHASUM=`npm view | grep -oP "(?<=^\.shasum: ).+(?=$)" | sed "s/$(echo -e '\e')\[[0-9][0-9]m//g"`
31-
NEW_SHASUM=`npm pack --dry-run 2>&1 >/dev/null | grep -oP "(?<=shasum: ).+(?=$)" | sed "s/^ *//"`
38+
OLD_SHASUM=`npm view --json | jq -r '.dist.shasum'`
39+
NEW_SHASUM=`npm pack --dry-run --json | jq -r '.[0].shasum'`
3240
3341
echo "OLD: ${OLD_SHASUM}"
3442
echo "NEW: ${NEW_SHASUM}"
@@ -41,10 +49,10 @@ jobs:
4149
- name: Set version name
4250
if: env.HAS_DIFF == 'true'
4351
run: |
44-
TRAQ_VERSION=$(curl -sS https://api.github.com/repos/traPtitech/traQ/tags | jq '.[0].name' | sed -n s/[\"v]//pg)
52+
TRAQ_VERSION=$(curl -sS https://api.github.com/repos/traPtitech/traQ/tags | jq -r '.[0].name' | sed -n 's/v//pg')
4553
echo "TRAQ ${TRAQ_VERSION}"
4654
47-
VERSION=$(cat ./package.json | jq .version | sed -n s/\"//pg | sed -n s/-/./p)
55+
VERSION=$(cat ./package.json | jq -r .version | sed -n 's/-/./p')
4856
echo "PACKAGE ${VERSION}"
4957
VERSION_ARR=($(echo $VERSION | tr -s '.' ' '))
5058
VERSION_SHORT=${VERSION_ARR[0]}.${VERSION_ARR[1]}.${VERSION_ARR[2]}
@@ -70,5 +78,4 @@ jobs:
7078
git push --tags
7179
npm publish --access public
7280
env:
73-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
7481
NEW_VERSION: ${{ env.NEW_VERSION }}

0 commit comments

Comments
 (0)