Cleanup

Signed-off-by: falkTX <falktx@falktx.com>

.github/workflows/build.yml

@@ -24,9 +24,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: |
-          ~/PawPawBuilds/builds
-          ~/PawPawBuilds/downloads
-          ~/PawPawBuilds/targets
+          ~/PawPawBuilds
         key: macos
     - name: Set up dependencies
       run: |
@@ -69,9 +67,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: |
-          ~/PawPawBuilds/builds
-          ~/PawPawBuilds/downloads
-          ~/PawPawBuilds/targets
+          ~/PawPawBuilds
         key: macos-universal
     - name: Set up dependencies
       run: |
@@ -118,10 +114,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: |
-          ~/PawPawBuilds/builds
-          ~/PawPawBuilds/debs
-          ~/PawPawBuilds/downloads
-          ~/PawPawBuilds/targets
+          ~/PawPawBuilds
         key: win32
     - name: Restore debian packages cache
       run: |
@@ -135,11 +128,9 @@ jobs:
         sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal
     - name: Set up dependencies
       run: |
-        wget -qO- https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add -
         sudo dpkg --add-architecture i386
-        sudo apt-add-repository -y 'deb https://dl.winehq.org/wine-builds/ubuntu/ focal main'
-        sudo apt-get install -y autopoint build-essential curl cmake jq llvm mingw-w64 qttools5-dev-tools winehq-stable xvfb \
-          binutils-mingw-w64-i686 g++-mingw-w64-i686
+        sudo apt-get install -y autopoint build-essential curl cmake jq llvm mingw-w64 qttools5-dev-tools xvfb \
+          binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable:i386
     - name: Cache debian packages
       run: |
         mkdir -p ~/PawPawBuilds/debs && \
@@ -201,10 +192,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: |
-          ~/PawPawBuilds/builds
-          ~/PawPawBuilds/debs
-          ~/PawPawBuilds/downloads
-          ~/PawPawBuilds/targets
+          ~/PawPawBuilds
         key: win64
     - name: Restore debian packages cache
       run: |
@@ -218,11 +206,9 @@ jobs:
         sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal
     - name: Set up dependencies
       run: |
-        wget -qO- https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add -
         sudo dpkg --add-architecture i386
-        sudo apt-add-repository -y 'deb https://dl.winehq.org/wine-builds/ubuntu/ focal main'
-        sudo apt-get install -y autopoint build-essential curl cmake jq llvm mingw-w64 qttools5-dev-tools winehq-stable xvfb \
-          binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64
+        sudo apt-get install -y autopoint build-essential curl cmake jq llvm mingw-w64 qttools5-dev-tools xvfb \
+          binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 wine-stable
     - name: Cache debian packages
       run: |
         mkdir -p ~/PawPawBuilds/debs && \