Author: marcprux

.github/workflows/pull_request.yml

@@ -91,13 +91,14 @@ jobs:
 
           ARTIFACT_EXT=".artifactbundle.tar.gz"
           ARTIFACT_NAME="$(basename ${ARTIFACT_PATH} ${ARTIFACT_EXT})"
+          # depending on whether we are building locally or in a container, add a maker to the name
+          if [[ "${{ matrix.build-type }}" == 'local' ]]; then
+            ARTIFACT_NAME="${ARTIFACT_NAME}-local"
+          fi
           # artifacts need a unique name so we suffix with the matrix arch(s)
           if [[ ! -z "${{ matrix.arch }}" ]]; then
             ARTIFACT_NAME="${ARTIFACT_NAME}-$(echo ${{ matrix.arch }} | tr ',' '-')"
           fi
-          if [[ "${{ matrix.build-type }}" == 'local' ]]; then
-            ARTIFACT_NAME="${ARTIFACT_NAME}-$(echo ${{ matrix.arch }} | tr ',' '-')-local"
-          fi
           ARTIFACT_NAME="${ARTIFACT_NAME}${ARTIFACT_EXT}"
 
           # There is no way to prevent even a single-file artifact from being zipped:

swift-ci/sdks/android/Dockerfile

@@ -6,15 +6,6 @@
 
 FROM ubuntu:24.04
 
-# Versions to fetch
-
-ARG SWIFT_VERSION=scheme:release/6.2
-ARG LIBXML2_VERSION=2.12.7
-ARG CURL_VERSION=8.7.1
-ARG BORINGSSL_VERSION=fips-20220613
-ARG ICU_VERSION=maint/maint-69
-ARG ZLIB_VERSION=1.3.1
-
 # Architecture to build on (empty means x86-64)
 ARG OS_ARCH_SUFFIX=
 
@@ -82,6 +73,8 @@ ENV SWIFT_VERSION=$SWIFT_VERSION \
     ICU_VERSION=$ICU_VERSION \
     ZLIB_VERSION=$ZLIB_VERSION
 
+ENV SWIFT_BUILD_DOCKER="1"
+
 COPY scripts /scripts
 RUN chmod ugo+x /scripts/*
 

swift-ci/sdks/android/build-docker

@@ -49,7 +49,7 @@ $DOCKER build --build-arg OS_ARCH_SUFFIX=$OS_ARCH_SUFFIX --build-arg SWIFT_TOOLC
 
 $DOCKER run -i --rm \
           -v ${WORKDIR}/source:/source \
-          -v ${WORKDIR}/products:/products \
+          -v ${WORKDIR}/products:/products:rw \
           ${CONTAINER_NAME} \
           /scripts/build.sh \
             --source-dir /source \

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

@@ -168,6 +168,11 @@ fi
 # Find the version numbers of the various dependencies
 function describe {
     pushd $1 >/dev/null 2>&1
+    # this is needed for docker containers or else we get the error:
+    # fatal: detected dubious ownership in repository at '/source/curl'
+    if [[ "${SWIFT_BUILD_DOCKER}" == "1" ]]; then
+        git config --global --add safe.directory $(pwd)
+    fi
     git describe --tags
     popd >/dev/null 2>&1
 }