From 4cd7dad02e2811674cda11af25ed436d700a2bb8 Mon Sep 17 00:00:00 2001 From: larzie Date: Fri, 13 Dec 2024 13:18:57 +0300 Subject: [PATCH 01/21] Update action Signed-off-by: larzie --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 49feea99e..b34b6f884 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -627,7 +627,7 @@ jobs: - name: Setup Git run: | git config --global user.name "github-actions[bot]" - git config --global user.email "github-actions[bot]@users.noreply.github.com" + git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" - name: Prepare Flatpak manifest run: | @@ -712,7 +712,7 @@ jobs: cask: true test-bot: false - - name: Setup git + - name: Setup Git uses: Homebrew/actions/git-user-config@master with: username: zen-browser-auto From c4ff50a8178d280012a41f41ad0c9c3159a4f652 Mon Sep 17 00:00:00 2001 From: larzie Date: Fri, 13 Dec 2024 13:23:24 +0300 Subject: [PATCH 02/21] Update action Signed-off-by: larzie --- .github/workflows/linux-release-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml index 547258d2a..6d7b085c6 100644 --- a/.github/workflows/linux-release-build.yml +++ b/.github/workflows/linux-release-build.yml @@ -24,7 +24,7 @@ jobs: name: Build Linux - ${{ matrix.arch == 'x86_64' && 'Generic' || matrix.arch == 'x86_64-v3' && 'Specific' || matrix.arch == 'aarch64' && 'aarch64' }} steps: - - name: Free Disk Space (Ubuntu) + - name: Free disk space uses: jlumbroso/free-disk-space@main with: tool-cache: false @@ -62,7 +62,7 @@ jobs: - name: Setup sccache env: LINK: https://github.com/mozilla/sccache/releases/download - SCCACHE_VERSION: 0.2.13 + SCCACHE_VERSION: 0.9.0 run: | SCCACHE_FILE=sccache-$SCCACHE_VERSION-x86_64-unknown-linux-musl mkdir -p $HOME/.local/bin @@ -98,7 +98,7 @@ jobs: - name: Fix Rust version run: | # Install a rust version compatible with LLVM 18 - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79 + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh source $HOME/.cargo/env if test "${{ matrix.arch }}" = "aarch64"; then From 7036fa12690cdc7a561706e4829512a7c7d92576 Mon Sep 17 00:00:00 2001 From: larzie Date: Fri, 13 Dec 2024 13:24:07 +0300 Subject: [PATCH 03/21] Update action Signed-off-by: larzie --- .github/workflows/macos-release-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml index d331e2b5d..3db90870a 100644 --- a/.github/workflows/macos-release-build.yml +++ b/.github/workflows/macos-release-build.yml @@ -37,7 +37,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v5 with: - python-version: '3.11' + python-version: '3.13' - name: Setup Git run: | @@ -91,7 +91,7 @@ jobs: run: | pnpm install - - name: Load surfer CI setup + - name: Load Surfer CI setup run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }} - name: Download Firefox source and dependencies From 969d73473406bde60b67d442a3daa9c9caf305b6 Mon Sep 17 00:00:00 2001 From: larzie Date: Fri, 13 Dec 2024 13:24:29 +0300 Subject: [PATCH 04/21] Update action Signed-off-by: larzie --- .github/workflows/pr-test.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 1b339c370..0d501964b 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -2,8 +2,6 @@ name: Pull request test on: pull_request: - branches: - - dev jobs: pr-test: From 3186c325d002127f7d30f45b389ffb8f16827084 Mon Sep 17 00:00:00 2001 From: larzie Date: Fri, 13 Dec 2024 13:27:46 +0300 Subject: [PATCH 05/21] Update action Signed-off-by: larzie --- .github/workflows/windows-release-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml index 794f5631c..49cfd5f21 100644 --- a/.github/workflows/windows-release-build.yml +++ b/.github/workflows/windows-release-build.yml @@ -30,7 +30,7 @@ jobs: arch: [x86_64, x86_64-v3, aarch64] steps: - - name: Free Disk Space (Ubuntu) + - name: Free disk space uses: jlumbroso/free-disk-space@main with: tool-cache: false @@ -115,7 +115,7 @@ jobs: - name: Setup Rust run: | cd engine/ - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79 + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh source $HOME/.cargo/env if test "${{ matrix.arch }}" = "aarch64"; then rustup target add aarch64-pc-windows-msvc @@ -123,7 +123,7 @@ jobs: rustup target add x86_64-pc-windows-msvc fi cargo install cargo-download - cargo download -x windows=0.58.0 + cargo download -x windows=0.84.0 export CARGO_INCREMENTAL=0 echo "" >> ../configs/common/mozconfig echo "export MOZ_WINDOWS_RS_DIR=$(pwd)/windows-0.58.0" >> ../configs/common/mozconfig From adcf99efc6f3a712da38afcba288fd851f732c80 Mon Sep 17 00:00:00 2001 From: larzie Date: Fri, 13 Dec 2024 13:30:45 +0300 Subject: [PATCH 06/21] Setup Dependabot Signed-off-by: larzie --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..aff82a102 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "npm" + directory: "/" + schedule: + interval: "weekly" From 2bb97c35b2ea5cf3882f464bded24bc9da421d61 Mon Sep 17 00:00:00 2001 From: larzie Date: Fri, 13 Dec 2024 13:31:15 +0300 Subject: [PATCH 07/21] Update Python Signed-off-by: larzie --- .python-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.python-version b/.python-version index 2c0733315..24ee5b1be 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.11 +3.13 From c61db12cfabdaa2cc6fb8fd5054dd00743783dab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 10:31:43 +0000 Subject: [PATCH 08/21] chore(deps): bump @zen-browser/surfer from 1.3.21 to 1.6.4 Bumps [@zen-browser/surfer](https://github.com/zen-browser/surfer) from 1.3.21 to 1.6.4. - [Commits](https://github.com/zen-browser/surfer/commits) --- updated-dependencies: - dependency-name: "@zen-browser/surfer" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- pnpm-lock.yaml | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5abbe763f..aba3c1927 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@zen-browser/surfer": "^1.3.21" + "@zen-browser/surfer": "^1.6.4" }, "devDependencies": { "husky": "^9.1.5", @@ -269,9 +269,9 @@ "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==" }, "node_modules/@zen-browser/surfer": { - "version": "1.3.21", - "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.3.21.tgz", - "integrity": "sha512-hFblYgr4/rlfoJ75kcRPY03wG8HA8XT6dRZLEwdD7e5b8YazCWRlXMof0NhFC5a1Z0e1FZ+sRCxMG52ZygoVzw==", + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.6.4.tgz", + "integrity": "sha512-JmTHLHTbTLPgrakdU/m1KQgetPMQNGjYgGGVoi2AenvVDlJf3j+L2it0XehAqRFIQhXmbEuF1nSDV4Vla/vUUg==", "dependencies": { "@resvg/resvg-js": "^1.4.0", "async-icns": "^1.0.2", @@ -2818,9 +2818,9 @@ "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==" }, "@zen-browser/surfer": { - "version": "1.3.21", - "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.3.21.tgz", - "integrity": "sha512-hFblYgr4/rlfoJ75kcRPY03wG8HA8XT6dRZLEwdD7e5b8YazCWRlXMof0NhFC5a1Z0e1FZ+sRCxMG52ZygoVzw==", + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.6.4.tgz", + "integrity": "sha512-JmTHLHTbTLPgrakdU/m1KQgetPMQNGjYgGGVoi2AenvVDlJf3j+L2it0XehAqRFIQhXmbEuF1nSDV4Vla/vUUg==", "requires": { "@resvg/resvg-js": "^1.4.0", "async-icns": "^1.0.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 46a49dd57..decc9f1db 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -448,8 +448,8 @@ packages: resolution: {integrity: sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==} engines: {node: '>=0.10.0'} - is-apple-silicon@https://codeload.github.com/trickypr/is-apple-silicon/tar.gz/5f75501a1d7566ba9f94174b6825d7bd9d302b6a: - resolution: {tarball: https://codeload.github.com/trickypr/is-apple-silicon/tar.gz/5f75501a1d7566ba9f94174b6825d7bd9d302b6a} + is-apple-silicon@git+https://git@github.com:trickypr/is-apple-silicon.git#5f75501a1d7566ba9f94174b6825d7bd9d302b6a: + resolution: {commit: 5f75501a1d7566ba9f94174b6825d7bd9d302b6a, repo: git@github.com:trickypr/is-apple-silicon.git, type: git} version: 1.0.1 is-arrayish@0.3.2: @@ -1015,7 +1015,7 @@ snapshots: fast-extract: 1.1.0 fs-extra: 10.1.0 ini: 3.0.1 - is-apple-silicon: https://codeload.github.com/trickypr/is-apple-silicon/tar.gz/5f75501a1d7566ba9f94174b6825d7bd9d302b6a + is-apple-silicon: git+https://git@github.com:trickypr/is-apple-silicon.git#5f75501a1d7566ba9f94174b6825d7bd9d302b6a kleur: 4.1.5 modern-async: 1.1.4 mount-dmg: 1.0.1 @@ -1354,7 +1354,7 @@ snapshots: is-relative: 1.0.0 is-windows: 1.0.2 - is-apple-silicon@https://codeload.github.com/trickypr/is-apple-silicon/tar.gz/5f75501a1d7566ba9f94174b6825d7bd9d302b6a: {} + is-apple-silicon@git+https://git@github.com:trickypr/is-apple-silicon.git#5f75501a1d7566ba9f94174b6825d7bd9d302b6a: {} is-arrayish@0.3.2: {} From a461ae8d1cbecb002f1457b72f1441bbb3f4cac6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 10:32:06 +0000 Subject: [PATCH 09/21] chore(deps-dev): bump lint-staged from 15.2.10 to 15.2.11 Bumps [lint-staged](https://github.com/lint-staged/lint-staged) from 15.2.10 to 15.2.11. - [Release notes](https://github.com/lint-staged/lint-staged/releases) - [Changelog](https://github.com/lint-staged/lint-staged/blob/master/CHANGELOG.md) - [Commits](https://github.com/lint-staged/lint-staged/compare/v15.2.10...v15.2.11) --- updated-dependencies: - dependency-name: lint-staged dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 104 +++++++++++++++++++++++----------------------- package.json | 2 +- pnpm-lock.yaml | 50 +++++++++++----------- 3 files changed, 78 insertions(+), 78 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5abbe763f..00bb8401f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,11 +9,11 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@zen-browser/surfer": "^1.3.21" + "@zen-browser/surfer": "^1.6.4" }, "devDependencies": { "husky": "^9.1.5", - "lint-staged": "^15.2.10", + "lint-staged": "^15.2.11", "prettier": "^3.3.3" } }, @@ -269,9 +269,9 @@ "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==" }, "node_modules/@zen-browser/surfer": { - "version": "1.3.21", - "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.3.21.tgz", - "integrity": "sha512-hFblYgr4/rlfoJ75kcRPY03wG8HA8XT6dRZLEwdD7e5b8YazCWRlXMof0NhFC5a1Z0e1FZ+sRCxMG52ZygoVzw==", + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.6.4.tgz", + "integrity": "sha512-JmTHLHTbTLPgrakdU/m1KQgetPMQNGjYgGGVoi2AenvVDlJf3j+L2it0XehAqRFIQhXmbEuF1nSDV4Vla/vUUg==", "dependencies": { "@resvg/resvg-js": "^1.4.0", "async-icns": "^1.0.2", @@ -709,9 +709,9 @@ } }, "node_modules/debug": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", "dev": true, "dependencies": { "ms": "^2.1.3" @@ -1001,9 +1001,9 @@ } }, "node_modules/get-east-asian-width": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz", - "integrity": "sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz", + "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==", "dev": true, "engines": { "node": ">=18" @@ -1290,9 +1290,9 @@ "integrity": "sha512-FJx0SNrM2rouctdOH4rATsHT+BvgyXX4LEQ+Yn9COQNPK3u4XAPp9qS7OKpRO22MeT39oxkjZkRcLnHxSmiduw==" }, "node_modules/lilconfig": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz", - "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz", + "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==", "dev": true, "engines": { "node": ">=14" @@ -1302,21 +1302,21 @@ } }, "node_modules/lint-staged": { - "version": "15.2.10", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.10.tgz", - "integrity": "sha512-5dY5t743e1byO19P9I4b3x8HJwalIznL5E1FWYnU6OWw33KxNBSLAc6Cy7F2PsFEO8FKnLwjwm5hx7aMF0jzZg==", + "version": "15.2.11", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.11.tgz", + "integrity": "sha512-Ev6ivCTYRTGs9ychvpVw35m/bcNDuBN+mnTeObCL5h+boS5WzBEC6LHI4I9F/++sZm1m+J2LEiy0gxL/R9TBqQ==", "dev": true, "dependencies": { "chalk": "~5.3.0", "commander": "~12.1.0", - "debug": "~4.3.6", + "debug": "~4.4.0", "execa": "~8.0.1", - "lilconfig": "~3.1.2", - "listr2": "~8.2.4", + "lilconfig": "~3.1.3", + "listr2": "~8.2.5", "micromatch": "~4.0.8", "pidtree": "~0.6.0", "string-argv": "~0.3.2", - "yaml": "~2.5.0" + "yaml": "~2.6.1" }, "bin": { "lint-staged": "bin/lint-staged.js" @@ -1484,9 +1484,9 @@ } }, "node_modules/listr2": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.4.tgz", - "integrity": "sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==", + "version": "8.2.5", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.5.tgz", + "integrity": "sha512-iyAZCeyD+c1gPyE9qpFu8af0Y+MRtmKOncdGoA2S5EY8iFq99dmmvkNnHiWo+pj0s7yH7l3KPIgee77tKpXPWQ==", "dev": true, "dependencies": { "cli-truncate": "^4.0.0", @@ -2643,9 +2643,9 @@ } }, "node_modules/yaml": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz", - "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.1.tgz", + "integrity": "sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==", "dev": true, "bin": { "yaml": "bin.mjs" @@ -2818,9 +2818,9 @@ "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==" }, "@zen-browser/surfer": { - "version": "1.3.21", - "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.3.21.tgz", - "integrity": "sha512-hFblYgr4/rlfoJ75kcRPY03wG8HA8XT6dRZLEwdD7e5b8YazCWRlXMof0NhFC5a1Z0e1FZ+sRCxMG52ZygoVzw==", + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.6.4.tgz", + "integrity": "sha512-JmTHLHTbTLPgrakdU/m1KQgetPMQNGjYgGGVoi2AenvVDlJf3j+L2it0XehAqRFIQhXmbEuF1nSDV4Vla/vUUg==", "requires": { "@resvg/resvg-js": "^1.4.0", "async-icns": "^1.0.2", @@ -3147,9 +3147,9 @@ } }, "debug": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", "dev": true, "requires": { "ms": "^2.1.3" @@ -3363,9 +3363,9 @@ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" }, "get-east-asian-width": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz", - "integrity": "sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz", + "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==", "dev": true }, "get-stream": { @@ -3561,27 +3561,27 @@ "integrity": "sha512-FJx0SNrM2rouctdOH4rATsHT+BvgyXX4LEQ+Yn9COQNPK3u4XAPp9qS7OKpRO22MeT39oxkjZkRcLnHxSmiduw==" }, "lilconfig": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz", - "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz", + "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==", "dev": true }, "lint-staged": { - "version": "15.2.10", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.10.tgz", - "integrity": "sha512-5dY5t743e1byO19P9I4b3x8HJwalIznL5E1FWYnU6OWw33KxNBSLAc6Cy7F2PsFEO8FKnLwjwm5hx7aMF0jzZg==", + "version": "15.2.11", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.11.tgz", + "integrity": "sha512-Ev6ivCTYRTGs9ychvpVw35m/bcNDuBN+mnTeObCL5h+boS5WzBEC6LHI4I9F/++sZm1m+J2LEiy0gxL/R9TBqQ==", "dev": true, "requires": { "chalk": "~5.3.0", "commander": "~12.1.0", - "debug": "~4.3.6", + "debug": "~4.4.0", "execa": "~8.0.1", - "lilconfig": "~3.1.2", - "listr2": "~8.2.4", + "lilconfig": "~3.1.3", + "listr2": "~8.2.5", "micromatch": "~4.0.8", "pidtree": "~0.6.0", "string-argv": "~0.3.2", - "yaml": "~2.5.0" + "yaml": "~2.6.1" }, "dependencies": { "chalk": { @@ -3676,9 +3676,9 @@ } }, "listr2": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.4.tgz", - "integrity": "sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==", + "version": "8.2.5", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.5.tgz", + "integrity": "sha512-iyAZCeyD+c1gPyE9qpFu8af0Y+MRtmKOncdGoA2S5EY8iFq99dmmvkNnHiWo+pj0s7yH7l3KPIgee77tKpXPWQ==", "dev": true, "requires": { "cli-truncate": "^4.0.0", @@ -4542,9 +4542,9 @@ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" }, "yaml": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz", - "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.1.tgz", + "integrity": "sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==", "dev": true }, "zip": { diff --git a/package.json b/package.json index 14a77dbf4..0386f040f 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ }, "devDependencies": { "husky": "^9.1.5", - "lint-staged": "^15.2.10", + "lint-staged": "^15.2.11", "prettier": "^3.3.3" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 46a49dd57..460ec7f2c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,8 +16,8 @@ importers: specifier: ^9.1.5 version: 9.1.5 lint-staged: - specifier: ^15.2.10 - version: 15.2.10 + specifier: ^15.2.11 + version: 15.2.11 prettier: specifier: ^3.3.3 version: 3.3.3 @@ -273,8 +273,8 @@ packages: resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} engines: {node: '>= 8'} - debug@4.3.7: - resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==} + debug@4.4.0: + resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==} engines: {node: '>=6.0'} peerDependencies: supports-color: '*' @@ -448,8 +448,8 @@ packages: resolution: {integrity: sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==} engines: {node: '>=0.10.0'} - is-apple-silicon@https://codeload.github.com/trickypr/is-apple-silicon/tar.gz/5f75501a1d7566ba9f94174b6825d7bd9d302b6a: - resolution: {tarball: https://codeload.github.com/trickypr/is-apple-silicon/tar.gz/5f75501a1d7566ba9f94174b6825d7bd9d302b6a} + is-apple-silicon@git+https://git@github.com:trickypr/is-apple-silicon.git#5f75501a1d7566ba9f94174b6825d7bd9d302b6a: + resolution: {commit: 5f75501a1d7566ba9f94174b6825d7bd9d302b6a, repo: git@github.com:trickypr/is-apple-silicon.git, type: git} version: 1.0.1 is-arrayish@0.3.2: @@ -521,17 +521,17 @@ packages: lifecycle@1.0.4: resolution: {integrity: sha512-FJx0SNrM2rouctdOH4rATsHT+BvgyXX4LEQ+Yn9COQNPK3u4XAPp9qS7OKpRO22MeT39oxkjZkRcLnHxSmiduw==} - lilconfig@3.1.2: - resolution: {integrity: sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==} + lilconfig@3.1.3: + resolution: {integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==} engines: {node: '>=14'} - lint-staged@15.2.10: - resolution: {integrity: sha512-5dY5t743e1byO19P9I4b3x8HJwalIznL5E1FWYnU6OWw33KxNBSLAc6Cy7F2PsFEO8FKnLwjwm5hx7aMF0jzZg==} + lint-staged@15.2.11: + resolution: {integrity: sha512-Ev6ivCTYRTGs9ychvpVw35m/bcNDuBN+mnTeObCL5h+boS5WzBEC6LHI4I9F/++sZm1m+J2LEiy0gxL/R9TBqQ==} engines: {node: '>=18.12.0'} hasBin: true - listr2@8.2.4: - resolution: {integrity: sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==} + listr2@8.2.5: + resolution: {integrity: sha512-iyAZCeyD+c1gPyE9qpFu8af0Y+MRtmKOncdGoA2S5EY8iFq99dmmvkNnHiWo+pj0s7yH7l3KPIgee77tKpXPWQ==} engines: {node: '>=18.0.0'} lodash.compact@3.0.1: @@ -919,8 +919,8 @@ packages: resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==} engines: {node: '>=0.4'} - yaml@2.5.1: - resolution: {integrity: sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==} + yaml@2.6.1: + resolution: {integrity: sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==} engines: {node: '>= 14'} hasBin: true @@ -1015,7 +1015,7 @@ snapshots: fast-extract: 1.1.0 fs-extra: 10.1.0 ini: 3.0.1 - is-apple-silicon: https://codeload.github.com/trickypr/is-apple-silicon/tar.gz/5f75501a1d7566ba9f94174b6825d7bd9d302b6a + is-apple-silicon: git+https://git@github.com:trickypr/is-apple-silicon.git#5f75501a1d7566ba9f94174b6825d7bd9d302b6a kleur: 4.1.5 modern-async: 1.1.4 mount-dmg: 1.0.1 @@ -1178,7 +1178,7 @@ snapshots: shebang-command: 2.0.0 which: 2.0.2 - debug@4.3.7: + debug@4.4.0: dependencies: ms: 2.1.3 @@ -1354,7 +1354,7 @@ snapshots: is-relative: 1.0.0 is-windows: 1.0.2 - is-apple-silicon@https://codeload.github.com/trickypr/is-apple-silicon/tar.gz/5f75501a1d7566ba9f94174b6825d7bd9d302b6a: {} + is-apple-silicon@git+https://git@github.com:trickypr/is-apple-silicon.git#5f75501a1d7566ba9f94174b6825d7bd9d302b6a: {} is-arrayish@0.3.2: {} @@ -1407,24 +1407,24 @@ snapshots: lifecycle@1.0.4: {} - lilconfig@3.1.2: {} + lilconfig@3.1.3: {} - lint-staged@15.2.10: + lint-staged@15.2.11: dependencies: chalk: 5.3.0 commander: 12.1.0 - debug: 4.3.7 + debug: 4.4.0 execa: 8.0.1 - lilconfig: 3.1.2 - listr2: 8.2.4 + lilconfig: 3.1.3 + listr2: 8.2.5 micromatch: 4.0.8 pidtree: 0.6.0 string-argv: 0.3.2 - yaml: 2.5.1 + yaml: 2.6.1 transitivePeerDependencies: - supports-color - listr2@8.2.4: + listr2@8.2.5: dependencies: cli-truncate: 4.0.0 colorette: 2.0.20 @@ -1835,7 +1835,7 @@ snapshots: xtend@4.0.2: {} - yaml@2.5.1: {} + yaml@2.6.1: {} zip-iterator@1.0.1: dependencies: From 6089f6bbfbaf79b5a1c7fb7cbbdadde1a9a9c0b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 11:58:07 +0000 Subject: [PATCH 10/21] chore(deps): bump cross-spawn from 7.0.3 to 7.0.6 Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6. - [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md) - [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6) --- updated-dependencies: - dependency-name: cross-spawn dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ pnpm-lock.yaml | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 00bb8401f..8dc626536 100644 --- a/package-lock.json +++ b/package-lock.json @@ -696,9 +696,9 @@ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -3137,9 +3137,9 @@ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" }, "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "requires": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 460ec7f2c..32c9a012b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -269,8 +269,8 @@ packages: core-util-is@1.0.3: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} - cross-spawn@7.0.3: - resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} + cross-spawn@7.0.6: + resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} engines: {node: '>= 8'} debug@4.4.0: @@ -1172,7 +1172,7 @@ snapshots: core-util-is@1.0.3: {} - cross-spawn@7.0.3: + cross-spawn@7.0.6: dependencies: path-key: 3.1.1 shebang-command: 2.0.0 @@ -1213,7 +1213,7 @@ snapshots: execa@5.1.1: dependencies: - cross-spawn: 7.0.3 + cross-spawn: 7.0.6 get-stream: 6.0.1 human-signals: 2.1.0 is-stream: 2.0.1 @@ -1225,7 +1225,7 @@ snapshots: execa@8.0.1: dependencies: - cross-spawn: 7.0.3 + cross-spawn: 7.0.6 get-stream: 8.0.1 human-signals: 5.0.0 is-stream: 3.0.0 From 059899683f2a478110ac6a1a76f22d803cefaecb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 11:58:14 +0000 Subject: [PATCH 11/21] chore(deps-dev): bump husky from 9.1.5 to 9.1.7 Bumps [husky](https://github.com/typicode/husky) from 9.1.5 to 9.1.7. - [Release notes](https://github.com/typicode/husky/releases) - [Commits](https://github.com/typicode/husky/compare/v9.1.5...v9.1.7) --- updated-dependencies: - dependency-name: husky dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 00bb8401f..447b37db5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@zen-browser/surfer": "^1.6.4" }, "devDependencies": { - "husky": "^9.1.5", + "husky": "^9.1.7", "lint-staged": "^15.2.11", "prettier": "^3.3.3" } @@ -1085,9 +1085,9 @@ } }, "node_modules/husky": { - "version": "9.1.5", - "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.5.tgz", - "integrity": "sha512-rowAVRUBfI0b4+niA4SJMhfQwc107VLkBUgEYYAOQAbqDCnra1nYh83hF/MDmhYs9t9n1E3DuKOrs2LYNC+0Ag==", + "version": "9.1.7", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz", + "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==", "dev": true, "bin": { "husky": "bin.js" @@ -3422,9 +3422,9 @@ "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==" }, "husky": { - "version": "9.1.5", - "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.5.tgz", - "integrity": "sha512-rowAVRUBfI0b4+niA4SJMhfQwc107VLkBUgEYYAOQAbqDCnra1nYh83hF/MDmhYs9t9n1E3DuKOrs2LYNC+0Ag==", + "version": "9.1.7", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz", + "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==", "dev": true }, "ieee754": { diff --git a/package.json b/package.json index 0386f040f..1e33564e6 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "@zen-browser/surfer": "^1.6.4" }, "devDependencies": { - "husky": "^9.1.5", + "husky": "^9.1.7", "lint-staged": "^15.2.11", "prettier": "^3.3.3" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 460ec7f2c..7d3d81550 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -13,8 +13,8 @@ importers: version: 1.6.4 devDependencies: husky: - specifier: ^9.1.5 - version: 9.1.5 + specifier: ^9.1.7 + version: 9.1.7 lint-staged: specifier: ^15.2.11 version: 15.2.11 @@ -418,8 +418,8 @@ packages: resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==} engines: {node: '>=16.17.0'} - husky@9.1.5: - resolution: {integrity: sha512-rowAVRUBfI0b4+niA4SJMhfQwc107VLkBUgEYYAOQAbqDCnra1nYh83hF/MDmhYs9t9n1E3DuKOrs2LYNC+0Ag==} + husky@9.1.7: + resolution: {integrity: sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==} engines: {node: '>=18'} hasBin: true @@ -1332,7 +1332,7 @@ snapshots: human-signals@5.0.0: {} - husky@9.1.5: {} + husky@9.1.7: {} ieee754@1.2.1: {} From 51a8088ffcef1941fa6608f9b31529589742328e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 11:58:17 +0000 Subject: [PATCH 12/21] chore(deps-dev): bump prettier from 3.3.3 to 3.4.2 Bumps [prettier](https://github.com/prettier/prettier) from 3.3.3 to 3.4.2. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/3.3.3...3.4.2) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 00bb8401f..c7e566657 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "devDependencies": { "husky": "^9.1.5", "lint-staged": "^15.2.11", - "prettier": "^3.3.3" + "prettier": "^3.4.2" } }, "node_modules/@oozcitak/dom": { @@ -1854,9 +1854,9 @@ } }, "node_modules/prettier": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", - "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz", + "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -3943,9 +3943,9 @@ } }, "prettier": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", - "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz", + "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==", "dev": true }, "process-nextick-args": { diff --git a/package.json b/package.json index 0386f040f..f5fbfbb13 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,6 @@ "devDependencies": { "husky": "^9.1.5", "lint-staged": "^15.2.11", - "prettier": "^3.3.3" + "prettier": "^3.4.2" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 460ec7f2c..d25eee4ac 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,8 +19,8 @@ importers: specifier: ^15.2.11 version: 15.2.11 prettier: - specifier: ^3.3.3 - version: 3.3.3 + specifier: ^3.4.2 + version: 3.4.2 packages: @@ -674,8 +674,8 @@ packages: engines: {node: '>=10'} hasBin: true - prettier@3.3.3: - resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==} + prettier@3.4.2: + resolution: {integrity: sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==} engines: {node: '>=14'} hasBin: true @@ -1559,7 +1559,7 @@ snapshots: tar-fs: 2.1.1 tunnel-agent: 0.6.0 - prettier@3.3.3: {} + prettier@3.4.2: {} process-nextick-args@2.0.1: {} From c818d9f1cc964629e94fcef40d653f5bca6d4e55 Mon Sep 17 00:00:00 2001 From: larzie Date: Fri, 13 Dec 2024 15:42:53 +0300 Subject: [PATCH 13/21] testing Signed-off-by: larzie --- src/ci/free-disk-space.sh | 230 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 230 insertions(+) create mode 100644 src/ci/free-disk-space.sh diff --git a/src/ci/free-disk-space.sh b/src/ci/free-disk-space.sh new file mode 100644 index 000000000..55121e721 --- /dev/null +++ b/src/ci/free-disk-space.sh @@ -0,0 +1,230 @@ +#!/bin/bash +# Free disk space on Linux GitHub action runners + +# # ====== +# MACROS +# ====== +set -e +fast_rmdir() { + cd "$@" + pwd + ls + perl -e 'unlink for glob "*"' +} + +list_installed_dpkg() { + dpkg --get-selections $@ | grep -v deinstall | awk '{print $1}' +} + +# macro to print a line of equals +# # (silly but works) +printSeparationLine() { + str=${1:=} + num=${2:-80} + counter=1 + output="" + while [ $counter -le "$num" ] + do + output="${output}${str}" + counter=$((counter+1)) + done + echo "${output}" +} + +# macro to compute available space +# REF: https://unix.stackexchange.com/a/42049/60849 +# REF: https://stackoverflow.com/a/450821/408734 +getAvailableSpace() { echo $(df -a $1 | awk 'NR > 1 {avail+=$4} END {print avail}'); } +# macro to make Kb human readable (assume the input is Kb) +# REF: https://unix.stackexchange.com/a/44087/60849 +formatByteCount() { echo $(numfmt --to=iec-i --suffix=B --padding=7 $1'000'); } + +# macro to output saved space +printSavedSpace() { + saved=${1} + title=${2:-} + + echo "" + printSeparationLine '*' 80 + if [ -n "${title}" ]; then + echo "=> ${title}: Saved $(formatByteCount "$saved")" + else + echo "=> Saved $(formatByteCount "$saved")" + fi + printSeparationLine '*' 80 + echo "" +} + +# macro to print output of dh with caption +printDH() { + caption=${1:-} + + printSeparationLine '=' 80 + echo "${caption}" + echo "" + echo "$ dh -h /" + echo "" + df -h / + echo "$ dh -a /" + echo "" + df -a / + echo "$ dh -a" + echo "" + df -a + printSeparationLine '=' 80 +} + +# ====== +# SCRIPT +# # ====== + +# Display initial disk space stats + +AVAILABLE_INITIAL=$(getAvailableSpace) +AVAILABLE_ROOT_INITIAL=$(getAvailableSpace '/') + +printDH "BEFORE CLEAN-UP:" +echo "" + +BEFORE=$(getAvailableSpace) + +fast_rmdir "$AGENT_TOOLSDIRECTORY" || true + +AFTER=$(getAvailableSpace) +SAVED=$((AFTER-BEFORE)) +printSavedSpace $SAVED "Agent tools" + +BEFORE=$(getAvailableSpace) + +fast_rmdir /usr/local/share/powershell || true + +AFTER=$(getAvailableSpace) +SAVED=$((AFTER-BEFORE)) +printSavedSpace $SAVED "Powershell" + +BEFORE=$(getAvailableSpace) + +fast_rmdir /usr/local/share/chromium || true + +AFTER=$(getAvailableSpace) +SAVED=$((AFTER-BEFORE)) +printSavedSpace $SAVED "Chromium" + +BEFORE=$(getAvailableSpace) + +fast_rmdir /usr/local/lib/node_modules || true + +AFTER=$(getAvailableSpace) +SAVED=$((AFTER-BEFORE)) +printSavedSpace $SAVED "Node modules" + +BEFORE=$(getAvailableSpace) + +fast_rmdir /usr/share/swift || true + +AFTER=$(getAvailableSpace) +SAVED=$((AFTER-BEFORE)) +printSavedSpace $SAVED "Swift" + +# Remove Android library +BEFORE=$(getAvailableSpace) + +fast_rmdir /usr/local/lib/android || true + +AFTER=$(getAvailableSpace) +SAVED=$((AFTER-BEFORE)) +printSavedSpace $SAVED "Android library" + +# Remove .NET runtime + +BEFORE=$(getAvailableSpace) + +# https://github.community/t/bigger-github-hosted-runners-disk-space/17267/11 +fast_rmdir /usr/share/dotnet || true + +AFTER=$(getAvailableSpace) +SAVED=$((AFTER-BEFORE)) +printSavedSpace $SAVED ".NET runtime" + +# Remove Haskell runtime +BEFORE=$(getAvailableSpace) + +fast_rmdir /opt/ghc || true +fast_rmdir /usr/local/.ghcup || true + +AFTER=$(getAvailableSpace) +SAVED=$((AFTER-BEFORE)) +printSavedSpace $SAVED "Haskell runtime" + +# Remove large packages +# REF: https://github.com/apache/flink/blob/master/tools/azure-pipelines/free_disk_space.sh + +BEFORE=$(getAvailableSpace) + +pkgs=$(list_installed_dpkg 'microsoft-edge-*' 'snapd-*' 'aspnetcore-*' 'dotnet-*' 'llvm-*' '*php*' 'mongodb-*' 'mysql-*' azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri 'google-cloud-*' 'gcloud-*' || true) +gcloud_prerm='#!/bin/sh +echo $0 +if [ -d "/usr/lib/google-cloud-sdk" ]; then + echo "Cleaning Google Cloud CLI files..." + find /usr/lib/google-cloud-sdk -type f -delete -print | wc -l + rm -rf /usr/lib/google-cloud-sdk + echo "Cleaning Google Cloud CLI manuals..." + find /usr/share/man -type f -name "gcloud*" -delete -print | wc -l +fi' +echo "$gcloud_prerm" | sudo tee /var/lib/dpkg/info/google-cloud-cli-anthoscli.prerm >/dev/null +echo "$gcloud_prerm" | sudo tee /var/lib/dpkg/info/google-cloud-cli.prerm >/dev/null +sudo apt-get remove --autoremove -y $pkgs || echo "::warning::The command [sudo apt-get remove -y] failed to complete successfully. Proceeding..." + +AFTER=$(getAvailableSpace) +SAVED=$((AFTER-BEFORE)) +printSavedSpace $SAVED "Large misc. packages" + +# Remove Docker images + +BEFORE=$(getAvailableSpace) + +sudo docker image prune --all --force || true + +AFTER=$(getAvailableSpace) +SAVED=$((AFTER-BEFORE)) +printSavedSpace $SAVED "Docker images" + +# Remove tool cache +# REF: https://github.com/actions/virtual-environments/issues/2875#issuecomment-1163392159 + +BEFORE=$(getAvailableSpace) + +sudo rm -rf "$AGENT_TOOLSDIRECTORY" || true + +AFTER=$(getAvailableSpace) +SAVED=$((AFTER-BEFORE)) +printSavedSpace $SAVED "Tool cache" + +# Remove Swap storage + +BEFORE=$(getAvailableSpace) + +sudo swapoff -a || true +sudo rm -f /mnt/swapfile || true +free -h + +AFTER=$(getAvailableSpace) +SAVED=$((AFTER-BEFORE)) +printSavedSpace $SAVED "Swap storage" + + +# Output saved space statistic + +AVAILABLE_END=$(getAvailableSpace) +AVAILABLE_ROOT_END=$(getAvailableSpace '/') + +echo "" +printDH "AFTER CLEAN-UP:" + +echo "" +echo "" + +echo "/dev/root:" +printSavedSpace $((AVAILABLE_ROOT_END - AVAILABLE_ROOT_INITIAL)) +echo "overall:" +printSavedSpace $((AVAILABLE_END - AVAILABLE_INITIAL)) From 6f0ffd7b97ad42c6fb3a4ff73bb8acb670bddc83 Mon Sep 17 00:00:00 2001 From: larzie Date: Fri, 13 Dec 2024 15:43:56 +0300 Subject: [PATCH 14/21] Reformat Signed-off-by: larzie --- src/ci/free-disk-space.sh | 115 ++++++++++---------------------------- 1 file changed, 30 insertions(+), 85 deletions(-) diff --git a/src/ci/free-disk-space.sh b/src/ci/free-disk-space.sh index 55121e721..ecef7896f 100644 --- a/src/ci/free-disk-space.sh +++ b/src/ci/free-disk-space.sh @@ -1,45 +1,38 @@ #!/bin/bash -# Free disk space on Linux GitHub action runners -# # ====== -# MACROS -# ====== set -e + fast_rmdir() { - cd "$@" + cd "$@" || exit pwd ls perl -e 'unlink for glob "*"' } list_installed_dpkg() { - dpkg --get-selections $@ | grep -v deinstall | awk '{print $1}' + dpkg --get-selections "$@" | grep -v deinstall | awk '{print $1}' } -# macro to print a line of equals -# # (silly but works) printSeparationLine() { str=${1:=} num=${2:-80} counter=1 output="" - while [ $counter -le "$num" ] - do + while [ $counter -le "$num" ]; do output="${output}${str}" - counter=$((counter+1)) + counter=$((counter + 1)) done echo "${output}" } -# macro to compute available space -# REF: https://unix.stackexchange.com/a/42049/60849 -# REF: https://stackoverflow.com/a/450821/408734 -getAvailableSpace() { echo $(df -a $1 | awk 'NR > 1 {avail+=$4} END {print avail}'); } -# macro to make Kb human readable (assume the input is Kb) -# REF: https://unix.stackexchange.com/a/44087/60849 -formatByteCount() { echo $(numfmt --to=iec-i --suffix=B --padding=7 $1'000'); } +getAvailableSpace() { + echo $(df -a "$1" | awk 'NR > 1 {avail+=$4} END {print avail}') +} + +formatByteCount() { + echo $(numfmt --to=iec-i --suffix=B --padding=7 "$1"000) +} -# macro to output saved space printSavedSpace() { saved=${1} title=${2:-} @@ -55,113 +48,84 @@ printSavedSpace() { echo "" } -# macro to print output of dh with caption printDH() { caption=${1:-} printSeparationLine '=' 80 echo "${caption}" echo "" - echo "$ dh -h /" + echo "$ df -h /" echo "" df -h / - echo "$ dh -a /" + echo "$ df -a /" echo "" df -a / - echo "$ dh -a" + echo "$ df -a" echo "" df -a printSeparationLine '=' 80 } -# ====== -# SCRIPT -# # ====== - -# Display initial disk space stats - AVAILABLE_INITIAL=$(getAvailableSpace) AVAILABLE_ROOT_INITIAL=$(getAvailableSpace '/') -printDH "BEFORE CLEAN-UP:" +printDH "Before clean-up:" echo "" BEFORE=$(getAvailableSpace) fast_rmdir "$AGENT_TOOLSDIRECTORY" || true - AFTER=$(getAvailableSpace) -SAVED=$((AFTER-BEFORE)) +SAVED=$((AFTER - BEFORE)) printSavedSpace $SAVED "Agent tools" BEFORE=$(getAvailableSpace) - fast_rmdir /usr/local/share/powershell || true - AFTER=$(getAvailableSpace) -SAVED=$((AFTER-BEFORE)) +SAVED=$((AFTER - BEFORE)) printSavedSpace $SAVED "Powershell" BEFORE=$(getAvailableSpace) - fast_rmdir /usr/local/share/chromium || true - AFTER=$(getAvailableSpace) -SAVED=$((AFTER-BEFORE)) +SAVED=$((AFTER - BEFORE)) printSavedSpace $SAVED "Chromium" BEFORE=$(getAvailableSpace) - fast_rmdir /usr/local/lib/node_modules || true - AFTER=$(getAvailableSpace) -SAVED=$((AFTER-BEFORE)) +SAVED=$((AFTER - BEFORE)) printSavedSpace $SAVED "Node modules" BEFORE=$(getAvailableSpace) - fast_rmdir /usr/share/swift || true - AFTER=$(getAvailableSpace) -SAVED=$((AFTER-BEFORE)) +SAVED=$((AFTER - BEFORE)) printSavedSpace $SAVED "Swift" -# Remove Android library BEFORE=$(getAvailableSpace) - fast_rmdir /usr/local/lib/android || true - AFTER=$(getAvailableSpace) -SAVED=$((AFTER-BEFORE)) +SAVED=$((AFTER - BEFORE)) printSavedSpace $SAVED "Android library" -# Remove .NET runtime - BEFORE=$(getAvailableSpace) - -# https://github.community/t/bigger-github-hosted-runners-disk-space/17267/11 fast_rmdir /usr/share/dotnet || true - AFTER=$(getAvailableSpace) -SAVED=$((AFTER-BEFORE)) +SAVED=$((AFTER - BEFORE)) printSavedSpace $SAVED ".NET runtime" -# Remove Haskell runtime BEFORE=$(getAvailableSpace) - fast_rmdir /opt/ghc || true fast_rmdir /usr/local/.ghcup || true - AFTER=$(getAvailableSpace) -SAVED=$((AFTER-BEFORE)) +SAVED=$((AFTER - BEFORE)) printSavedSpace $SAVED "Haskell runtime" -# Remove large packages -# REF: https://github.com/apache/flink/blob/master/tools/azure-pipelines/free_disk_space.sh - BEFORE=$(getAvailableSpace) pkgs=$(list_installed_dpkg 'microsoft-edge-*' 'snapd-*' 'aspnetcore-*' 'dotnet-*' 'llvm-*' '*php*' 'mongodb-*' 'mysql-*' azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri 'google-cloud-*' 'gcloud-*' || true) + gcloud_prerm='#!/bin/sh echo $0 if [ -d "/usr/lib/google-cloud-sdk" ]; then @@ -176,53 +140,34 @@ echo "$gcloud_prerm" | sudo tee /var/lib/dpkg/info/google-cloud-cli.prerm >/dev/ sudo apt-get remove --autoremove -y $pkgs || echo "::warning::The command [sudo apt-get remove -y] failed to complete successfully. Proceeding..." AFTER=$(getAvailableSpace) -SAVED=$((AFTER-BEFORE)) +SAVED=$((AFTER - BEFORE)) printSavedSpace $SAVED "Large misc. packages" -# Remove Docker images - BEFORE=$(getAvailableSpace) - sudo docker image prune --all --force || true - AFTER=$(getAvailableSpace) -SAVED=$((AFTER-BEFORE)) +SAVED=$((AFTER - BEFORE)) printSavedSpace $SAVED "Docker images" -# Remove tool cache -# REF: https://github.com/actions/virtual-environments/issues/2875#issuecomment-1163392159 - BEFORE=$(getAvailableSpace) - sudo rm -rf "$AGENT_TOOLSDIRECTORY" || true - AFTER=$(getAvailableSpace) -SAVED=$((AFTER-BEFORE)) +SAVED=$((AFTER - BEFORE)) printSavedSpace $SAVED "Tool cache" -# Remove Swap storage - BEFORE=$(getAvailableSpace) - sudo swapoff -a || true sudo rm -f /mnt/swapfile || true free -h - AFTER=$(getAvailableSpace) -SAVED=$((AFTER-BEFORE)) +SAVED=$((AFTER - BEFORE)) printSavedSpace $SAVED "Swap storage" - -# Output saved space statistic - AVAILABLE_END=$(getAvailableSpace) AVAILABLE_ROOT_END=$(getAvailableSpace '/') echo "" -printDH "AFTER CLEAN-UP:" - -echo "" -echo "" +printDH "After clean-up:" echo "/dev/root:" printSavedSpace $((AVAILABLE_ROOT_END - AVAILABLE_ROOT_INITIAL)) From fc2d6150087c696c9e3cc0f60c6cce3f6abb9ceb Mon Sep 17 00:00:00 2001 From: larzie Date: Fri, 13 Dec 2024 15:45:37 +0300 Subject: [PATCH 15/21] Uppercase Signed-off-by: larzie --- src/ci/free-disk-space.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/free-disk-space.sh b/src/ci/free-disk-space.sh index ecef7896f..1c0244dcd 100644 --- a/src/ci/free-disk-space.sh +++ b/src/ci/free-disk-space.sh @@ -6,7 +6,7 @@ fast_rmdir() { cd "$@" || exit pwd ls - perl -e 'unlink for glob "*"' + perl -e 'Unlink for glob "*"' } list_installed_dpkg() { From f6e0d652ba2ddf17b0f90f20d1471939f43e1e34 Mon Sep 17 00:00:00 2001 From: larzie Date: Fri, 13 Dec 2024 15:46:22 +0300 Subject: [PATCH 16/21] Use our own script Signed-off-by: larzie --- .github/workflows/linux-release-build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml index 6d7b085c6..4c3b0b3f9 100644 --- a/.github/workflows/linux-release-build.yml +++ b/.github/workflows/linux-release-build.yml @@ -25,9 +25,7 @@ jobs: steps: - name: Free disk space - uses: jlumbroso/free-disk-space@main - with: - tool-cache: false + run: src/ci/scripts/free-disk-space.sh - name: Checkout repository uses: actions/checkout@v4 From cde400bb90d23c2381ab8cee95b17abaca2044c1 Mon Sep 17 00:00:00 2001 From: larzie Date: Fri, 13 Dec 2024 16:11:18 +0300 Subject: [PATCH 17/21] Fixup Signed-off-by: larzie --- .github/workflows/linux-release-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml index 4c3b0b3f9..6ea3e870d 100644 --- a/.github/workflows/linux-release-build.yml +++ b/.github/workflows/linux-release-build.yml @@ -25,7 +25,7 @@ jobs: steps: - name: Free disk space - run: src/ci/scripts/free-disk-space.sh + run: src/ci/free-disk-space.sh - name: Checkout repository uses: actions/checkout@v4 From cf1cfe9a6d81765f6fe8194034fa3fda0a560e76 Mon Sep 17 00:00:00 2001 From: larzie Date: Fri, 13 Dec 2024 16:15:48 +0300 Subject: [PATCH 18/21] Remove space Signed-off-by: larzie --- scripts/update-en-US-packs.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/update-en-US-packs.sh b/scripts/update-en-US-packs.sh index 959312753..7e37a09ad 100644 --- a/scripts/update-en-US-packs.sh +++ b/scripts/update-en-US-packs.sh @@ -1,2 +1 @@ - sh ./scripts/copy-language-pack.sh en-US From 90dbd0a21585de0c6d2cf11fc8ddc312ad4fc87e Mon Sep 17 00:00:00 2001 From: larzie Date: Fri, 13 Dec 2024 16:16:18 +0300 Subject: [PATCH 19/21] Remove space Signed-off-by: larzie --- scripts/download-language-packs.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/download-language-packs.sh b/scripts/download-language-packs.sh index 7fa70478f..6b7f79b7b 100644 --- a/scripts/download-language-packs.sh +++ b/scripts/download-language-packs.sh @@ -1,4 +1,3 @@ - set -ex CURRENT_DIR=$(pwd) @@ -18,7 +17,7 @@ update_language() { cd $langId echo "Updating $langId" - # move the contents from ../firefox-l10n/$langId to ./l10n/$langId + # Move the contents from ../firefox-l10n/$langId to ./l10n/$langId rsync -av --progress ../firefox-l10n/$langId/ . --exclude .git cd $CURRENT_DIR @@ -44,7 +43,7 @@ rm -rf ~/tools rm -rf ~/.git-cinnabar for lang in $(cat ./l10n/supported-languages); do - # remove every file except if it starts with "zen" + # Remove every file except if it starts with "zen" find ./l10n/$lang -type f -not -name "zen*" -delete done From 8bcc2fe4cca7515316f591589173be1811f55325 Mon Sep 17 00:00:00 2001 From: larzie Date: Sat, 14 Dec 2024 11:53:28 +0300 Subject: [PATCH 20/21] Update script Signed-off-by: larzie --- src/ci/free-disk-space.sh | 103 ++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 55 deletions(-) diff --git a/src/ci/free-disk-space.sh b/src/ci/free-disk-space.sh index 1c0244dcd..84566c6c3 100644 --- a/src/ci/free-disk-space.sh +++ b/src/ci/free-disk-space.sh @@ -1,18 +1,5 @@ #!/bin/bash -set -e - -fast_rmdir() { - cd "$@" || exit - pwd - ls - perl -e 'Unlink for glob "*"' -} - -list_installed_dpkg() { - dpkg --get-selections "$@" | grep -v deinstall | awk '{print $1}' -} - printSeparationLine() { str=${1:=} num=${2:-80} @@ -20,17 +7,17 @@ printSeparationLine() { output="" while [ $counter -le "$num" ]; do output="${output}${str}" - counter=$((counter + 1)) + counter=$((counter+1)) done echo "${output}" } -getAvailableSpace() { - echo $(df -a "$1" | awk 'NR > 1 {avail+=$4} END {print avail}') +getAvailableSpace() { + echo $(df -a $1 | awk 'NR > 1 {avail+=$4} END {print avail}') } -formatByteCount() { - echo $(numfmt --to=iec-i --suffix=B --padding=7 "$1"000) +formatByteCount() { + echo $(numfmt --to=iec-i --suffix=B --padding=7 $1'000') } printSavedSpace() { @@ -74,93 +61,98 @@ echo "" BEFORE=$(getAvailableSpace) -fast_rmdir "$AGENT_TOOLSDIRECTORY" || true +sudo rm -rf "$AGENT_TOOLSDIRECTORY" || true + AFTER=$(getAvailableSpace) -SAVED=$((AFTER - BEFORE)) +SAVED=$((AFTER-BEFORE)) printSavedSpace $SAVED "Agent tools" BEFORE=$(getAvailableSpace) -fast_rmdir /usr/local/share/powershell || true +sudo rm -rf /usr/local/share/powershell || true AFTER=$(getAvailableSpace) -SAVED=$((AFTER - BEFORE)) +SAVED=$((AFTER-BEFORE)) printSavedSpace $SAVED "Powershell" BEFORE=$(getAvailableSpace) -fast_rmdir /usr/local/share/chromium || true +sudo rm -rf /usr/local/share/chromium || true AFTER=$(getAvailableSpace) -SAVED=$((AFTER - BEFORE)) +SAVED=$((AFTER-BEFORE)) printSavedSpace $SAVED "Chromium" BEFORE=$(getAvailableSpace) -fast_rmdir /usr/local/lib/node_modules || true +sudo rm -rf /usr/local/lib/node_modules || true AFTER=$(getAvailableSpace) -SAVED=$((AFTER - BEFORE)) +SAVED=$((AFTER-BEFORE)) printSavedSpace $SAVED "Node modules" BEFORE=$(getAvailableSpace) -fast_rmdir /usr/share/swift || true +sudo rm -rf /usr/share/swift || true AFTER=$(getAvailableSpace) -SAVED=$((AFTER - BEFORE)) +SAVED=$((AFTER-BEFORE)) printSavedSpace $SAVED "Swift" BEFORE=$(getAvailableSpace) -fast_rmdir /usr/local/lib/android || true +sudo rm -rf /usr/local/lib/android || true AFTER=$(getAvailableSpace) -SAVED=$((AFTER - BEFORE)) +SAVED=$((AFTER-BEFORE)) printSavedSpace $SAVED "Android library" BEFORE=$(getAvailableSpace) -fast_rmdir /usr/share/dotnet || true +sudo rm -rf /usr/share/dotnet || true AFTER=$(getAvailableSpace) -SAVED=$((AFTER - BEFORE)) +SAVED=$((AFTER-BEFORE)) printSavedSpace $SAVED ".NET runtime" BEFORE=$(getAvailableSpace) -fast_rmdir /opt/ghc || true -fast_rmdir /usr/local/.ghcup || true +sudo rm -rf /opt/ghc || true +sudo rm -rf /usr/local/.ghcup || true AFTER=$(getAvailableSpace) -SAVED=$((AFTER - BEFORE)) +SAVED=$((AFTER-BEFORE)) printSavedSpace $SAVED "Haskell runtime" BEFORE=$(getAvailableSpace) -pkgs=$(list_installed_dpkg 'microsoft-edge-*' 'snapd-*' 'aspnetcore-*' 'dotnet-*' 'llvm-*' '*php*' 'mongodb-*' 'mysql-*' azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri 'google-cloud-*' 'gcloud-*' || true) - -gcloud_prerm='#!/bin/sh -echo $0 -if [ -d "/usr/lib/google-cloud-sdk" ]; then - echo "Cleaning Google Cloud CLI files..." - find /usr/lib/google-cloud-sdk -type f -delete -print | wc -l - rm -rf /usr/lib/google-cloud-sdk - echo "Cleaning Google Cloud CLI manuals..." - find /usr/share/man -type f -name "gcloud*" -delete -print | wc -l -fi' -echo "$gcloud_prerm" | sudo tee /var/lib/dpkg/info/google-cloud-cli-anthoscli.prerm >/dev/null -echo "$gcloud_prerm" | sudo tee /var/lib/dpkg/info/google-cloud-cli.prerm >/dev/null -sudo apt-get remove --autoremove -y $pkgs || echo "::warning::The command [sudo apt-get remove -y] failed to complete successfully. Proceeding..." +sudo apt-get remove -y '^aspnetcore-.*' || echo "::warning::The command [sudo apt-get remove -y '^aspnetcore-.*'] failed." +sudo apt-get remove -y '^dotnet-.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y '^dotnet-.*' --fix-missing] failed." +sudo apt-get remove -y '^llvm-.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y '^llvm-.*' --fix-missing] failed." +sudo apt-get remove -y 'php.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y 'php.*' --fix-missing] failed." +sudo apt-get remove -y '^mongodb-.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y '^mongodb-.*' --fix-missing] failed." +sudo apt-get remove -y '^mysql-.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y '^mysql-.*' --fix-missing] failed." +sudo apt-get remove -y azure-cli --fix-missing || echo "::warning::The command [sudo apt-get remove -y azure-cli --fix-missing] failed." +sudo apt-get remove -y google-cloud-sdk --fix-missing || echo "::warning::The command [sudo apt-get remove -y google-chrome-stable --fix-missing] failed." +sudo apt-get remove -y firefox --fix-missing || echo "::warning::The command [sudo apt-get remove -y firefox --fix-missing] failed." +sudo apt-get remove -y powershell --fix-missing || echo "::warning::The command [sudo apt-get remove -y powershell --fix-missing] failed." +sudo apt-get remove -y mono-devel --fix-missing || echo "::warning::The command [sudo apt-get remove -y mono-devel --fix-missing] failed." +sudo apt-get remove -y libgl1-mesa-dri --fix-missing || echo "::warning::The command [sudo apt-get remove -y libgl1-mesa-dri --fix-missing] failed." +sudo apt-get remove -y google-cloud-sdk --fix-missing || echo "::debug::The command [sudo apt-get remove -y google-cloud-sdk --fix-missing] failed." +sudo apt-get remove -y google-cloud-cli --fix-missing || echo "::debug::The command [sudo apt-get remove -y google-cloud-cli --fix-missing] failed." +sudo apt-get remove -y microsoft-edge-stable --fix-missing || echo "::debug::The command [sudo apt-get remove -y microsoft-edge-stable --fix-missing] failed." +sudo apt-get remove -y snapd --fix-missing || echo "::debug::The command [sudo apt-get remove -y snapd --fix-missing] failed." +sudo apt-get autoremove -y || echo "::warning::The command [sudo apt-get autoremove -y] failed." +sudo apt-get clean || echo "::warning::The command [sudo apt-get clean] failed." AFTER=$(getAvailableSpace) -SAVED=$((AFTER - BEFORE)) +SAVED=$((AFTER-BEFORE)) printSavedSpace $SAVED "Large misc. packages" BEFORE=$(getAvailableSpace) sudo docker image prune --all --force || true AFTER=$(getAvailableSpace) -SAVED=$((AFTER - BEFORE)) +SAVED=$((AFTER-BEFORE)) printSavedSpace $SAVED "Docker images" BEFORE=$(getAvailableSpace) sudo rm -rf "$AGENT_TOOLSDIRECTORY" || true AFTER=$(getAvailableSpace) -SAVED=$((AFTER - BEFORE)) +SAVED=$((AFTER-BEFORE)) printSavedSpace $SAVED "Tool cache" BEFORE=$(getAvailableSpace) sudo swapoff -a || true -sudo rm -f /mnt/swapfile || true +sudo rm -rf /mnt/swapfile || true free -h AFTER=$(getAvailableSpace) -SAVED=$((AFTER - BEFORE)) +SAVED=$((AFTER-BEFORE)) printSavedSpace $SAVED "Swap storage" AVAILABLE_END=$(getAvailableSpace) @@ -169,7 +161,8 @@ AVAILABLE_ROOT_END=$(getAvailableSpace '/') echo "" printDH "After clean-up:" +echo "" echo "/dev/root:" printSavedSpace $((AVAILABLE_ROOT_END - AVAILABLE_ROOT_INITIAL)) -echo "overall:" +echo "Overall:" printSavedSpace $((AVAILABLE_END - AVAILABLE_INITIAL)) From 4c0e07a5a6be65e3ca693674cc5c6d71efd6f179 Mon Sep 17 00:00:00 2001 From: larzie Date: Sat, 14 Dec 2024 11:54:08 +0300 Subject: [PATCH 21/21] Remove space Signed-off-by: larzie --- src/ci/free-disk-space.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/free-disk-space.sh b/src/ci/free-disk-space.sh index 84566c6c3..98931a02e 100644 --- a/src/ci/free-disk-space.sh +++ b/src/ci/free-disk-space.sh @@ -16,7 +16,7 @@ getAvailableSpace() { echo $(df -a $1 | awk 'NR > 1 {avail+=$4} END {print avail}') } -formatByteCount() { +formatByteCount() { echo $(numfmt --to=iec-i --suffix=B --padding=7 $1'000') }