From 1b73ad5908cce0c372fd218118b82c1719174c11 Mon Sep 17 00:00:00 2001 From: Max Ammann Date: Sun, 13 Nov 2022 11:30:59 +0100 Subject: [PATCH] Upgrade to Ubuntu 22 in CI (#215) * Use apt-get * Upgarde ubuntu * Disable upgrading drivers * Add messages to test * Add comment --- .github/actions/install-driver/action.yml | 17 +++++++++-------- .github/workflows/build-deploy-docs.yml | 4 ++-- .github/workflows/demo-linux.yml | 2 +- .github/workflows/library-android.yml | 2 +- .github/workflows/library-web.yml | 4 ++-- .github/workflows/run-benchmarks.yml | 2 +- .github/workflows/run-checks.yml | 2 +- .github/workflows/run-tests.yml | 2 +- maplibre/src/render/mod.rs | 4 ++-- 9 files changed, 20 insertions(+), 19 deletions(-) diff --git a/.github/actions/install-driver/action.yml b/.github/actions/install-driver/action.yml index ee97b43a..26754fcd 100644 --- a/.github/actions/install-driver/action.yml +++ b/.github/actions/install-driver/action.yml @@ -4,19 +4,20 @@ description: Install drivers runs: using: "composite" steps: + # lavapipe in Ubuntu 20.04 SEGVs. We can fix that with this PPA. + # On Ubuntu 22.04 (currently used) using the PPA introduces SEGVs. + #- name: Use oibaf PPA for drivers + # shell: bash + # run: | + # sudo apt-get update -y -qq + # sudo add-apt-repository ppa:oibaf/graphics-drivers -y - name: Install Mesa Dependencies shell: bash - run: | - sudo apt-get update -y -qq - - # Get latest drivers. The lavapipe in Ubuntu 20.04 SEGVs. - sudo add-apt-repository ppa:oibaf/graphics-drivers -y - - sudo apt install -y libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers + run: sudo apt-get install -y libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers - name: Install wgpu-info shell: bash # Rev is for 0.14.1: https://github.com/gfx-rs/wgpu/tree/v0.14.1 - run: cargo install --debug --git "https://github.com/gfx-rs/wgpu" --rev 77b9a99cf4c7ca2b6d46124f9e48e510c04b605d wgpu-info + run: cargo install --force --debug --git "https://github.com/gfx-rs/wgpu" --rev 77b9a99cf4c7ca2b6d46124f9e48e510c04b605d wgpu-info - name: wgpu-info shell: bash run: wgpu-info diff --git a/.github/workflows/build-deploy-docs.yml b/.github/workflows/build-deploy-docs.yml index 612f9a85..bb0b4f25 100644 --- a/.github/workflows/build-deploy-docs.yml +++ b/.github/workflows/build-deploy-docs.yml @@ -11,7 +11,7 @@ on: jobs: build-docs: name: Build - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: Setup @@ -44,7 +44,7 @@ jobs: needs: build-docs if: inputs.deploy name: Deploy - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: Download api-docs diff --git a/.github/workflows/demo-linux.yml b/.github/workflows/demo-linux.yml index 0d39d8d0..74129467 100644 --- a/.github/workflows/demo-linux.yml +++ b/.github/workflows/demo-linux.yml @@ -6,7 +6,7 @@ on: jobs: demo-linux: name: Build - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: Setup diff --git a/.github/workflows/library-android.yml b/.github/workflows/library-android.yml index f8f3191e..31aa48d4 100644 --- a/.github/workflows/library-android.yml +++ b/.github/workflows/library-android.yml @@ -6,7 +6,7 @@ on: jobs: library-android: name: Build - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: Setup diff --git a/.github/workflows/library-web.yml b/.github/workflows/library-web.yml index 38ca0ead..d7815203 100644 --- a/.github/workflows/library-web.yml +++ b/.github/workflows/library-web.yml @@ -24,7 +24,7 @@ on: jobs: build: name: Build - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: Setup @@ -64,7 +64,7 @@ jobs: needs: [build] if: inputs.deploy name: Deploy - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - uses: actions/download-artifact@v3 diff --git a/.github/workflows/run-benchmarks.yml b/.github/workflows/run-benchmarks.yml index 7e5fbdf0..b7ad745f 100644 --- a/.github/workflows/run-benchmarks.yml +++ b/.github/workflows/run-benchmarks.yml @@ -6,7 +6,7 @@ on: jobs: run-benchmarks: name: Benchmark - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: Setup diff --git a/.github/workflows/run-checks.yml b/.github/workflows/run-checks.yml index 54963cf0..4a844220 100644 --- a/.github/workflows/run-checks.yml +++ b/.github/workflows/run-checks.yml @@ -6,7 +6,7 @@ on: jobs: run-checks: name: Check - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: Setup diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index fcd443f0..3cf2231a 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -6,7 +6,7 @@ on: jobs: run-tests: name: Test - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: Setup diff --git a/maplibre/src/render/mod.rs b/maplibre/src/render/mod.rs index b83ec1d2..691ff07f 100644 --- a/maplibre/src/render/mod.rs +++ b/maplibre/src/render/mod.rs @@ -453,7 +453,7 @@ mod tests { let instance = wgpu::Instance::new(backends); let adapter = wgpu::util::initialize_adapter_from_env_or_default(&instance, backends, None) .await - .unwrap(); + .expect("Unable to initialize adapter"); let (device, queue) = adapter .request_device( @@ -466,7 +466,7 @@ mod tests { ) .await .ok() - .unwrap(); + .expect("Unable to request device"); let render_state = RenderState::new(Surface::from_image( &device,