Cleanup and update

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

.github/workflows/release.yml

@@ -8,58 +8,12 @@ on:
     branches:
       - '*'
 env:
+  CACHE_VERSION: 1
   DEBIAN_FRONTEND: noninteractive
   HOMEBREW_NO_AUTO_UPDATE: 1
+  PAWPAW_SKIP_LTO: 1
 
 jobs:
-  # linux native build
-  linux:
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
-      - name: Set up cache
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/PawPawBuilds/builds
-            ~/PawPawBuilds/debs
-            ~/PawPawBuilds/downloads
-            ~/PawPawBuilds/targets
-          key: linux
-      - 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: Set up dependencies
-        run: |
-          sudo dpkg --add-architecture i386
-          sudo apt-get update -qq
-          sudo apt-get install -yq build-essential curl cmake jq
-          sudo apt-get install -yq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable:i386
-          sudo apt-get install -yq binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 wine-stable
-          sudo apt-get install -yq libasound2-dev libcairo2-dev libfluidsynth-dev libgl1-mesa-dev liblo-dev libmagic-dev libpulse-dev libqt4-dev libsndfile1-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev pkg-config pyqt5-dev-tools qtbase5-dev
-          sudo apt-get install -yq g++-multilib libfreetype6:i386 libx11-6:i386 libxext6:i386
-          # Fix 32bit bridge build
-          sudo ln -s /usr/lib/i386-linux-gnu/libX11.so.6 /usr/lib/i386-linux-gnu/libX11.so
-          sudo ln -s /usr/lib/i386-linux-gnu/libXext.so.6 /usr/lib/i386-linux-gnu/libXext.so
-          sudo ln -s /usr/lib/i386-linux-gnu/libfreetype.so.6 /usr/lib/i386-linux-gnu/libfreetype.so
-      - name: Cache debian packages
-        run: |
-          mkdir -p ~/PawPawBuilds/debs
-          sudo mv /var/cache/apt/archives/*.deb ~/PawPawBuilds/debs/
-      - name: Bootstrap linux
-        shell: bash
-        run: |
-          ./PawPaw/bootstrap-carla.sh linux && ./PawPaw/.cleanup.sh linux
-      #- name: Build linux
-        #env:
-          #LDFLAGS: -static-libgcc -static-libstdc++
-        #run: |
-          #./build.sh linux
-
   # macOS native intel build
   macos:
     runs-on: macos-10.15
@@ -71,10 +25,8 @@ jobs:
         uses: actions/cache@v2
         with:
           path: |
-            ~/PawPawBuilds/builds
-            ~/PawPawBuilds/downloads
-            ~/PawPawBuilds/targets
-          key: macos
+            ~/PawPawBuilds
+        key: macos-v${{ env.CACHE_VERSION }}
       - name: Set up dependencies
         run: |
           brew install cmake jq meson
@@ -102,10 +54,8 @@ jobs:
         uses: actions/cache@v2
         with:
           path: |
-            ~/PawPawBuilds/builds
-            ~/PawPawBuilds/downloads
-            ~/PawPawBuilds/targets
-          key: macos-universal
+            ~/PawPawBuilds
+          key: macos-universal-v${{ env.CACHE_VERSION }}
       - name: Set up dependencies
         run: |
           brew install cmake jq meson
@@ -137,22 +87,24 @@ jobs:
         uses: actions/cache@v2
         with:
           path: |
-            ~/PawPawBuilds/builds
-            ~/PawPawBuilds/debs
-            ~/PawPawBuilds/downloads
-            ~/PawPawBuilds/targets
-          key: win32
+            ~/PawPawBuilds
+          key: win32-v${{ env.CACHE_VERSION }}
       - 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 libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
       - name: Set up dependencies
         run: |
           sudo dpkg --add-architecture i386
           sudo apt-get update -qq
-          sudo apt-get install -yq build-essential curl cmake jq llvm qttools5-dev-tools
-          sudo apt-get install -yq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable:i386
+          sudo apt-get install -y build-essential curl cmake jq mingw-w64 qttools5-dev 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
@@ -181,23 +133,24 @@ jobs:
         uses: actions/cache@v2
         with:
           path: |
-            ~/PawPawBuilds/builds
-            ~/PawPawBuilds/debs
-            ~/PawPawBuilds/downloads
-            ~/PawPawBuilds/targets
-          key: win64
+            ~/PawPawBuilds
+          key: win64-v${{ env.CACHE_VERSION }}
       - 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 libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
       - name: Set up dependencies
         run: |
           sudo dpkg --add-architecture i386
           sudo apt-get update -qq
-          sudo apt-get install -yq build-essential curl cmake jq llvm qttools5-dev-tools
-          sudo apt-get install -yq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable:i386
-          sudo apt-get install -yq binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 wine-stable
+          sudo apt-get install -y build-essential curl cmake jq mingw-w64 qttools5-dev 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

Carla

@@ -1 +1 @@
-Subproject commit 51028655d09c9a21fc51cadd7bc48210295aa791
+Subproject commit 613e6950581ad0cb3c037fac7f0db89633e099e6

PawPaw

@@ -1 +1 @@
-Subproject commit 138e7861c5c0aa75406c0e00df4812e5a0d42264
+Subproject commit 3ce181e48506ef6d14b6e256af98801e58119415