Skip to content

Commit 4da333c

Browse files
committed
CONTENTIOUS: Run tests on linux through xvfb
1 parent 0ae4ee0 commit 4da333c

File tree

2 files changed

+26
-0
lines changed

2 files changed

+26
-0
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,24 @@ jobs:
4242
- uses: dtolnay/rust-toolchain@stable
4343
- name: Install Linux dependencies
4444
uses: ./.github/actions/install-linux-deps
45+
# At some point this may be merged into `install-linux-deps`, but for now it is its own step.
46+
- name: Install additional Linux dependencies for Vulkan
47+
if: ${{ runner.os == 'linux' }}
48+
run: |
49+
sudo add-apt-repository ppa:kisak/turtle -y
50+
sudo apt-get install --no-install-recommends libxkbcommon-x11-0 xvfb libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers
4551
- name: Build & run tests
52+
if: ${{ runner.os != 'linux' }}
4653
# See tools/ci/src/main.rs for the commands this runs
4754
run: cargo run -p ci -- test
4855
env:
4956
RUSTFLAGS: "-C debuginfo=0 -D warnings"
57+
- name: Build & run tests through xvfb
58+
if: ${{ runner.os == 'linux' }}
59+
# See tools/ci/src/main.rs for the commands this runs
60+
run: xvfb-run cargo run -p ci -- test
61+
env:
62+
RUSTFLAGS: "-C debuginfo=0 -D warnings"
5063

5164
ci:
5265
runs-on: ubuntu-latest

.github/workflows/weekly.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,24 @@ jobs:
4343
- uses: dtolnay/rust-toolchain@beta
4444
- name: Install Linux dependencies
4545
uses: ./.github/actions/install-linux-deps
46+
# At some point this may be merged into `install-linux-deps`, but for now it is its own step.
47+
- name: Install additional Linux dependencies for Vulkan
48+
if: ${{ runner.os == 'linux' }}
49+
run: |
50+
sudo add-apt-repository ppa:kisak/turtle -y
51+
sudo apt-get install --no-install-recommends libxkbcommon-x11-0 xvfb libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers
4652
- name: Build & run tests
53+
if: ${{ runner.os != 'linux' }}
4754
# See tools/ci/src/main.rs for the commands this runs
4855
run: cargo run -p ci -- test
4956
env:
5057
RUSTFLAGS: "-C debuginfo=0 -D warnings"
58+
- name: Build & run tests through xvfb
59+
if: ${{ runner.os == 'linux' }}
60+
# See tools/ci/src/main.rs for the commands this runs
61+
run: xvfb-run cargo run -p ci -- test
62+
env:
63+
RUSTFLAGS: "-C debuginfo=0 -D warnings"
5164

5265
lint:
5366
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)