From 6685e7a1bd464bec571018ee5b56cb4affa73951 Mon Sep 17 00:00:00 2001 From: Slinetrac Date: Wed, 18 Mar 2026 13:34:46 +0800 Subject: [PATCH] revert: CI autobuild on Ubuntu 22.04 (#6547) * chore: config * Revert "ci: update Ubuntu version to 24.04 and adjust dependencies in autobuild workflow" This reverts commit 863a80df43eb1d9a30c79395a4a5c57971430f20. --- .gitattributes | 3 ++- .github/workflows/autobuild.yml | 15 +++------------ eslint.config.ts | 6 +++++- package.json | 2 +- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.gitattributes b/.gitattributes index c1965c216..7a9a5f4a9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ -.github/workflows/*.lock.yml linguist-generated=true merge=ours \ No newline at end of file +.github/workflows/*.lock.yml linguist-generated=true merge=ours +Changelog.md merge=union diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 884b458c7..353272fae 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -137,7 +137,7 @@ jobs: target: aarch64-apple-darwin - os: macos-latest target: x86_64-apple-darwin - - os: ubuntu-24.04 + - os: ubuntu-22.04 target: x86_64-unknown-linux-gnu runs-on: ${{ matrix.os }} steps: @@ -165,19 +165,10 @@ jobs: cache-workspace-crates: true - name: Install dependencies (ubuntu only) - if: matrix.os == 'ubuntu-24.04' + if: matrix.os == 'ubuntu-22.04' run: | sudo apt-get update - sudo apt install \ - libwebkit2gtk-4.1-dev \ - build-essential \ - curl \ - wget \ - file \ - libxdo-dev \ - libssl-dev \ - libayatana-appindicator3-dev \ - librsvg2-dev + sudo apt-get install -y libxslt1.1 libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev patchelf - name: Install x86 OpenSSL (macOS only) if: matrix.target == 'x86_64-apple-darwin' diff --git a/eslint.config.ts b/eslint.config.ts index 5ca52f651..8f20d6117 100644 --- a/eslint.config.ts +++ b/eslint.config.ts @@ -34,7 +34,11 @@ export default defineConfig([ globals: globals.browser, parserOptions: { projectService: { - allowDefaultProject: ['eslint.config.ts', 'src/polyfills/*.js'], + allowDefaultProject: [ + 'eslint.config.ts', + `vite.config.mts`, + 'src/polyfills/*.js', + ], }, }, }, diff --git a/package.json b/package.json index 29fe73ec8..9ac6a4e35 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "eslint --fix --max-warnings=0", "prettier --write" ], - "*.{js,mjs,css,scss,json,md,toml}": [ + "*.{js,mjs,css,scss,json,md,toml,yaml,yml}": [ "prettier --write" ] },