Skip to content

Commit c40a9b0

Browse files
committed
Factor our CI setup. Install wayland.
1 parent e54afd1 commit c40a9b0

File tree

2 files changed

+22
-8
lines changed

2 files changed

+22
-8
lines changed

.github/actions/setup/action.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: 'Setup Build Environment'
2+
description: 'Install system dependencies and Rust toolchain'
3+
inputs:
4+
components:
5+
description: 'Rust components to install'
6+
required: false
7+
default: ''
8+
runs:
9+
using: 'composite'
10+
steps:
11+
- name: Install system dependencies
12+
run: sudo apt-get update && sudo apt-get install -y libwayland-dev
13+
shell: bash
14+
15+
- name: Install Rust
16+
uses: dtolnay/rust-toolchain@stable
17+
with:
18+
components: ${{ inputs.components }}

.github/workflows/ci.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v4
1818

19-
- name: Install Rust
20-
uses: dtolnay/rust-toolchain@stable
19+
- uses: ./.github/actions/setup
2120

2221
- name: Cache cargo registry
2322
uses: actions/cache@v4
@@ -46,8 +45,7 @@ jobs:
4645
steps:
4746
- uses: actions/checkout@v4
4847

49-
- name: Install Rust
50-
uses: dtolnay/rust-toolchain@stable
48+
- uses: ./.github/actions/setup
5149
with:
5250
components: rustfmt
5351

@@ -60,8 +58,7 @@ jobs:
6058
steps:
6159
- uses: actions/checkout@v4
6260

63-
- name: Install Rust
64-
uses: dtolnay/rust-toolchain@stable
61+
- uses: ./.github/actions/setup
6562
with:
6663
components: clippy
6764

@@ -92,8 +89,7 @@ jobs:
9289
steps:
9390
- uses: actions/checkout@v4
9491

95-
- name: Install Rust
96-
uses: dtolnay/rust-toolchain@stable
92+
- uses: ./.github/actions/setup
9793

9894
- name: Cache cargo registry
9995
uses: actions/cache@v4

0 commit comments

Comments
 (0)