From 0fd60fccb70b97d56e0256ed6fb36e53e31841cc Mon Sep 17 00:00:00 2001 From: "Jesse L. Zamora" Date: Fri, 27 Dec 2024 16:09:52 -0500 Subject: [PATCH] Fix typo in build-sysroot.sh, fix name of job --- .github/workflows/build-swift-release.yml | 2 +- build-sysroot.sh | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-swift-release.yml b/.github/workflows/build-swift-release.yml index 2a036ea..dcf269a 100644 --- a/.github/workflows/build-swift-release.yml +++ b/.github/workflows/build-swift-release.yml @@ -70,7 +70,7 @@ jobs: "raspios-bookworm" ] swift-target-arch: ["armv6", "armv7"] - name: Build for RaspiOS + name: Build Swift runs-on: ubuntu-latest needs: [fetch-sources] steps: diff --git a/build-sysroot.sh b/build-sysroot.sh index 56dfd37..ed95d0a 100755 --- a/build-sysroot.sh +++ b/build-sysroot.sh @@ -4,7 +4,6 @@ set -e SRC_ROOT=$(pwd) -CONTAINER_NAME=swift-armv7-sysroot DISTRIBUTION_NAME=$1 DISTRIUBTION_VERSION=$2 SYSROOT=$3 @@ -156,12 +155,14 @@ else echo "Starting up qemu emulation" docker run --privileged --rm tonistiigi/binfmt --install all - echo "Building $DISTRIUBTION distribution for sysroot" + CONTAINER_NAME=swift-armhf-sysroot + + echo "Building $DISTRIBUTION distribution for sysroot" docker rm --force $CONTAINER_NAME docker run \ --platform linux/armhf \ --name $CONTAINER_NAME \ - $DISTRIUBTION \ + $DISTRIBUTION \ /bin/bash -c "$INSTALL_DEPS_CMD" echo "Extracting sysroot folders to $SYSROOT"