Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Attempt to fix publishing workflow #3443

Merged
merged 4 commits into from
Sep 18, 2023
Merged

Attempt to fix publishing workflow #3443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd7fc18
Attempt to fix publishing workflow
remusao Sep 17, 2023
3b9bea8
Use .tool-versions to manage node version
chrmod Sep 18, 2023
294131b
Remove got and fix typescript setup
chrmod Sep 18, 2023
4558046
Update nodejs to 20.6.1
chrmod Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions .github/workflows/assets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,15 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Get yarn cache
id: yarn-cache
run: echo "::set-output name=dir::$(yarn cache dir)"

- uses: actions/cache@v3
- name: Use node
uses: actions/setup-node@v3
with:
path: ${{ steps.yarn-cache.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
cache: yarn
node-version-file: '.tool-versions'
registry-url: https://registry.npmjs.org

- name: Install dependencies
run: |
yarn bootstrap
- name: Bootstrap
run: yarn install --immutable

- name: Build
run: yarn build
Expand Down
16 changes: 6 additions & 10 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,15 @@ jobs:
git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
git fetch --prune --unshallow

- name: Get yarn cache
id: yarn-cache
run: echo "::set-output name=dir::$(yarn cache dir)"

- uses: actions/cache@v3
- name: Use node
uses: actions/setup-node@v3
with:
path: ${{ steps.yarn-cache.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
cache: yarn
node-version-file: '.tool-versions'
registry-url: https://registry.npmjs.org

- name: Bootstrap
run: yarn bootstrap
run: yarn install --immutable

- name: Build
run: yarn build
Expand Down
14 changes: 2 additions & 12 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,12 @@ jobs:
- name: Use node ${{ matrix.node }}
uses: actions/setup-node@v3
with:
cache: yarn
node-version: ${{ matrix.node }}
registry-url: https://registry.npmjs.org

- name: Get yarn cache
id: yarn-cache
run: echo "::set-output name=dir::$(yarn cache dir)"

- uses: actions/cache@v3
with:
path: ${{ steps.yarn-cache.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-

- name: Bootstrap
run: yarn bootstrap
run: yarn install --immutable

- name: Build
run: yarn build
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ bench/dataset/requests.json
bench/.bench.json

.changelog/
.yarn/
1 change: 1 addition & 0 deletions .tool-versions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodejs 20.6.1
874 changes: 874 additions & 0 deletions .yarn/releases/yarn-3.6.3.cjs
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions .yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.6.3.cjs
2 changes: 1 addition & 1 deletion lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.26.6",
"npmClient": "yarn",
"useWorkspaces": true
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
}
25 changes: 13 additions & 12 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,35 +53,36 @@
"url": "git+ssh://git@github.com/cliqz-oss/adblocker.git"
},
"workspaces": [
"./packages/*"
"packages/*"
],
"scripts": {
"bootstrap": "yarn install --frozen-lock && lerna bootstrap",
"bootstrap": "yarn install --immutable",
"lint": "lerna run --parallel lint",
"watch": "tsc --build ./tsconfig.project.json --watch",
"build": "tsc --build ./tsconfig.project.json && lerna run build",
"bundle": "lerna run --concurrency 4 bundle",
"test": "lerna run --concurrency 4 test",
"clean": "lerna run --parallel clean && lerna clean --yes",
"release": "auto shipit",
"release": "auto shipit --dry-run",
"format-check": "prettier './packages/**/*.ts' --check",
"format-fix": "prettier './packages/**/*.ts' --write"
},
"devDependencies": {
"@remusao/auto-config": "^1.1.1",
"@types/benchmark": "^2.1.0",
"@types/node": "^20.4.3",
"auto": "^10.27.0",
"@remusao/auto-config": "^1.1.2",
"@types/benchmark": "^2.1.3",
"@types/node": "^20.6.2",
"auto": "^11.0.4",
"benchmark": "^2.1.4",
"chalk": "^5.3.0",
"lerna": "^6.0.1",
"prettier": "^3.0.0",
"tslint-no-unused-expression-chai": "^0.1.4"
"lerna": "^7.3.0",
"prettier": "^3.0.3",
"tslint-no-unused-expression-chai": "^0.1.4",
"typescript": "^5.2.2"
},
"dependencies": {},
"auto": {
"extends": "@remusao/auto-config",
"name": "Adblocker Bot",
"email": "adblocker-bot@users.noreply.github.com"
}
},
"packageManager": "yarn@3.6.3"
}
6 changes: 3 additions & 3 deletions packages/adblocker-benchmarks/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"dependencies": {
"@cliqz/adblocker": "^1.26.6",
"tldts-experimental": "^6.0.12"
"tldts-experimental": "^6.0.14"
},
"contributors": [
{
Expand Down Expand Up @@ -64,9 +64,9 @@
}
],
"devDependencies": {
"@rollup/plugin-commonjs": "^25.0.3",
"@rollup/plugin-commonjs": "^25.0.4",
"@rollup/plugin-json": "^6.0.0",
"rollup": "^3.26.3",
"rollup": "^3.29.2",
"rollup-plugin-terser": "^7.0.2"
}
}
16 changes: 8 additions & 8 deletions packages/adblocker-content/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@
"@cliqz/adblocker-extended-selectors": "^1.26.6"
},
"devDependencies": {
"@rollup/plugin-node-resolve": "^15.1.0",
"@rollup/plugin-typescript": "^11.1.2",
"@types/node": "^20.4.3",
"@rollup/plugin-node-resolve": "^15.2.1",
"@rollup/plugin-typescript": "^11.1.3",
"@types/node": "^20.6.2",
"rimraf": "^5.0.1",
"rollup": "^3.26.3",
"rollup-plugin-sourcemaps": "^0.6.1",
"rollup-plugin-terser": "^7.0.0",
"tslint": "^6.0.0",
"rollup": "^3.29.2",
"rollup-plugin-sourcemaps": "^0.6.3",
"rollup-plugin-terser": "^7.0.2",
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0",
"tslint-no-unused-expression-chai": "^0.1.4",
"typescript": "^5.1.6"
"typescript": "^5.2.2"
},
"contributors": [
{
Expand Down
10 changes: 5 additions & 5 deletions packages/adblocker-electron-example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@
],
"dependencies": {
"@cliqz/adblocker-electron": "^1.26.6",
"electron": "^26.1.0",
"node-fetch": "^3.0.0",
"ts-node": "^10.0.0"
"electron": "^26.2.1",
"node-fetch": "^3.3.2",
"ts-node": "^10.9.1"
},
"devDependencies": {
"@types/node-fetch": "^3.0.3",
"tslint": "^6.0.0",
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0",
"typescript": "^5.1.6"
"typescript": "^5.2.2"
}
}
16 changes: 8 additions & 8 deletions packages/adblocker-electron-preload/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,18 @@
"@cliqz/adblocker-content": "^1.26.6"
},
"devDependencies": {
"@rollup/plugin-commonjs": "^25.0.3",
"@rollup/plugin-node-resolve": "^15.1.0",
"@rollup/plugin-typescript": "^11.1.2",
"@rollup/plugin-commonjs": "^25.0.4",
"@rollup/plugin-node-resolve": "^15.2.1",
"@rollup/plugin-typescript": "^11.1.3",
"@types/chrome": "^0.0.246",
"electron": "^26.1.0",
"electron": "^26.2.1",
"rimraf": "^5.0.1",
"rollup": "^3.26.3",
"rollup-plugin-sourcemaps": "^0.6.1",
"tslint": "^6.0.0",
"rollup": "^3.29.2",
"rollup-plugin-sourcemaps": "^0.6.3",
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0",
"tslint-no-unused-expression-chai": "^0.1.4",
"typescript": "^5.1.6"
"typescript": "^5.2.2"
},
"contributors": [
{
Expand Down
20 changes: 10 additions & 10 deletions packages/adblocker-electron/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,21 @@
"dependencies": {
"@cliqz/adblocker": "^1.26.6",
"@cliqz/adblocker-electron-preload": "^1.26.6",
"tldts-experimental": "^6.0.12"
"tldts-experimental": "^6.0.14"
},
"devDependencies": {
"@types/chai": "^4.2.18",
"@types/mocha": "^10.0.0",
"chai": "^4.2.0",
"electron": "^26.1.0",
"mocha": "^10.1.0",
"nyc": "^15.0.0",
"@types/chai": "^4.3.6",
"@types/mocha": "^10.0.1",
"chai": "^4.3.8",
"electron": "^26.2.1",
"mocha": "^10.2.0",
"nyc": "^15.1.0",
"rimraf": "^5.0.1",
"ts-node": "^10.0.0",
"tslint": "^6.0.0",
"ts-node": "^10.9.1",
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0",
"tslint-no-unused-expression-chai": "^0.1.4",
"typescript": "^5.1.6"
"typescript": "^5.2.2"
},
"contributors": [
{
Expand Down
22 changes: 11 additions & 11 deletions packages/adblocker-extended-selectors/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,22 @@
"url": "https://github.com/cliqz-oss/adblocker/issues"
},
"devDependencies": {
"@types/chai": "^4.2.18",
"@types/chai-as-promised": "^7.1.4",
"@types/jsdom": "^21.1.0",
"@types/mocha": "^10.0.0",
"@types/node": "^20.4.3",
"chai": "^4.2.0",
"@types/chai": "^4.3.6",
"@types/chai-as-promised": "^7.1.6",
"@types/jsdom": "^21.1.3",
"@types/mocha": "^10.0.1",
"@types/node": "^20.6.2",
"chai": "^4.3.8",
"chai-as-promised": "^7.1.1",
"jsdom": "^22.1.0",
"mocha": "^10.1.0",
"nyc": "^15.0.0",
"mocha": "^10.2.0",
"nyc": "^15.1.0",
"rimraf": "^5.0.1",
"ts-node": "^10.0.0",
"tslint": "^6.0.0",
"ts-node": "^10.9.1",
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0",
"tslint-no-unused-expression-chai": "^0.1.4",
"typescript": "^5.1.6"
"typescript": "^5.2.2"
},
"contributors": [
{
Expand Down
10 changes: 5 additions & 5 deletions packages/adblocker-playwright-example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
},
"dependencies": {
"@cliqz/adblocker-playwright": "^1.26.6",
"node-fetch": "^3.0.0",
"playwright": "^1.36.1",
"ts-node": "^10.0.0"
"node-fetch": "^3.3.2",
"playwright": "^1.38.0",
"ts-node": "^10.9.1"
},
"devDependencies": {
"@types/node-fetch": "^3.0.3",
"tslint": "^6.0.0",
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0",
"typescript": "^5.1.6"
"typescript": "^5.2.2"
},
"contributors": [
{
Expand Down
18 changes: 9 additions & 9 deletions packages/adblocker-playwright/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,19 @@
"dependencies": {
"@cliqz/adblocker": "^1.26.6",
"@cliqz/adblocker-content": "^1.26.6",
"tldts-experimental": "^6.0.12"
"tldts-experimental": "^6.0.14"
},
"devDependencies": {
"@types/chai": "^4.2.18",
"@types/mocha": "^10.0.0",
"chai": "^4.2.0",
"mocha": "^10.1.0",
"nyc": "^15.0.0",
"playwright": "^1.36.1",
"@types/chai": "^4.3.6",
"@types/mocha": "^10.0.1",
"chai": "^4.3.8",
"mocha": "^10.2.0",
"nyc": "^15.1.0",
"playwright": "^1.38.0",
"rimraf": "^5.0.1",
"tslint": "^6.0.0",
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0",
"typescript": "^5.1.6"
"typescript": "^5.2.2"
},
"contributors": [
{
Expand Down
8 changes: 4 additions & 4 deletions packages/adblocker-puppeteer-example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
},
"dependencies": {
"@cliqz/adblocker-puppeteer": "^1.26.6",
"node-fetch": "^3.0.0",
"node-fetch": "^3.3.2",
"puppeteer": "21.2.1",
"ts-node": "^10.0.0"
"ts-node": "^10.9.1"
},
"devDependencies": {
"@types/node-fetch": "^3.0.3",
"tslint": "^6.0.0",
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0",
"typescript": "^5.1.6"
"typescript": "^5.2.2"
},
"contributors": [
{
Expand Down
Loading