Add support for building amazonlinux2 Swift SDKs

Author: xtremekforever

.github/workflows/develop.yml

@@ -23,6 +23,7 @@ on:
           - debian-bullseye
           - debian-bookworm
           - rhel-ubi9
+          - amazonlinux2
   pull_request:
     branches: [ "main" ]
 

build-sdk.sh

@@ -5,28 +5,29 @@ set -e
 source ./common-sdk.sh
 
 SDK_GENERATOR_PATH=./swift-sdk-generator/.build/release/swift-sdk-generator
+IMAGE_TAG=${IMAGE_TAG:=swift-sysroot:${SWIFT_VERSION}-${SWIFT_DISTRIBUTION_TAG}}
 
 echo "Starting up qemu emulation"
 docker run --privileged --rm tonistiigi/binfmt --install all
 
 echo "Building ${IMAGE_TAG} image for ${LINUX_PLATFORM}..."
 echo "Extra Packages: ${EXTRA_PACKAGES}"
 docker build \
+    --network=host \
     --platform linux/${LINUX_PLATFORM} \
     --tag ${IMAGE_TAG} \
     --build-arg SWIFT_PLATFORM=${SWIFT_PLATFORM} \
     --build-arg SWIFT_BRANCH=${SWIFT_BRANCH} \
     --build-arg SWIFT_VERSION=${SWIFT_VERSION} \
+    --build-arg SWIFT_DISTRIBUTION_TAG=${SWIFT_DISTRIBUTION_TAG} \
     --build-arg SWIFT_TAG=${SWIFT_TAG} \
     --build-arg DISTRIBUTION_NAME=${DISTRIBUTION_NAME} \
     --build-arg DISTRIBUTION_VERSION=${DISTRIBUTION_VERSION} \
     --build-arg EXTRA_PACKAGES=${EXTRA_PACKAGES} \
     --file ${DOCKERFILE} \
     .
 
-SDK_NAME=${SWIFT_VERSION}-RELEASE_${DISTRIBUTION_NAME}_${DISTRIBUTION_VERSION}_${TARGET_ARCH}
-
-echo "Building Swift ${SWIFT_VERSION} ${DISTRIBUTION_NAME}-${DISTRIBUTION_VERSION} SDK for ${TARGET_ARCH}..."
+echo "Building Swift ${SWIFT_VERSION} ${SWIFT_DISTRIBUTION_TAG} SDK for ${TARGET_ARCH}..."
 ${SDK_GENERATOR_PATH} make-linux-sdk \
     --swift-version ${SWIFT_VERSION}-RELEASE \
     --sdk-name ${SDK_NAME} \

common-sdk.sh

@@ -27,7 +27,6 @@ DISTRIBUTION_NAME=${SPLIT[0]}
 DISTRIBUTION_VERSION=${SPLIT[1]}
 
 ## MARK: Distribution Name 
-IMAGE_TAG=${IMAGE_TAG:=swift-sysroot:${SWIFT_VERSION}-${DISTRIBUTION_VERSION}}
 case ${DISTRIBUTION_NAME} in
     "ubuntu" | "debian")
         DOCKERFILE="swift-debian.dockerfile"
@@ -37,15 +36,21 @@ case ${DISTRIBUTION_NAME} in
         DOCKERFILE="swift-rhel.dockerfile"
         is_rhel=true
         ;;
+    "amazonlinux2")
+        DOCKERFILE="swift-rhel-old.dockerfile"
+        is_rhel=true
+        DISTRIBUTION_VERSION=$DISTRIBUTION_NAME
+        ;;
     *)
         echo "Error: unsupported distribution ${DISTRIBUTION_NAME}"
-        echo "Supported distributions are: ubuntu, debian, rhel"
+        echo "Supported distributions are: ubuntu, debian, rhel, amazonlinux2"
         exit -1
         ;;
 esac
 
 ## MARK: Distribution Version
 GENERATOR_DISTRIBUTION_NAME=${DISTRIBUTION_NAME}
