Skip to content

Commit 5c55ccf

Browse files
committed
Simplify CI yaml.
1 parent 8edb9b9 commit 5c55ccf

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

.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 -F glfw/src-build -F glfw/static-link -F glfw/wayland --workspace
40+
run: cargo test --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 -F glfw/src-build -F glfw/static-link -F glfw/wayland --workspace -- -D warnings
84+
run: cargo clippy --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 -F glfw/src-build -F glfw/static-link -F glfw/wayland --workspace --verbose
113+
run: cargo build --workspace --verbose

Cargo.lock

Lines changed: 10 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ processing_render = { workspace = true }
3131
glfw = "0.60.0"
3232

3333
[target.'cfg(target_os = "linux")'.dev-dependencies]
34-
glfw = { version = "0.60.0", features = ["wayland"] }
34+
glfw = { version = "0.60.0", default-features = false, features = ["src-build", "static-link", "wayland", "x11"] }
3535

3636
[[example]]
3737
name = "rectangle"

0 commit comments

Comments
 (0)