From 1369e2221283c849e9ad9a1a5a3b8a8c514a5905 Mon Sep 17 00:00:00 2001
From: Elias Steurer <i@kelteseth.net>
Date: Sun, 25 Jul 2021 15:26:48 +0200
Subject: [PATCH] Fix ci python scripts and fix  linux apt-get

---
 .gitlab-ci.yml | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a50562be..9b282ad2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,8 +13,8 @@ check:
     script:
         - cd Tools
         - pip install cmakelang
-        - python format_cmake.py
-        - python format_cpp.py
+        - python clang_format.py
+        - python cmake_format.py
 
 build:windows_debug:
     stage: build
@@ -95,9 +95,9 @@ build:linux_debug:
         - export  DEBIAN_FRONTEND=noninteractive
         - apt install apt-transport-https ca-certificates gnupg software-properties-common wget software-properties-common wget python3-pip -y
         - wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
-        - sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic-rc main' -y
-        - sudo apt-get update -y
-        - sudo apt install build-essential libgl1-mesa-dev lld ninja-build cmake -y
+        - apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic-rc main' -y
+        - apt update -y
+        - apt install build-essential libgl1-mesa-dev lld ninja-build cmake -y
         - pip3 install aqtinstall
         - mkdir Qt
         - aqt install --outputdir Qt/ 5.15.2 linux desktop
@@ -105,6 +105,7 @@ build:linux_debug:
         - wget https://github.com/QuasarApp/CQtDeployer/releases/download/1.5.2/CQtDeployer_1.5.2_OfflineInstaller_Linux64.run
         - python setup.py
         - python build.py -t debug
+
     artifacts:
         expire_in: "4 weeks"
         paths:
@@ -121,15 +122,19 @@ build:linux_release:
     needs:
         - check
     script:
-        - sudo apt-get update -y
-        - sudo apt-get install apt-transport-https ca-certificates gnupg software-properties-common wget software-properties-common snapd -y
-        - sudo /etc/init.d/snapd start
-        - sudo snap install cqtdeployer
+         - apt update -y
+        # Otherwise libglib2 needs interaction
+        - export  DEBIAN_FRONTEND=noninteractive
+        - apt install apt-transport-https ca-certificates gnupg software-properties-common wget software-properties-common wget python3-pip -y
         - wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
-        - sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic-rc main' -y
-        - sudo apt-get update -y
-        - sudo apt install build-essential libgl1-mesa-dev lld ninja-build cmake -y
+        - apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic-rc main' -y
+        - apt update -y
+        - apt install build-essential libgl1-mesa-dev lld ninja-build cmake -y
+        - pip3 install aqtinstall
+        - mkdir Qt
+        - aqt install --outputdir Qt/ 5.15.2 linux desktop
         - cd Tools
+        - wget https://github.com/QuasarApp/CQtDeployer/releases/download/1.5.2/CQtDeployer_1.5.2_OfflineInstaller_Linux64.run
         - python setup.py
         - python build.py -t release
     artifacts: