Author: marcprux

swift-ci/sdks/android/Dockerfile

@@ -62,10 +62,10 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
 
 COPY scripts/install-swift.sh /scripts/install-swift.sh
 RUN chmod ugo+x /scripts/install-swift.sh
-RUN /scripts/install-swift.sh "${SWIFT_TOOLCHAIN_URL}"
+RUN /scripts/install-swift.sh
 ENV PATH="/usr/local/swift/bin:${PATH}"
 
-ARG ANDROID_NDK_VERSION=android-ndk-r27c
+ARG ANDROID_NDK_VERSION=
 
 ENV ANDROID_NDK_VERSION=$ANDROID_NDK_VERSION
 

swift-ci/sdks/android/scripts/install-ndk.sh

@@ -13,7 +13,13 @@ echo "Installing Android NDK"
 mkdir -p /usr/local/ndk
 pushd /usr/local/ndk >/dev/null
 
-NDKFILE=${NDK_VERSION}-linux.zip
+if [[ "${ANDROID_NDK_VERSION}" == "" ]]; then
+    echo "$0: Missing ANDROID_NDK_VERSION environment"
+    exit 1
+fi
+
+
+NDKFILE=${ANDROID_NDK_VERSION}-linux.zip
 
 NDKURL="https://dl.google.com/android/repository/${NDKFILE}"
 echo "Going to fetch ${NDKURL}"

swift-ci/sdks/android/scripts/install-swift.sh

@@ -8,7 +8,11 @@
 
 set -e
 
-SWIFT_TOOLCHAIN_URL=$1
+if [[ "${SWIFT_TOOLCHAIN_URL}" == "" ]]; then
+    echo "$0: Missing SWIFT_TOOLCHAIN_URL environment"
+    exit 1
+fi
+
 echo "Installing Swift from: ${SWIFT_TOOLCHAIN_URL}"
 
 # Make a temporary directory