+SWIFT_DISTRIBUTION_TAG=$DISTRIBUTION_VERSION
 case ${DISTRIBUTION_VERSION} in
     "focal")
         GENERATOR_DISTRIBUTION_VERSION="20.04"
@@ -70,6 +75,12 @@ case ${DISTRIBUTION_VERSION} in
         EXTRA_PACKAGES="libstdc++-12-dev ${EXTRA_PACKAGES}"
         ;;
     "ubi9")
+        GENERATOR_DISTRIBUTION_NAME="rhel"
+        GENERATOR_DISTRIBUTION_VERSION="ubi9"
+        SWIFT_DISTRIBUTION_TAG="rhel-ubi9"
+        ;;
+    "amazonlinux2")
+        # We use rhel-ubi9 to pass to the generator
         GENERATOR_DISTRIBUTION_NAME="rhel"
         GENERATOR_DISTRIBUTION_VERSION="ubi9"
         ;;
@@ -104,3 +115,10 @@ case ${TARGET_ARCH} in
         exit -1
         ;;
 esac
+
+# MARK: SDK Name
+if [ "$DISTRIBUTION_VERSION" != "$DISTRIBUTION_NAME" ]; then
+    SDK_NAME=${SWIFT_VERSION}-RELEASE_${DISTRIBUTION_NAME}_${DISTRIBUTION_VERSION}_${TARGET_ARCH}
+else
+    SDK_NAME=${SWIFT_VERSION}-RELEASE_${SWIFT_DISTRIBUTION_TAG}_${TARGET_ARCH}
+fi

swift-debian.dockerfile

@@ -1,5 +1,5 @@
 ARG SWIFT_VERSION=6.2
-ARG DISTRIBUTION_VERSION=jammy
-FROM swift:${SWIFT_VERSION}-${DISTRIBUTION_VERSION}
+ARG SWIFT_DISTRIBUTION_TAG=jammy
+FROM swift:${SWIFT_VERSION}-${SWIFT_DISTRIBUTION_TAG}
 ARG EXTRA_PACKAGES
 RUN apt update && apt -y install libsystemd-dev ${EXTRA_PACKAGES} && apt -y clean

swift-rhel-old.dockerfile

@@ -0,0 +1,5 @@
+ARG SWIFT_VERSION=6.2
+ARG SWIFT_DISTRIBUTION_TAG=amazonlinux2
+FROM swift:${SWIFT_VERSION}-${SWIFT_DISTRIBUTION_TAG}
+ARG EXTRA_PACKAGES
+RUN yum -y install systemd-devel ${EXTRA_PACKAGES} && yum clean all

swift-rhel.dockerfile

@@ -1,6 +1,5 @@
 ARG SWIFT_VERSION=6.2
-ARG DISTRIBUTION_NAME=rhel
-ARG DISTRIBUTION_VERSION=ubi9
-FROM swift:${SWIFT_VERSION}-${DISTRIBUTION_NAME}-${DISTRIBUTION_VERSION}
+ARG SWIFT_DISTRIBUTION_TAG=rhel-ubi9
+FROM swift:${SWIFT_VERSION}-${SWIFT_DISTRIBUTION_TAG}
 ARG EXTRA_PACKAGES
 RUN dnf -y install systemd-devel ${EXTRA_PACKAGES} && dnf clean all

test-sdk.sh

@@ -25,7 +25,6 @@ if [[ $SWIFT_VERSION == *"6."* ]]; then
     SWIFT_SDK_COMMAND="swift-sdk"
 fi
 
-SDK_NAME=${SWIFT_VERSION}-RELEASE_${DISTRIBUTION_NAME}_${DISTRIBUTION_VERSION}_${TARGET_ARCH}
 PACKAGE_PATH="--package-path ${TEST_PROJECT}"
 echo "Testing ${SDK_NAME} by building test-project in ${BUILD_PROFILE} mode with extra flags: ${EXTRA_FLAGS}"
 swift package clean ${PACKAGE_PATH}