Cleanup CI

Signed-off-by: falkTX <falktx@falktx.com>
jackaudio · Jan 9, 2022 · 02f8f11 · 02f8f11
1 parent 9f936d3
commit 02f8f11
Showing 1 changed file with 24 additions and 26 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,9 +24,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: |
-          ~/PawPawBuilds/builds
-          ~/PawPawBuilds/downloads
-          ~/PawPawBuilds/targets
+          ~/PawPawBuilds
         key: cache-macos
     - name: Set up dependencies
       run: |
@@ -58,9 +56,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: |
-          ~/PawPawBuilds/builds
-          ~/PawPawBuilds/downloads
-          ~/PawPawBuilds/targets
+          ~/PawPawBuilds
         key: cache-macos-universal
     - name: Set up dependencies
       run: |
@@ -96,26 +92,27 @@ jobs:
       uses: actions/cache@v2
       with:
         path: |
-          ~/PawPawBuilds/builds
-          ~/PawPawBuilds/debs
-          ~/PawPawBuilds/downloads
-          ~/PawPawBuilds/targets
+          ~/PawPawBuilds
         key: cache-win32
     - name: Restore debian packages cache
       run: |
         if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then \
           sudo cp ~/PawPawBuilds/debs/*.deb /var/cache/apt/archives/; \
         fi
+    - name: Fix GitHub's mess
+      run: |
+        sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
+        sudo apt-get update -qq
+        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 qttools5-dev winehq-stable xvfb \
-          binutils-mingw-w64-i686 g++-mingw-w64-i686
+        sudo dpkg --add-architecture i386
+        sudo apt-get update -qq
+        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 && \
+        mkdir -p ~/PawPawBuilds/debs
         sudo mv /var/cache/apt/archives/*.deb ~/PawPawBuilds/debs/
     - name: Bootstrap win32 cross-compiled
       shell: bash
@@ -144,26 +141,27 @@ jobs:
       uses: actions/cache@v2
       with:
         path: |
-          ~/PawPawBuilds/builds
-          ~/PawPawBuilds/debs
-          ~/PawPawBuilds/downloads
-          ~/PawPawBuilds/targets
+          ~/PawPawBuilds
         key: cache-win64
     - name: Restore debian packages cache
       run: |
         if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then \
           sudo cp ~/PawPawBuilds/debs/*.deb /var/cache/apt/archives/; \
         fi
+    - name: Fix GitHub's mess
+      run: |
+        sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
+        sudo apt-get update -qq
+        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 qttools5-dev winehq-stable xvfb \
-          binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64
+        sudo dpkg --add-architecture i386
+        sudo apt-get update -qq
+        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 && \
+        mkdir -p ~/PawPawBuilds/debs
         sudo mv /var/cache/apt/archives/*.deb ~/PawPawBuilds/debs/
     - name: Bootstrap win64 cross-compiled
       shell: bash