mirror of
https://github.com/maplibre/maplibre-rs.git
synced 2025-12-08 19:05:57 +00:00
Upgrade to Ubuntu 22 in CI (#215)
* Use apt-get * Upgarde ubuntu * Disable upgrading drivers * Add messages to test * Add comment
This commit is contained in:
parent
6367d3641f
commit
1b73ad5908
17
.github/actions/install-driver/action.yml
vendored
17
.github/actions/install-driver/action.yml
vendored
@ -4,19 +4,20 @@ description: Install drivers
|
|||||||
runs:
|
runs:
|
||||||
using: "composite"
|
using: "composite"
|
||||||
steps:
|
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
|
- name: Install Mesa Dependencies
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: sudo apt-get install -y libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers
|
||||||
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
|
|
||||||
- name: Install wgpu-info
|
- name: Install wgpu-info
|
||||||
shell: bash
|
shell: bash
|
||||||
# Rev is for 0.14.1: https://github.com/gfx-rs/wgpu/tree/v0.14.1
|
# 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
|
- name: wgpu-info
|
||||||
shell: bash
|
shell: bash
|
||||||
run: wgpu-info
|
run: wgpu-info
|
||||||
|
|||||||
4
.github/workflows/build-deploy-docs.yml
vendored
4
.github/workflows/build-deploy-docs.yml
vendored
@ -11,7 +11,7 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
build-docs:
|
build-docs:
|
||||||
name: Build
|
name: Build
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Setup
|
- name: Setup
|
||||||
@ -44,7 +44,7 @@ jobs:
|
|||||||
needs: build-docs
|
needs: build-docs
|
||||||
if: inputs.deploy
|
if: inputs.deploy
|
||||||
name: Deploy
|
name: Deploy
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Download api-docs
|
- name: Download api-docs
|
||||||
|
|||||||
2
.github/workflows/demo-linux.yml
vendored
2
.github/workflows/demo-linux.yml
vendored
@ -6,7 +6,7 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
demo-linux:
|
demo-linux:
|
||||||
name: Build
|
name: Build
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Setup
|
- name: Setup
|
||||||
|
|||||||
2
.github/workflows/library-android.yml
vendored
2
.github/workflows/library-android.yml
vendored
@ -6,7 +6,7 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
library-android:
|
library-android:
|
||||||
name: Build
|
name: Build
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Setup
|
- name: Setup
|
||||||
|
|||||||
4
.github/workflows/library-web.yml
vendored
4
.github/workflows/library-web.yml
vendored
@ -24,7 +24,7 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
name: Build
|
name: Build
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Setup
|
- name: Setup
|
||||||
@ -64,7 +64,7 @@ jobs:
|
|||||||
needs: [build]
|
needs: [build]
|
||||||
if: inputs.deploy
|
if: inputs.deploy
|
||||||
name: Deploy
|
name: Deploy
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- uses: actions/download-artifact@v3
|
- uses: actions/download-artifact@v3
|
||||||
|
|||||||
2
.github/workflows/run-benchmarks.yml
vendored
2
.github/workflows/run-benchmarks.yml
vendored
@ -6,7 +6,7 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
run-benchmarks:
|
run-benchmarks:
|
||||||
name: Benchmark
|
name: Benchmark
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Setup
|
- name: Setup
|
||||||
|
|||||||
2
.github/workflows/run-checks.yml
vendored
2
.github/workflows/run-checks.yml
vendored
@ -6,7 +6,7 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
run-checks:
|
run-checks:
|
||||||
name: Check
|
name: Check
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Setup
|
- name: Setup
|
||||||
|
|||||||
2
.github/workflows/run-tests.yml
vendored
2
.github/workflows/run-tests.yml
vendored
@ -6,7 +6,7 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
run-tests:
|
run-tests:
|
||||||
name: Test
|
name: Test
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Setup
|
- name: Setup
|
||||||
|
|||||||
@ -453,7 +453,7 @@ mod tests {
|
|||||||
let instance = wgpu::Instance::new(backends);
|
let instance = wgpu::Instance::new(backends);
|
||||||
let adapter = wgpu::util::initialize_adapter_from_env_or_default(&instance, backends, None)
|
let adapter = wgpu::util::initialize_adapter_from_env_or_default(&instance, backends, None)
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.expect("Unable to initialize adapter");
|
||||||
|
|
||||||
let (device, queue) = adapter
|
let (device, queue) = adapter
|
||||||
.request_device(
|
.request_device(
|
||||||
@ -466,7 +466,7 @@ mod tests {
|
|||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
.ok()
|
.ok()
|
||||||
.unwrap();
|
.expect("Unable to request device");
|
||||||
|
|
||||||
let render_state = RenderState::new(Surface::from_image(
|
let render_state = RenderState::new(Surface::from_image(
|
||||||
&device,
|
&device,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user