From 7e674a8fef5edea6ed06b288992699d64e9da6b3 Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 2 Feb 2023 18:06:06 +0100 Subject: [PATCH] Real fix Signed-off-by: falkTX --- .github/workflows/release.yml | 15 +++++++-------- PawPaw | 2 +- pack-jack2-version.sh | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e27cf16..eb74dd8 100644 --- 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 index b1ad575..eb807ed 160000 --- a/PawPaw +++ b/PawPaw @@ -1 +1 @@ -Subproject commit b1ad575c1ba9515bf3719305b895d089a5d01deb +Subproject commit eb807ed9348896c99135b304f3029226d1369cc2 diff --git a/pack-jack2-version.sh b/pack-jack2-version.sh index b0a997e..74bb3ba 100755 --- 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