Skip to content

Commit 4bb1edf

Browse files
GuillaumeGomezGuillaumeGomez
authored
Merge pull request gtk-rs#985 from GuillaumeGomez/fix-ci
Fix CI
2 parents cea2f7c + 96fce66 commit 4bb1edf

4 files changed

Lines changed: 16 additions & 42 deletions

File tree

‎.github/workflows/main.yaml‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
os: [ubuntu-latest]
18+
os: [ubuntu-20.04]
1919
toolchain: [stable]
2020

2121
defaults:
@@ -49,28 +49,28 @@ jobs:
4949
path: target
5050
key: checks-${{ runner.os }}-cargo-target-dir-${{ steps.toolchain.outputs.rustc_hash }}
5151
- name: Install packages from apt
52-
run: sudo apt install libgtk-3-dev libssh2-1-dev
53-
if: matrix.os == 'ubuntu-latest'
52+
run: sudo apt install libgtk-3-dev libssh2-1-dev libglib2.0-dev libgraphene-1.0-dev libcairo-gobject2 libcairo2-dev
53+
if: matrix.os == 'ubuntu-20.04'
5454
- name: "Run clippy"
5555
uses: actions-rs/cargo@v1
5656
with:
5757
command: clippy
5858
args: --release --tests -- -D warnings
59-
if: matrix.os == 'ubuntu-latest'
59+
if: matrix.os == 'ubuntu-20.04'
6060
- name: "Run formatting check"
6161
uses: actions-rs/cargo@v1
6262
with:
6363
command: fmt
6464
args: -- --check
65-
if: matrix.os == 'ubuntu-latest'
65+
if: matrix.os == 'ubuntu-20.04'
6666

6767
build:
6868
name: "Build/Test"
6969
runs-on: ${{ matrix.os }}
7070
strategy:
7171
fail-fast: false
7272
matrix:
73-
os: [ubuntu-latest]
73+
os: [ubuntu-20.04]
7474
toolchain: [nightly, stable]
7575
include:
7676
- os: windows-latest
@@ -121,8 +121,8 @@ jobs:
121121
path: target
122122
key: build-${{ runner.os }}-cargo-target-dir-${{ steps.toolchain.outputs.rustc_hash }}
123123
- name: Install packages from apt
124-
run: sudo apt install libgtk-3-dev libssh2-1-dev
125-
if: matrix.os == 'ubuntu-latest'
124+
run: sudo apt install libgtk-3-dev libssh2-1-dev libglib2.0-dev libgraphene-1.0-dev libcairo-gobject2 libcairo2-dev
125+
if: matrix.os == 'ubuntu-20.04'
126126
- name: Install toolchain packages with pacman
127127
run: pacman --noconfirm -S base-devel mingw-w64-${{ matrix.arch }}-toolchain
128128
if: matrix.os == 'windows-latest'
@@ -157,23 +157,16 @@ jobs:
157157
cd tests/sys/secret-sys
158158
cargo test -- --nocapture
159159
if: matrix.os == 'windows-latest'
160-
- name: "Acquire GTK"
160+
- name: "Acquire gtk-rs"
161161
uses: actions/checkout@v2
162162
with:
163-
repository: gtk-rs/gtk
163+
repository: gtk-rs/gtk-rs
164164
ref: master
165-
path: gtk-test
166-
if: matrix.os == 'ubuntu-latest'
165+
path: gtk-rs
166+
if: matrix.os == 'ubuntu-20.04'
167167
- name: "Attempt to rebuild GTK gir"
168-
run: cd gtk-test && ../target/release/gir -d ../tests/gir-files/ -o . && rm ../Cargo.* && cargo build
169-
if: matrix.os == 'ubuntu-latest'
170-
- name: "Acquire gio"
171-
uses: actions/checkout@v2
172-
with:
173-
repository: gtk-rs/gio
174-
ref: master
175-
path: gio
176-
if: matrix.os == 'ubuntu-latest'
168+
run: cd gtk-rs && python3 generator.py --no-fmt --gir-path ../target/release/gir --gir-files ../tests/gir-files/ && rm ../Cargo.* && cargo build
169+
if: matrix.os == 'ubuntu-20.04'
177170
- name: "Rebuild gio"
178-
run: cd gio && ../target/release/gir -d ../tests/gir-files/ -o . && cargo test
179-
if: matrix.os == 'ubuntu-latest'
171+
run: cd gtk-rs/gio && cargo test
172+
if: matrix.os == 'ubuntu-20.04'

