Skip to content

Commit f5d50f2

Browse files
authored
Fix glib error
1 parent 82148cb commit f5d50f2

File tree

1 file changed

+24
-12
lines changed

1 file changed

+24
-12
lines changed

.github/workflows/rust.yml

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ env:
1919
jobs:
2020
lints:
2121
name: Run cargo fmt and cargo clippy
22-
runs-on: manjarolinux/build
22+
runs-on: ubuntu-22.04
2323
steps:
2424
- name: Checkout sources
2525
uses: actions/checkout@v2
@@ -30,8 +30,11 @@ jobs:
3030
toolchain: ${{ env.RUST_TOOLCHAIN }}
3131
components: rustfmt, clippy
3232
override: true
33-
- name: Install Dependancies
34-
run: sudo pacman -Syu libglib2.0-dev
33+
- name: Install dependencies
34+
run: |
35+
pip install --user pre-commit
36+
sudo apt install -y libgtk-3-dev
37+
sudo apt install -y libgtk-4-dev
3538
- name: Run cargo fmt
3639
uses: actions-rs/cargo@v1
3740
with:
@@ -44,7 +47,7 @@ jobs:
4447
args: --all-features -- -D warnings
4548
build-linux:
4649
name: Build for linux using cargo
47-
runs-on: manjarolinux/build
50+
runs-on: ubuntu-22.04
4851
needs: [lints]
4952
steps:
5053
- name: Checkout sources
@@ -55,16 +58,19 @@ jobs:
5558
profile: ${{ env.TOOLCHAIN_PROFILE }}
5659
toolchain: ${{ env.RUST_TOOLCHAIN }}
5760
override: true
58-
- name: Install Dependancies
59-
run: sudo apt-get install -y libglib2.0-dev
61+
- name: Install dependencies
62+
run: |
63+
pip install --user pre-commit
64+
sudo apt install -y libgtk-3-dev
65+
sudo apt install -y libgtk-4-dev
6066
- name: Run Build for Linux
6167
uses: actions-rs/cargo@v1
6268
with:
6369
command: build
6470
args: --verbose --target x86_64-unknown-linux-gnu
6571
test:
6672
name: Run cargo test
67-
runs-on: manjarolinux/build
73+
runs-on: ubuntu-22.04
6874
needs: [build-linux]
6975
steps:
7076
- name: Checkout sources
@@ -75,8 +81,11 @@ jobs:
7581
profile: ${{ env.TOOLCHAIN_PROFILE }}
7682
toolchain: ${{ env.RUST_TOOLCHAIN }}
7783
override: true
78-
- name: Install Dependancies
79-
run: sudo apt-get install -y libglib2.0-dev
84+
- name: Install dependencies
85+
run: |
86+
pip install --user pre-commit
87+
sudo apt install -y libgtk-3-dev
88+
sudo apt install -y libgtk-4-dev
8089
- name: Run cargo test -no-run
8190
uses: actions-rs/cargo@v1
8291
with:
@@ -89,7 +98,7 @@ jobs:
8998
args: --verbose
9099
coverage:
91100
name: Attempt to generate code coverage
92-
runs-on: manjarolinux/build
101+
runs-on: ubuntu-22.04
93102
needs: [test]
94103
steps:
95104
- name: Checkout sources
@@ -101,8 +110,11 @@ jobs:
101110
toolchain: ${{ env.RUST_TOOLCHAIN }}
102111
components: llvm-tools-preview
103112
override: true
104-
- name: Install Dependancies
105-
run: sudo apt-get install -y libglib2.0-dev
113+
- name: Install dependencies
114+
run: |
115+
pip install --user pre-commit
116+
sudo apt install -y libgtk-3-dev
117+
sudo apt install -y libgtk-4-dev
106118
- name: Generate coverage
107119
# runs cargo with defaults flags, using the default `lcov` output
108120
uses: Swatinem/fucov@v1

0 commit comments

Comments
 (0)