From dec0f28f1eb406f70fe4dc800658ba98781012ed Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Mon, 17 Feb 2020 18:30:19 +0100
Subject: [PATCH] CI: use dynamic Qt [Linux]

---
 .github/scripts/Linux/prepare.sh    |  1 +
 .github/workflows/ccpp.yml          | 11 +----------
 .github/workflows/coverity-scan.yml |  3 ---
 .github/workflows/nightly.yml       | 11 +----------
 4 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/.github/scripts/Linux/prepare.sh b/.github/scripts/Linux/prepare.sh
index 8d80d46f8..08b0744a9 100755
--- a/.github/scripts/Linux/prepare.sh
+++ b/.github/scripts/Linux/prepare.sh
@@ -20,6 +20,7 @@ sudo apt install libopencv-dev
 sudo apt install libglib2.0-dev libcurl4-nss-dev
 ( mkdir gpujpeg/build && cd gpujpeg/build && CC=gcc-6 CXX=g++-6 cmake .. && make && sudo make install && sudo ldconfig )
 ( sudo apt install uuid-dev && cd cineform-sdk/ && cmake . && make CFHDCodecStatic )
+sudo apt install qtbase5-dev
 sudo chmod 777 /usr/local
 
 # Install XIMEA
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 793b84c1e..2a2a47890 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -35,17 +35,8 @@ jobs:
         submodules: true
     - name: bootstrap
       run: .github/scripts/Linux/prepare.sh
-    - name: Cache static Qt
-      id: cache-qt
-      uses: actions/cache@v1
-      with:
-        path: /usr/local/qt
-        key: cache-qt-5_13_2-${{ runner.os }}
-    - name: Build static Qt
-      if: steps.cache-qt.outputs.cache-hit != 'true'
-      run: .github/scripts/build-qt.sh 5.13.2
     - name: configure
-      run: ./autogen.sh --enable-qt --enable-static-qt --with-cuda-host-compiler=gcc-6 --enable-plugins --with-live555=/usr/local
+      run: ./autogen.sh --enable-qt --with-cuda-host-compiler=gcc-6 --enable-plugins --with-live555=/usr/local
     - name: make
       run: make
     - name: make check
diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml
index 6f6aef5d0..eefcbde8b 100644
--- a/.github/workflows/coverity-scan.yml
+++ b/.github/workflows/coverity-scan.yml
@@ -23,9 +23,6 @@ jobs:
         submodules: true
     - name: bootstrap
       run: .github/scripts/Linux/prepare.sh
-    - name: Install Qt
-      run: |
-        sudo apt install qtbase5-dev
     - name: configure
       run: ./autogen.sh --enable-qt --with-cuda-host-compiler=gcc-6 --enable-plugins --with-live555=/usr/local
     - name: Build with cov-build
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index c5d309cfa..02794a3aa 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -63,17 +63,8 @@ jobs:
         submodules: true
     - name: bootstrap
       run: .github/scripts/Linux/prepare.sh
-    - name: Cache static Qt
-      id: cache-qt
-      uses: actions/cache@v1
-      with:
-        path: /usr/local/qt
-        key: cache-qt-5_13_2-${{ runner.os }}
-    - name: Build static Qt
-      if: steps.cache-qt.outputs.cache-hit != 'true'
-      run: .github/scripts/build-qt.sh 5.13.2
     - name: configure
-      run: ./autogen.sh --enable-qt --enable-static-qt --with-cuda-host-compiler=gcc-6 --enable-plugins --with-live555=/usr/local
+      run: ./autogen.sh --enable-qt --with-cuda-host-compiler=gcc-6 --enable-plugins --with-live555=/usr/local
     - name: make
       run: make
     - name: make check