Real fix

Signed-off-by: falkTX <falktx@falktx.com>
jackaudio · Feb 3, 2023 · 7e674a8 · 7e674a8
1 parent cb4b0f2
commit 7e674a8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,9 +4,8 @@ on:
   push:
 
 env:
-  CACHE_VERSION: 4
+  CACHE_VERSION: 5
   DEBIAN_FRONTEND: noninteractive
-  HOMEBREW_NO_AUTO_UPDATE: 1
   PAWPAW_SKIP_LTO: 1
 
 jobs:
@@ -102,7 +101,7 @@ jobs:
 
   # linux with win32 cross-compilation
   win32:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
       with:
@@ -123,8 +122,8 @@ jobs:
       run: |
         sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
         sudo apt-get update -qq
-        sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
-        sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4
+        sudo apt-get install -yqq --allow-downgrades libgd3/jammy
+        sudo apt-get purge -yqq libmono* moby* mono* msbuild* php* libgdiplus libpcre2-posix3 nuget
     - name: Set up dependencies
       run: |
         sudo dpkg --add-architecture i386
@@ -163,7 +162,7 @@ jobs:
 
   # linux with win64 cross-compilation
   win64:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
       with:
@@ -184,8 +183,8 @@ jobs:
       run: |
         sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
         sudo apt-get update -qq
-        sudo apt-get install -yqq --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
-        sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4
+        sudo apt-get install -yqq --allow-downgrades libgd3/jammy
+        sudo apt-get purge -yqq libmono* moby* mono* msbuild* php* libgdiplus libpcre2-posix3 nuget
     - name: Set up dependencies
       run: |
         sudo dpkg --add-architecture i386

diff --git a/PawPaw b/PawPaw
diff --git a/pack-jack2-version.sh b/pack-jack2-version.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export JACK2_VERSION=v1.9.22
-export JACK_EXAMPLE_TOOLS_VERSION=0c4a3df94f4f87048e101f4c5ee282ed7a1080b3
+export JACK_EXAMPLE_TOOLS_VERSION=4b0b16a709475cf4a084e04a0849898a8421b636
 export QJACKCTL_VERSION=0.9.9
 
 set -e