From 4a99cb15af4bcaadca73978fb58327d4f3d52cb1 Mon Sep 17 00:00:00 2001 From: Christian Meissl Date: Mon, 6 Jan 2025 19:02:22 +0100 Subject: [PATCH 1/3] drm-extras: bump libdisplay-info to v0.2 --- smithay-drm-extras/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smithay-drm-extras/Cargo.toml b/smithay-drm-extras/Cargo.toml index c4d08871de7f..d30d705e15e5 100644 --- a/smithay-drm-extras/Cargo.toml +++ b/smithay-drm-extras/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT" authors = ["Bartłomiej Maryńczak "] [dependencies] -libdisplay-info = { version = "0.1.0", optional = true } +libdisplay-info = { version = "0.2.1", optional = true } drm = { version = "0.14.0" } [features] From 84f062bd35b23afd8ad22d6132fb61450cfb7582 Mon Sep 17 00:00:00 2001 From: Christian Meissl Date: Mon, 6 Jan 2025 19:12:33 +0100 Subject: [PATCH 2/3] CI: bump base image and include libdisplay-info --- .github/workflows/ci.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0c21b535ef7f..036a172b8a86 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: jobs: format: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout sources uses: actions/checkout@v3 @@ -27,7 +27,7 @@ jobs: run: cargo fmt --all -- --check clippy-check: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout sources uses: actions/checkout@v3 @@ -63,7 +63,7 @@ jobs: - name: Clean cargo cache of old items run: cargo cache clean-unref - name: System dependencies - run: sudo apt-get update; sudo apt-get install -y libdrm-dev libudev-dev libgbm-dev libxkbcommon-dev libegl1-mesa-dev libwayland-dev libinput-dev libdbus-1-dev libsystemd-dev libseat-dev + run: sudo apt-get update; sudo apt-get install -y libdrm-dev libudev-dev libgbm-dev libxkbcommon-dev libegl1-mesa-dev libwayland-dev libinput-dev libdbus-1-dev libsystemd-dev libseat-dev libdisplay-info-dev - name: Clippy Smithay run: cargo clippy --features "test_all_features" -- -D warnings - name: Clippy Anvil @@ -75,7 +75,7 @@ jobs: env: RUSTFLAGS: "-D warnings" - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: - smithay-check-features @@ -105,7 +105,7 @@ jobs: env: RUSTFLAGS: "-D warnings" - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: - smithay-check-features @@ -138,7 +138,7 @@ jobs: env: RUSTFLAGS: "-D warnings" - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout sources @@ -178,7 +178,7 @@ jobs: env: RUSTFLAGS: "-D warnings" - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout sources @@ -215,7 +215,7 @@ jobs: env: RUSTFLAGS: "-D warnings" - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout sources @@ -252,7 +252,7 @@ jobs: env: RUSTFLAGS: "-D warnings" - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout sources @@ -278,7 +278,7 @@ jobs: uses: taiki-e/install-action@cargo-hack - name: System dependencies - run: sudo apt-get update; sudo apt-get install -y libdrm-dev libudev-dev libgbm-dev libxkbcommon-dev libegl1-mesa-dev libwayland-dev libinput-dev libdbus-1-dev libsystemd-dev libseat-dev + run: sudo apt-get update; sudo apt-get install -y libdrm-dev libudev-dev libgbm-dev libxkbcommon-dev libegl1-mesa-dev libwayland-dev libinput-dev libdbus-1-dev libsystemd-dev libseat-dev libdisplay-info-dev - name: Test features env: @@ -312,7 +312,7 @@ jobs: RUSTFLAGS: "-D warnings" GRCOV_VERSION: "0.8.10" - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout sources @@ -349,7 +349,7 @@ jobs: run: cargo install grcov --version ${{ env.GRCOV_VERSION }} - name: System dependencies - run: sudo apt-get update; sudo apt-get install -y cmake libgtest-dev google-mock libboost-dev libxkbcommon-dev libwayland-dev + run: sudo apt-get update; sudo apt-get install -y cmake libgtest-dev google-mock libboost-dev libxkbcommon-dev libwayland-dev libdisplay-info-dev - name: WLCS build cache uses: actions/cache@v3 @@ -381,7 +381,7 @@ jobs: doc: name: Documentation on Github Pages - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: - smithay-check-features From 133476cd143029976d995bbf920c7e7a9919a386 Mon Sep 17 00:00:00 2001 From: Christian Meissl Date: Mon, 6 Jan 2025 19:33:39 +0100 Subject: [PATCH 3/3] CI: add missing pixman dependency --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 036a172b8a86..b28c6d0bbc69 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -201,7 +201,7 @@ jobs: uses: dtolnay/rust-toolchain@stable - name: System dependencies - run: sudo apt-get update; sudo apt-get install -y libdrm-dev libudev-dev libgbm-dev libxkbcommon-dev libegl1-mesa-dev libwayland-dev libinput-dev libdbus-1-dev libsystemd-dev libseat-dev + run: sudo apt-get update; sudo apt-get install -y libdrm-dev libudev-dev libgbm-dev libxkbcommon-dev libegl1-mesa-dev libwayland-dev libinput-dev libdbus-1-dev libsystemd-dev libseat-dev libpixman-1-dev - name: Run tests env: