Skip to content

Commit a311792

Browse files
committed
Update GHA too
1 parent 128f8e8 commit a311792

File tree

4 files changed

+31
-42
lines changed

4 files changed

+31
-42
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,29 @@ jobs:
88
Format:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3
12-
- uses: actions/setup-node@v3
11+
- uses: actions/checkout@v4
12+
- uses: actions/setup-node@v4
1313
with:
14-
node-version-file: .nvmrc
14+
node-version-file: package.json
1515
- run: npm ci
1616
- run: npx prettier . --check
1717

1818
Lint:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v3
22-
- uses: actions/setup-node@v3
21+
- uses: actions/checkout@v4
22+
- uses: actions/setup-node@v4
2323
with:
24-
node-version-file: .nvmrc
24+
node-version-file: package.json
2525
- run: npm ci
2626
- run: npm run lint
2727

2828
Build:
2929
runs-on: ubuntu-latest
3030
steps:
31-
- uses: actions/checkout@v3
32-
- uses: actions/setup-node@v3
31+
- uses: actions/checkout@v4
32+
- uses: actions/setup-node@v4
3333
with:
34-
node-version-file: .nvmrc
34+
node-version-file: package.json
3535
- run: npm ci
3636
- run: npm run build

.github/workflows/release.yml

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ env:
44

55
# FILE GENERATED WITH: npx ghat fregante/ghatemplates/webext
66
# SOURCE: https://github.com/fregante/ghatemplates
7-
# OPTIONS: {"exclude":["on.schedule"],"set":["jobs.Submit.strategy.matrix.command=[\"Chrome\"]"]}
7+
# OPTIONS: {"exclude":["jobs.Firefox"]}
88

99
name: Release
1010
on:
@@ -15,10 +15,10 @@ jobs:
1515
created: ${{ env.DAILY_VERSION_CREATED }}
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v3
19-
- uses: actions/setup-node@v3
18+
- uses: actions/checkout@v4
19+
- uses: actions/setup-node@v4
2020
with:
21-
node-version-file: .nvmrc
21+
node-version-file: package.json
2222
cache: npm
2323
- run: npm ci
2424
- name: Test and build
@@ -30,7 +30,7 @@ jobs:
3030
run: npx dot-json@1 "$DIRECTORY/manifest.json" version "$DAILY_VERSION"
3131
- name: Ready for "submit" jobs
3232
if: env.DAILY_VERSION_CREATED
33-
uses: actions/upload-artifact@v3
33+
uses: actions/upload-artifact@v4
3434
with:
3535
path: ${{ env.DIRECTORY }}
3636
- name: Create release
@@ -42,29 +42,16 @@ jobs:
4242
FILENAME="$PROJECT_NAME-$DAILY_VERSION-for-local-testing-only.zip"
4343
zip -r "$FILENAME" ./*
4444
gh release create "$DAILY_VERSION" --generate-notes "$FILENAME"
45-
Submit:
46-
needs: Version
45+
Chrome:
4746
if: needs.Version.outputs.created
48-
strategy:
49-
fail-fast: false
50-
matrix:
51-
command:
52-
- Chrome
53-
environment: ${{ matrix.command }}
47+
needs: Version
48+
name: Submit (Chrome)
49+
environment: Chrome
5450
runs-on: ubuntu-latest
5551
steps:
56-
- uses: actions/download-artifact@v3
57-
- name: Submit to Mozilla
58-
if: matrix.command == 'Firefox'
59-
working-directory: artifact
60-
run: npx web-ext-submit@7
61-
env:
62-
WEB_EXT_API_KEY: ${{ secrets.WEB_EXT_API_KEY }}
63-
WEB_EXT_API_SECRET: ${{ secrets.WEB_EXT_API_SECRET }}
64-
- name: Submit to Google
65-
if: matrix.command == 'Chrome'
52+
- uses: actions/download-artifact@v4
53+
- run: npx chrome-webstore-upload-cli@3
6654
working-directory: artifact
67-
run: npx chrome-webstore-upload-cli@2 upload --auto-publish
6855
env:
6956
EXTENSION_ID: ${{ secrets.EXTENSION_ID }}
7057
CLIENT_ID: ${{ secrets.CLIENT_ID }}

.nvmrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

package.json

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"private": true,
3+
"type": "module",
34
"scripts": {
45
"build": "rollup --config",
56
"fix": "run-p 'lint:* -- --fix' format",
@@ -11,7 +12,6 @@
1112
"watch": "rollup --config --watch",
1213
"prepare": "husky install"
1314
},
14-
"type": "module",
1515
"eslintConfig": {
1616
"env": {
1717
"browser": true,
@@ -27,10 +27,10 @@
2727
"prettier"
2828
],
2929
"rules": {
30-
"unicorn/prefer-top-level-await": "off",
30+
"no-bitwise": "off",
3131
"no-inner-declarations": "off",
3232
"no-new": "off",
33-
"no-bitwise": "off"
33+
"unicorn/prefer-top-level-await": "off"
3434
},
3535
"overrides": [
3636
{
@@ -47,6 +47,11 @@
4747
"stylelint-config-prettier"
4848
]
4949
},
50+
"dependencies": {
51+
"webext-base-css": "^1.4.4",
52+
"webext-options-sync": "^4.2.3",
53+
"webext-polyfill-kinda": "^1.0.2"
54+
},
5055
"devDependencies": {
5156
"@rollup/plugin-commonjs": "^26.0.1",
5257
"@rollup/plugin-node-resolve": "^15.2.3",
@@ -70,17 +75,15 @@
7075
"svelte": "^4.2.18",
7176
"svelte-eslint-parser": "^0.40.0"
7277
},
78+
"engines": {
79+
"node": ">=22"
80+
},
7381
"webExt": {
7482
"sourceDir": "distribution",
7583
"run": {
7684
"target": [
7785
"chromium"
7886
]
7987
}
80-
},
81-
"dependencies": {
82-
"webext-base-css": "^1.4.4",
83-
"webext-options-sync": "^4.2.3",
84-
"webext-polyfill-kinda": "^1.0.2"
8588
}
8689
}

0 commit comments

Comments
 (0)