From b554b3d0608e224a17543006c74d4ddd8c3fac10 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Sun, 25 Oct 2020 17:21:12 -0700
Subject: build-system: use openSUSE Tumbleweed latest

Without a distro update, Leap 15.2 appears to only give us Qt 5.12.
Since the upgrade takes forever and causes problems as it requests a senseless
'reboot' of the container, let's try using Tumbleweed instead.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 .github/workflows/linux-leap-qt-5.15.yml         | 50 ------------------------
 .github/workflows/linux-tumbleweed-qt-latest.yml | 50 ++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 50 deletions(-)
 delete mode 100644 .github/workflows/linux-leap-qt-5.15.yml
 create mode 100644 .github/workflows/linux-tumbleweed-qt-latest.yml

(limited to '.github/workflows')

diff --git a/.github/workflows/linux-leap-qt-5.15.yml b/.github/workflows/linux-leap-qt-5.15.yml
deleted file mode 100644
index 4b058bc7c..000000000
--- a/.github/workflows/linux-leap-qt-5.15.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: openSUSE 15.2 / Qt 5.15
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-    branches:
-    - master
-
-jobs:
-  buildInContainer:
-    runs-on: ubuntu-latest
-    container:
-      image: opensuse/leap:15.2
-
-    steps:
-    - name: checkout sources
-      uses: actions/checkout@v1
-
-    - name: get container ready for build
-      run: |
-        echo "--------------------------------------------------------------"
-        echo "update distro and install dependencies"
-        zypper -n install git gcc-c++ make autoconf automake libtool cmake libzip-devel \
-        libxml2-devel libxslt-devel sqlite3-devel libusb-1_0-devel \
-        libqt5-linguist-devel libqt5-qttools-devel libQt5WebKitWidgets-devel \
-        libqt5-qtbase-devel libQt5WebKit5-devel libqt5-qtsvg-devel \
-        libqt5-qtscript-devel libqt5-qtdeclarative-devel \
-        libqt5-qtconnectivity-devel libqt5-qtlocation-devel libcurl-devel \
-        libQt5QuickControls2-devel bluez-devel \
-        which libgit2-devel libssh2-devel
-
-# if we want to run the tests below, add    xvfb-run
-
-    - name: build Subsurface
-      run: |
-        echo "--------------------------------------------------------------"
-        echo "building desktop"
-
-        # now build for the desktop version (including WebKit)
-        cd ..
-        bash -e -x subsurface/scripts/build.sh -desktop -build-with-webkit
-
-# let's not run the tests... to do that, we need to install 'xvfb-run' above
-#   - name: test desktop build
-#     run: |
-#       echo "--------------------------------------------------------------"
-#       echo "running tests for desktop"
-#       cd build
-#       xvfb-run --auto-servernum make check
diff --git a/.github/workflows/linux-tumbleweed-qt-latest.yml b/.github/workflows/linux-tumbleweed-qt-latest.yml
new file mode 100644
index 000000000..05dfbdbb4
--- /dev/null
+++ b/.github/workflows/linux-tumbleweed-qt-latest.yml
@@ -0,0 +1,50 @@
+name: openSUSE/Tumbleweed / Qt latest
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
+
+jobs:
+  buildInContainer:
+    runs-on: ubuntu-latest
+    container:
+      image: opensuse/tumbleweed:latest
+
+    steps:
+    - name: checkout sources
+      uses: actions/checkout@v1
+
+    - name: get container ready for build
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "update distro and install dependencies"
+        zypper -n install git gcc-c++ make autoconf automake libtool cmake libzip-devel \
+        libxml2-devel libxslt-devel sqlite3-devel libusb-1_0-devel \
+        libqt5-linguist-devel libqt5-qttools-devel libQt5WebKitWidgets-devel \
+        libqt5-qtbase-devel libQt5WebKit5-devel libqt5-qtsvg-devel \
+        libqt5-qtscript-devel libqt5-qtdeclarative-devel \
+        libqt5-qtconnectivity-devel libqt5-qtlocation-devel libcurl-devel \
+        libQt5QuickControls2-devel bluez-devel \
+        which libgit2-devel libssh2-devel
+
+# if we want to run the tests below, add    xvfb-run
+
+    - name: build Subsurface
+      run: |
+        echo "--------------------------------------------------------------"
+        echo "building desktop"
+
+        # now build for the desktop version (including WebKit)
+        cd ..
+        bash -e -x subsurface/scripts/build.sh -desktop -build-with-webkit
+
+# let's not run the tests... to do that, we need to install 'xvfb-run' above
+#   - name: test desktop build
+#     run: |
+#       echo "--------------------------------------------------------------"
+#       echo "running tests for desktop"
+#       cd build
+#       xvfb-run --auto-servernum make check
-- 
cgit v1.2.3-70-g09d2