From 84c8d4240fd02320df0aa9bf700d1b96acd0d14e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= Date: Mon, 21 Oct 2024 15:08:17 +0200 Subject: [PATCH 1/2] Update SDL submodule Pulls in https://github.com/libsdl-org/SDL/pull/11256 to fix https://github.com/ppy/osu/issues/28966. --- External/SDL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/External/SDL b/External/SDL index 1cc85c9..92520c1 160000 --- a/External/SDL +++ b/External/SDL @@ -1 +1 @@ -Subproject commit 1cc85c912bb3352a121b1fdc181c6ab6546157df +Subproject commit 92520c1d9bffedcd558e8076691bc348285320df From 53dff157d59ae43cd6c339dc8352714dca37ce50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= Date: Mon, 21 Oct 2024 15:21:12 +0200 Subject: [PATCH 2/2] Fix linux-arm build failures due to docker changes `linux-arm(64)` builds started failing with latest: Pulling from arm64v8/ubuntu docker: no matching manifest for linux/amd64 in the manifest list entries. (https://github.com/bdach/SDL3-CS/actions/runs/11440882162/job/31827702325) Upon closer inspection, new `arm32v7/ubuntu` and `arm64v8/ubuntu` images were pushed on Oct 19, 2024, which seemed related. While pinning the images to the last known working digest worked, it's obviously suboptimal. Looking closer at previous passing build logs, warnings are noticeable: WARNING: The requested image's platform (linux/arm/v7) does not match the detected host platform (linux/amd64/v3) and no specific platform was requested WARNING: The requested image's platform (linux/arm64/v8) does not match the detected host platform (linux/amd64/v3) and no specific platform was requested therefore I decided to try specifying the platform explicitly to see if it fixes the issue, and it does. --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bde6baf..a85f008 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,8 +19,8 @@ jobs: - { name: win-arm64, os: windows-latest, flags: -A ARM64 } - { name: linux-x64, os: ubuntu-20.04, flags: -GNinja, target_apt_arch: ":amd64" } - { name: linux-x86, os: ubuntu-20.04, flags: -GNinja -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32", target_apt_arch: ":i386" } - - { name: linux-arm64, os: ubuntu-20.04, flags: -GNinja, target_apt_arch: ":arm64", container: arm64v8/ubuntu } - - { name: linux-arm, os: ubuntu-20.04, flags: -GNinja, target_apt_arch: ":armhf", container: arm32v7/ubuntu } + - { name: linux-arm64, os: ubuntu-20.04, flags: -GNinja, target_apt_arch: ":arm64", container: arm64v8/ubuntu, docker_platform: linux/arm64/v8 } + - { name: linux-arm, os: ubuntu-20.04, flags: -GNinja, target_apt_arch: ":armhf", container: arm32v7/ubuntu, docker_platform: linux/arm/v7 } - { name: osx-x64, os: macos-latest, flags: -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 } # NOTE: macOS 11.0 is the first released supported by Apple Silicon. - { name: osx-arm64, os: macos-latest, flags: -DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 } @@ -45,6 +45,7 @@ jobs: -e RUNNER_OS=${{ runner.os }} -e FLAGS=${{ matrix.platform.flags }} -e BUILD_TYPE=${{ env.BUILD_TYPE }} + --platform ${{ matrix.platform.docker_platform }} run: | cd /workspace ./External/build.sh