From b8f4e4addac12d7810776154feed8fcacb361f33 Mon Sep 17 00:00:00 2001 From: zhom <2717306+zhom@users.noreply.github.com> Date: Tue, 2 Sep 2025 19:26:54 +0400 Subject: [PATCH] build: switch back to ubuntu 22.04 runner --- .github/workflows/lint-rs.yml | 8 ++++---- .github/workflows/release.yml | 6 +++--- .github/workflows/rolling-release.yml | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/lint-rs.yml b/.github/workflows/lint-rs.yml index 47c7b4a..cf7b7d9 100644 --- a/.github/workflows/lint-rs.yml +++ b/.github/workflows/lint-rs.yml @@ -31,7 +31,7 @@ jobs: build: strategy: matrix: - os: [macos-latest, ubuntu-18.04] + os: [macos-latest, ubuntu-22.04] runs-on: ${{ matrix.os }} @@ -65,7 +65,7 @@ jobs: run: cargo install banderole - name: Install dependencies (Ubuntu only) - if: matrix.os == 'ubuntu-18.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 @@ -77,7 +77,7 @@ jobs: shell: bash working-directory: ./nodecar run: | - if [[ "${{ matrix.os }}" == "ubuntu-18.04" ]]; then + if [[ "${{ matrix.os }}" == "ubuntu-22.04" ]]; then pnpm run build:linux-x64 elif [[ "${{ matrix.os }}" == "macos-latest" ]]; then pnpm run build:mac-aarch64 @@ -94,7 +94,7 @@ jobs: shell: bash run: | mkdir -p src-tauri/binaries - if [[ "${{ matrix.os }}" == "ubuntu-18.04" ]]; then + if [[ "${{ matrix.os }}" == "ubuntu-22.04" ]]; then cp nodecar/nodecar-bin src-tauri/binaries/nodecar-x86_64-unknown-linux-gnu elif [[ "${{ matrix.os }}" == "macos-latest" ]]; then cp nodecar/nodecar-bin src-tauri/binaries/nodecar-aarch64-apple-darwin diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 138eba7..18ae653 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -78,13 +78,13 @@ jobs: target: "x86_64-apple-darwin" pkg_target: "latest-macos-x64" nodecar_script: "build:mac-x86_64" - - platform: "ubuntu-18.04" + - platform: "ubuntu-22.04" args: "--target x86_64-unknown-linux-gnu --verbose" arch: "x86_64" target: "x86_64-unknown-linux-gnu" pkg_target: "latest-linux-x64" nodecar_script: "build:linux-x64" - - platform: "ubuntu-18.04-arm" + - platform: "ubuntu-22.04-arm" args: "--target aarch64-unknown-linux-gnu --verbose" arch: "aarch64" target: "aarch64-unknown-linux-gnu" @@ -122,7 +122,7 @@ jobs: targets: ${{ matrix.target }} - name: Install dependencies (Ubuntu only) - if: matrix.platform == 'ubuntu-18.04' || matrix.platform == 'ubuntu-18.04-arm' + if: matrix.platform == 'ubuntu-22.04' || matrix.platform == 'ubuntu-22.04-arm' run: | sudo apt-get update sudo apt-get install -y libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev pkg-config xdg-utils diff --git a/.github/workflows/rolling-release.yml b/.github/workflows/rolling-release.yml index 0171d74..8136f3d 100644 --- a/.github/workflows/rolling-release.yml +++ b/.github/workflows/rolling-release.yml @@ -77,13 +77,13 @@ jobs: target: "x86_64-apple-darwin" pkg_target: "latest-macos-x64" nodecar_script: "build:mac-x86_64" - - platform: "ubuntu-18.04" + - platform: "ubuntu-22.04" args: "--target x86_64-unknown-linux-gnu --verbose" arch: "x86_64" target: "x86_64-unknown-linux-gnu" pkg_target: "latest-linux-x64" nodecar_script: "build:linux-x64" - - platform: "ubuntu-18.04-arm" + - platform: "ubuntu-22.04-arm" args: "--target aarch64-unknown-linux-gnu --verbose" arch: "aarch64" target: "aarch64-unknown-linux-gnu" @@ -121,7 +121,7 @@ jobs: targets: ${{ matrix.target }} - name: Install dependencies (Ubuntu only) - if: matrix.platform == 'ubuntu-18.04' || matrix.platform == 'ubuntu-18.04-arm' + if: matrix.platform == 'ubuntu-22.04' || matrix.platform == 'ubuntu-22.04-arm' run: | sudo apt-get update sudo apt-get install -y libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev pkg-config xdg-utils