CI: Test with ubuntu-latest and newer Qt 5.15

hluk · Aug 23, 2023 · 2018b5a · 2018b5a
1 parent aaf8c08
commit 2018b5a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
@@ -25,7 +25,7 @@ jobs:
             compiler_package: g++
             with_qt6: false
 
-          - os: ubuntu-20.04
+          - os: ubuntu-latest
             buildname: Linux-Clang
             build_type: Debug
             compiler: clang++

diff --git a/src/tests/test_utils.h b/src/tests/test_utils.h
@@ -66,6 +66,14 @@ const int waitMsSetClipboard = 250;
 /// Interval to wait (in ms) for pasting clipboard.
 const int waitMsPasteClipboard = 1000;
 
+/// Interval before calling show after hide (some window managers may fail to
+/// show the window immediately after hiding).
+#ifdef COPYQ_WS_X11
+const int waitMsShowHide = 500;
+#else
+const int waitMsShowHide = 0;
+#endif
+
 /// Interval to wait (in ms) for client process.
 const int waitClientRun = 30000;
 

diff --git a/src/tests/tests.cpp b/src/tests/tests.cpp
@@ -1058,6 +1058,7 @@ void Tests::commandShow()
     RUN("hide", "");
     WAIT_ON_OUTPUT("visible", "false\n");
 
+    waitFor(waitMsShowHide);
     RUN("show", "");
     WAIT_ON_OUTPUT("visible", "true\n");
 }
@@ -1068,6 +1069,7 @@ void Tests::commandShowAt()
     RUN("hide", "");
     WAIT_ON_OUTPUT("visible", "false\n");
 
+    waitFor(waitMsShowHide);
     RUN("showAt", "");
     WAIT_ON_OUTPUT("visible", "true\n");
 }
@@ -3190,6 +3192,7 @@ void Tests::pasteFromMainWindow()
 
     RUN("add" << "TEST", "");
     RUN("hide", "");
+    waitFor(waitMsShowHide);
     runMultiple(
         [&]() { RUN(WITH_TIMEOUT "dialog('text')", "TEST\n"); },
         [&]() {

diff --git a/utils/github/install-linux.sh b/utils/github/install-linux.sh
@@ -25,8 +25,6 @@ if [[ $WITH_QT6 == true ]]; then
     )
 else
     qt_packages=(
-        qt5-default
-
         qtbase5-private-dev
         qtdeclarative5-dev
         qttools5-dev