From 477ac4300317b47c14064b6630b96da55b891663 Mon Sep 17 00:00:00 2001 From: Arthur Poiret Date: Mon, 8 Dec 2025 22:44:56 +0100 Subject: [PATCH] fix(#408): backport macos-15-intel runner on 1.31 version --- .github/workflows/main.yml | 7 ++++--- owlplug-client/pom.xml | 8 ++++---- owlplug-controls/pom.xml | 2 +- owlplug-host/pom.xml | 2 +- owlplug-parsers/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6bfaf441..59237a0b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,6 +11,7 @@ on: - ci/* - openjdk/* - linux + - support/* jobs: build-host-win: @@ -43,7 +44,7 @@ jobs: name: owlplug-host-win path: owlplug-host/src/main/juce/Builds/VisualStudio2019/x64/Release/Dynamic Library/owlplug-host-${{ env.version }}.dll build-host-osx: - runs-on: macos-14 + runs-on: macos-15-intel steps: - uses: actions/checkout@v6 with: @@ -181,7 +182,7 @@ jobs: name: owlplug-win-installer-msi path: build/output/OwlPlug-${{ env.version }}.msi package-osx: - runs-on: macos-14 + runs-on: macos-15-intel needs: [build-jar] steps: - uses: actions/checkout@v6 @@ -267,7 +268,7 @@ jobs: path: OwlPlug-${{ env.version }}-x86_64.AppImage release: needs: [package-win, package-osx, package-linux-deb, package-linux-appimage] - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/support/') runs-on: "ubuntu-latest" steps: - uses: actions/checkout@v6 diff --git a/owlplug-client/pom.xml b/owlplug-client/pom.xml index 9ed898ba..3cfeabbb 100644 --- a/owlplug-client/pom.xml +++ b/owlplug-client/pom.xml @@ -11,7 +11,7 @@ com.owlplug owlplug - 1.31.0 + 1.31.1 owlplug-client @@ -35,17 +35,17 @@ com.owlplug owlplug-host - 1.31.0 + 1.31.1 com.owlplug owlplug-controls - 1.31.0 + 1.31.1 com.owlplug owlplug-parsers - 1.31.0 + 1.31.1 org.springframework.boot diff --git a/owlplug-controls/pom.xml b/owlplug-controls/pom.xml index c5f12211..60cab72b 100644 --- a/owlplug-controls/pom.xml +++ b/owlplug-controls/pom.xml @@ -5,7 +5,7 @@ owlplug com.owlplug - 1.31.0 + 1.31.1 4.0.0 diff --git a/owlplug-host/pom.xml b/owlplug-host/pom.xml index 8b297ad8..344d65ed 100644 --- a/owlplug-host/pom.xml +++ b/owlplug-host/pom.xml @@ -7,7 +7,7 @@ com.owlplug owlplug - 1.31.0 + 1.31.1 owlplug-host owlplug-host diff --git a/owlplug-parsers/pom.xml b/owlplug-parsers/pom.xml index 01977f0d..922d7c70 100644 --- a/owlplug-parsers/pom.xml +++ b/owlplug-parsers/pom.xml @@ -5,7 +5,7 @@ owlplug com.owlplug - 1.31.0 + 1.31.1 4.0.0 diff --git a/pom.xml b/pom.xml index ac5008d1..3ddce46b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.owlplug owlplug - 1.31.0 + 1.31.1 pom