From 0d419b427dd8f11bc1965efff71a1f94bb97236c Mon Sep 17 00:00:00 2001
From: Edgar <Edgar@AnotherFoxGuy.com>
Date: Tue, 16 Feb 2021 12:52:44 +0100
Subject: [PATCH] :construction_worker: Fixed Ubuntu CI build

---
 .CI/CreateAppImage.sh       | 23 ++++++++++++-----------
 .github/workflows/build.yml | 10 ++++++++--
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/.CI/CreateAppImage.sh b/.CI/CreateAppImage.sh
index 7e1a57ea9..ab4df31cd 100755
--- a/.CI/CreateAppImage.sh
+++ b/.CI/CreateAppImage.sh
@@ -7,6 +7,18 @@ if [ ! -f ./bin/chatterino ] || [ ! -x ./bin/chatterino ]; then
     exit 1
 fi
 
+linuxdeployqt_path="linuxdeployqt-6-x86_64.AppImage"
+linuxdeployqt_url="https://github.com/probonopd/linuxdeployqt/releases/download/6/linuxdeployqt-6-x86_64.AppImage"
+
+if [ ! -f "$linuxdeployqt_path" ]; then
+    wget -nv "$linuxdeployqt_url"
+    chmod a+x "$linuxdeployqt_path"
+fi
+if [ ! -f appimagetool-x86_64.AppImage ]; then
+    wget -nv "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
+    chmod a+x appimagetool-x86_64.AppImage
+fi
+
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/qt512/lib/:$(pwd)/bin"
 export PATH="/opt/qt512/bin:$PATH"
 
@@ -26,17 +38,6 @@ echo ""
 
 cp "$chatterino_dir"/resources/icon.png ./appdir/chatterino.png
 
-linuxdeployqt_path="linuxdeployqt-6-x86_64.AppImage"
-linuxdeployqt_url="https://github.com/probonopd/linuxdeployqt/releases/download/6/linuxdeployqt-6-x86_64.AppImage"
-
-if [ ! -f "$linuxdeployqt_path" ]; then
-    wget -nv "$linuxdeployqt_url"
-    chmod a+x "$linuxdeployqt_path"
-fi
-if [ ! -f appimagetool-x86_64.AppImage ]; then
-    wget -nv "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
-    chmod a+x appimagetool-x86_64.AppImage
-fi
 echo "Run LinuxDeployQT"
 ./"$linuxdeployqt_path" \
     appdir/usr/share/applications/*.desktop \
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f201fa869..a6e2ea426 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -69,11 +69,14 @@ jobs:
         run: choco install conan jom -y
         shell: cmd
 
+      - name: Add Conan to path
+        if: startsWith(matrix.os, 'windows')
+        run: echo "C:\Program Files\Conan\conan\" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
       - name: Build (Windows)
         if: startsWith(matrix.os, 'windows') && matrix.build-system == 'qmake'
         run: |
             call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-            SET PATH=%PATH%;C:\Program Files\Conan\conan\
             mkdir build
             cd build
             conan install ..\conanfile-qmake.txt
@@ -89,7 +92,6 @@ jobs:
         if: startsWith(matrix.os, 'windows') && matrix.build-system == 'cmake'
         run: |
             call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-            SET PATH=%PATH%;C:\Program Files\Conan\conan\
             mkdir build
             cd build
             cmake -G"NMake Makefiles JOM" -DCMAKE_BUILD_TYPE=Release -DUSE_PACKAGE_MANAGER=ON ..
@@ -205,6 +207,10 @@ jobs:
           name: chatterino-osx-${{ matrix.qt-version }}-${{ matrix.build-system }}.dmg
           path: build/chatterino-osx.dmg
 
+      - name: Clean conan packages
+        if: matrix.build-system == 'cmake'
+        run: cmake -P cmake/pmm.cmake /Conan /Clean
+
   create-release:
     needs: build
     runs-on: ubuntu-latest