Merge pull request #6 from antoyo/fix/ci

Fix the CI
antoyo · May 17, 2022 · 8feb658 · 8feb658
2 parents 7373faa + 012b83a
commit 8feb658
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -8,23 +8,20 @@ name: CI
 jobs:
   build:
     runs-on: ubuntu-latest
-    container:
-      image: ubuntu:20.10
     strategy:
       matrix:
         rust:
           - stable
           - beta
           - nightly
-          - "1.48.0"
     env:
         DISPLAY: ":99.0"
         # Workaround to avoid getting stuck by apt about choosing a timezone.
         DEBIAN_FRONTEND: noninteractive
         TZ: America/New_York
     steps:
-      - run: apt-get update -y
-      - run: apt-get install -y libgtk-3-dev libglib2.0-dev libgraphene-1.0-dev git xvfb curl libcairo-gobject2 libcairo2-dev libxdo-dev libwebkit2gtk-4.0-dev openbox
+      - run: sudo apt-get update -y
+      - run: sudo apt-get install -y libgtk-3-dev libglib2.0-dev libgraphene-1.0-dev git xvfb curl libcairo-gobject2 libcairo2-dev libxdo-dev libwebkit2gtk-4.0-dev openbox
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:

diff --git a/tests/commands.rs b/tests/commands.rs
@@ -30,8 +30,10 @@ extern crate relm;
 #[macro_use]
 extern crate relm_derive;
 
+use std::time::Duration;
+
 use gdk::keys::constants as keys;
-use gtk::{ButtonExt, EntryExt, LabelExt, OrientableExt, WidgetExt};
+use gtk::traits::{ButtonExt, EntryExt, LabelExt, OrientableExt, WidgetExt};
 use gtk::Orientation::Vertical;
 use gtk_test::{assert_text, click, enter_key, enter_keys};
 use mg::{
@@ -136,7 +138,7 @@ fn test_basic_command() {
 
     assert_text!(widgets.label, "Label");
 
-    glib::timeout_add_local(0, move || {
+    glib::timeout_add_local(Duration::from_secs(0), move || {
         click(&button);
         enter_keys(&win, "n");
         assert_text!(entry, "");