Skip to content

Commit 2e6c7d2

Browse files
authored
Fix glfw build on CI for 0.60 (#7)
1 parent ca4bbcb commit 2e6c7d2

File tree

4 files changed

+375
-489
lines changed

4 files changed

+375
-489
lines changed

.github/actions/setup/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ runs:
99
using: 'composite'
1010
steps:
1111
- name: Install system dependencies
12-
run: sudo apt-get update && sudo apt-get install -y g++ pkg-config libx11-dev libasound2-dev libudev-dev libxkbcommon-x11-0 libwayland-dev libxkbcommon-dev libglfw3-dev
12+
run: sudo apt-get update && sudo apt-get install -y g++ cmake pkg-config libx11-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libasound2-dev libudev-dev libxkbcommon-x11-0 libwayland-dev libxkbcommon-dev wayland-protocols libdecor-0-dev libegl1-mesa-dev libwayland-egl1-mesa
1313
shell: bash
1414

1515
- name: Install Rust

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
key: ${{ runner.os }}-target-${{ hashFiles('**/Cargo.lock') }}
3838

3939
- name: Run tests
40-
run: cargo test --all-features --workspace
40+
run: cargo test -F glfw/src-build -F glfw/static-link --workspace
4141

4242
fmt:
4343
name: Format
@@ -81,7 +81,7 @@ jobs:
8181
key: ${{ runner.os }}-clippy-target-${{ hashFiles('**/Cargo.lock') }}
8282

8383
- name: Run clippy
84-
run: cargo clippy --all-features --workspace -- -D warnings
84+
run: cargo clippy -F glfw/src-build -F glfw/static-link --workspace -- -D warnings
8585

8686
build:
8787
name: Build
@@ -110,4 +110,4 @@ jobs:
110110
key: ${{ runner.os }}-build-target-${{ hashFiles('**/Cargo.lock') }}
111111

112112
- name: Build
113-
run: cargo build --all-features --workspace --verbose
113+
run: cargo build -F glfw/src-build -F glfw/static-link --workspace --verbose

0 commit comments

Comments
 (0)