‎src/codegen/enums.rs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ fn generate_enum(
165165

166166
if config.generate_display_trait {
167167
// Generate Display trait implementation.
168-
cfg_deprecated(w, env, enum_.deprecated_version, false, 0)?;
169168
version_condition(w, env, enum_.version, false, 0)?;
170169
writeln!(
171170
w,
@@ -175,7 +174,6 @@ fn generate_enum(
175174
enum_.name
176175
)?;
177176
for member in &members {
178-
cfg_deprecated(w, env, member.deprecated_version, false, 3)?;
179177
version_condition(w, env, member.version, false, 3)?;
180178
writeln!(w, "\t\t\t{0}::{1} => \"{1}\",", enum_.name, member.name)?;
181179
}
@@ -189,7 +187,6 @@ fn generate_enum(
189187
}
190188

191189
// Generate ToGlib trait implementation.
192-
cfg_deprecated(w, env, enum_.deprecated_version, false, 0)?;
193190
version_condition(w, env, enum_.version, false, 0)?;
194191
writeln!(
195192
w,
@@ -204,7 +201,6 @@ impl ToGlib for {name} {{
204201
ffi_name = enum_.c_type
205202
)?;
206203
for member in &members {
207-
cfg_deprecated(w, env, member.deprecated_version, false, 3)?;
208204
version_condition(w, env, member.version, false, 3)?;
209205
writeln!(
210206
w,
@@ -229,7 +225,6 @@ impl ToGlib for {name} {{
229225
};
230226

231227
// Generate FromGlib trait implementation.
232-
cfg_deprecated(w, env, enum_.deprecated_version, false, 0)?;
233228
version_condition(w, env, enum_.version, false, 0)?;
234229
writeln!(
235230
w,
@@ -243,7 +238,6 @@ impl FromGlib<{sys_crate_name}::{ffi_name}> for {name} {{
243238
assert = assert
244239
)?;
245240
for member in &members {
246-
cfg_deprecated(w, env, member.deprecated_version, false, 3)?;
247241
version_condition(w, env, member.version, false, 3)?;
248242
writeln!(
249243
w,
@@ -265,7 +259,6 @@ impl FromGlib<{sys_crate_name}::{ffi_name}> for {name} {{
265259
if let Some(ref domain) = enum_.error_domain {
266260
let has_failed_member = members.iter().any(|m| m.name == "Failed");
267261

268-
cfg_deprecated(w, env, enum_.deprecated_version, false, 0)?;
269262
version_condition(w, env, enum_.version, false, 0)?;
270263
writeln!(
271264
w,
@@ -311,7 +304,6 @@ impl FromGlib<{sys_crate_name}::{ffi_name}> for {name} {{
311304
)?;
312305

313306
for member in &members {
314-
cfg_deprecated(w, env, member.deprecated_version, false, 3)?;
315307
version_condition(w, env, member.version, false, 3)?;
316308
writeln!(
317309
w,
@@ -343,7 +335,6 @@ impl FromGlib<{sys_crate_name}::{ffi_name}> for {name} {{
343335
.max()
344336
.flatten();
345337

346-
cfg_deprecated(w, env, enum_.deprecated_version, false, 0)?;
347338
version_condition(w, env, version, false, 0)?;
348339
writeln!(
349340
w,
@@ -358,7 +349,6 @@ impl FromGlib<{sys_crate_name}::{ffi_name}> for {name} {{
358349
)?;
359350
writeln!(w)?;
360351

361-
cfg_deprecated(w, env, enum_.deprecated_version, false, 0)?;
362352
version_condition(w, env, version, false, 0)?;
363353
writeln!(
364354
w,
@@ -371,7 +361,6 @@ impl FromGlib<{sys_crate_name}::{ffi_name}> for {name} {{
371361
)?;
372362
writeln!(w)?;
373363

374-
cfg_deprecated(w, env, enum_.deprecated_version, false, 0)?;
375364
version_condition(w, env, version, false, 0)?;
376365
writeln!(
377366
w,
@@ -384,7 +373,6 @@ impl FromGlib<{sys_crate_name}::{ffi_name}> for {name} {{
384373
)?;
385374
writeln!(w)?;
386375

387-
cfg_deprecated(w, env, enum_.deprecated_version, false, 0)?;
388376
version_condition(w, env, version, false, 0)?;
389377
writeln!(
390378
w,

‎src/codegen/flags.rs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ fn generate_flags(env: &Env, w: &mut dyn Write, flags: &Bitfield, config: &GObje
114114
"
115115
)?;
116116

117-
cfg_deprecated(w, env, flags.deprecated_version, false, 0)?;
118117
version_condition(w, env, flags.version, false, 0)?;
119118
writeln!(
120119
w,
@@ -138,7 +137,6 @@ impl ToGlib for {name} {{
138137
""
139138
};
140139

141-
cfg_deprecated(w, env, flags.deprecated_version, false, 0)?;
142140
version_condition(w, env, flags.version, false, 0)?;
143141
writeln!(
144142
w,
@@ -162,7 +160,6 @@ impl FromGlib<{sys_crate_name}::{ffi_name}> for {name} {{
162160
.max()
163161
.flatten();
164162

165-
cfg_deprecated(w, env, flags.deprecated_version, false, 0)?;
166163
version_condition(w, env, version, false, 0)?;
167164
writeln!(
168165
w,
@@ -177,7 +174,6 @@ impl FromGlib<{sys_crate_name}::{ffi_name}> for {name} {{
177174
)?;
178175
writeln!(w)?;
179176

180-
cfg_deprecated(w, env, flags.deprecated_version, false, 0)?;
181177
version_condition(w, env, version, false, 0)?;
182178
writeln!(
183179
w,
@@ -190,7 +186,6 @@ impl FromGlib<{sys_crate_name}::{ffi_name}> for {name} {{
190186
)?;
191187
writeln!(w)?;
192188

193-
cfg_deprecated(w, env, flags.deprecated_version, false, 0)?;
194189
version_condition(w, env, version, false, 0)?;
195190
writeln!(
196191
w,
@@ -203,7 +198,6 @@ impl FromGlib<{sys_crate_name}::{ffi_name}> for {name} {{
203198
)?;
204199
writeln!(w)?;
205200

206-
cfg_deprecated(w, env, flags.deprecated_version, false, 0)?;
207201
version_condition(w, env, version, false, 0)?;
208202
writeln!(
209203
w,

‎src/codegen/general.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,6 @@ pub fn declare_default_from_new(
645645
&& f.parameters.rust_parameters.is_empty()
646646
}) {
647647
writeln!(w)?;
648-
cfg_deprecated(w, env, func.deprecated_version, false, 0)?;
649648
version_condition(w, env, func.version, false, 0)?;
650649
writeln!(w, "impl Default for {} {{", name)?;
651650
writeln!(w, " fn default() -> Self {{")?;

0 commit comments

Comments
 (0)