Skip to content

Commit d615163

Browse files
committed
Merge remote-tracking branch 'makenew/master'
2 parents 8607da5 + 11121cd commit d615163

File tree

11 files changed

+1786
-1973
lines changed

11 files changed

+1786
-1973
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG VARIANT="16"
1+
ARG VARIANT="18"
22

33
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:${VARIANT}
44

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"build": {
44
"dockerfile": "Dockerfile",
55
"args": {
6-
"VARIANT": "16"
6+
"VARIANT": "18"
77
}
88
},
99
"extensions": [

.github/actions/setup/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ inputs:
66
node_version:
77
description: The Node.js version.
88
required: false
9-
default: '16'
9+
default: '18'
1010
registry_url:
1111
description: The Node.js package registry URL.
1212
required: false
@@ -16,7 +16,7 @@ runs:
1616
using: composite
1717
steps:
1818
- name: Setup Node.js
19-
uses: actions/setup-node@v2
19+
uses: actions/setup-node@v3
2020
with:
2121
cache: npm
2222
node-version: ${{ inputs.node_version }}

.github/workflows/format.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ on:
1212

1313
jobs:
1414
fix:
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-latest
1616
timeout-minutes: 30
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v3
2020
with:
2121
ref: ${{ github.head_ref }}
2222
token: ${{ secrets.GH_TOKEN }}
2323
- name: Import GPG key
24-
uses: crazy-max/ghaction-import-gpg@v4
24+
uses: crazy-max/ghaction-import-gpg@v5
2525
with:
2626
git_user_signingkey: true
2727
git_commit_gpgsign: true

.github/workflows/main.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,35 @@ on:
88

99
jobs:
1010
test:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-latest
1212
timeout-minutes: 30
1313
strategy:
1414
matrix:
1515
node:
1616
- '14'
1717
- '16'
18+
- '18'
1819
steps:
1920
- name: Checkout
20-
uses: actions/checkout@v2
21+
uses: actions/checkout@v3
2122
- name: Setup
2223
uses: ./.github/actions/setup
2324
with:
2425
node_version: ${{ matrix.node }}
2526
- name: Test
2627
run: npm test
2728
lint:
28-
runs-on: ubuntu-20.04
29+
runs-on: ubuntu-latest
2930
timeout-minutes: 30
3031
strategy:
3132
matrix:
3233
node:
3334
- '14'
3435
- '16'
36+
- '18'
3537
steps:
3638
- name: Checkout
37-
uses: actions/checkout@v2
39+
uses: actions/checkout@v3
3840
- name: Setup
3941
uses: ./.github/actions/setup
4042
with:

.github/workflows/publish.yml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ on:
88

99
jobs:
1010
npm:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-latest
1212
timeout-minutes: 30
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v3
1616
- name: Setup
1717
uses: ./.github/actions/setup
1818
- name: Publish
@@ -21,25 +21,13 @@ jobs:
2121
access: public
2222
token: ${{ secrets.NPM_TOKEN }}
2323
docs:
24-
runs-on: ubuntu-20.04
24+
runs-on: ubuntu-latest
2525
timeout-minutes: 30
2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@v2
28+
uses: actions/checkout@v3
2929
with:
3030
persist-credentials: false
31-
- name: Setup Git config
32-
env:
33-
GH_USER: ${{ secrets.GH_USER }}
34-
GH_TOKEN: ${{ secrets.GH_TOKEN }}
35-
GIT_USER_NAME: ${{ secrets.GIT_USER_NAME }}
36-
GIT_USER_EMAIL: ${{ secrets.GIT_USER_EMAIL }}
37-
GIT_COMMITTER_EMAIL: ${{ secrets.GIT_USER_EMAIL }}
38-
run: |
39-
git remote set-url --push origin "https://${GH_USER}:${GH_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
40-
git config user.name "$GIT_USER_NAME"
41-
git config user.email "$GIT_USER_EMAIL"
42-
npm config set sign-git-tag true
4331
- name: Import GPG key
4432
uses: crazy-max/ghaction-import-gpg@v3
4533
id: import_gpg

.github/workflows/version.yml

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

4+
run-name: ${{ github.event.inputs.version }}${{ github.event.client_payload.version }}
5+
46
on:
57
workflow_dispatch:
68
inputs:
@@ -12,26 +14,15 @@ on:
1214

1315
jobs:
1416
release:
15-
runs-on: ubuntu-20.04
17+
runs-on: ubuntu-latest
1618
timeout-minutes: 30
1719
steps:
1820
- name: Checkout
19-
uses: actions/checkout@v2
21+
uses: actions/checkout@v3
2022
with:
21-
persist-credentials: false
22-
- name: Setup Git config
23-
env:
24-
GH_USER: ${{ secrets.GH_USER }}
25-
GH_TOKEN: ${{ secrets.GH_TOKEN }}
26-
GIT_USER_NAME: ${{ secrets.GIT_USER_NAME }}
27-
GIT_USER_EMAIL: ${{ secrets.GIT_USER_EMAIL }}
28-
GIT_COMMITTER_EMAIL: ${{ secrets.GIT_USER_EMAIL }}
29-
run: |
30-
git remote set-url --push origin "https://${GH_USER}:${GH_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
31-
git config user.name "$GIT_USER_NAME"
32-
git config user.email "$GIT_USER_EMAIL"
23+
token: ${{ secrets.GH_TOKEN }}
3324
- name: Import GPG key
34-
uses: crazy-max/ghaction-import-gpg@v4
25+
uses: crazy-max/ghaction-import-gpg@v5
3526
with:
3627
git_user_signingkey: true
3728
git_commit_gpgsign: true

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
lts/gallium
1+
lts/hydrogen

README.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,7 @@ $ npm install
243243
Use the [`npm version`][npm-version] command to release a new version.
244244
This will push a new git tag which will trigger a GitHub action.
245245
246-
Publishing may be triggered using on the web
247-
using a [workflow_dispatch on GitHub Actions].
246+
Publishing may be triggered using a [workflow_dispatch on GitHub Actions].
248247
249248
[npm-version]: https://docs.npmjs.com/cli/version
250249
[workflow_dispatch on GitHub Actions]: https://github.com/razor-x/blobpack/actions?query=workflow%3Aversion
@@ -256,7 +255,15 @@ _GitHub Actions should already be configured: this section is for reference only
256255
The following repository secrets must be set on [GitHub Actions]:
257256
258257
- `NPM_TOKEN`: npm token for installing and publishing packages.
259-
- `GH_USER`: The GitHub user's username.
258+
259+
These must be set manually.
260+
261+
### Secrets for Optional GitHub Actions
262+
263+
The version and format GitHub actions
264+
require a user with write access to the repository.
265+
Set these additional secrets to enable the action:
266+
260267
- `GH_TOKEN`: A personal access token for the user.
261268
- `GIT_USER_NAME`: The GitHub user's real name.
262269
- `GIT_USER_EMAIL`: The GitHub user's email.

0 commit comments

Comments
 (0)