Change BUILD_VERSION to BUILD_SCHEME and have it match release, swift-*-branch, or development

Author: marcprux

.github/workflows/pull_request.yml

@@ -35,7 +35,7 @@ jobs:
          #arch: ['x86_64']
          # build both the quick (x86_64) and complete (aarch64,x86_64,armv7) SDKs
          #arch: ['x86_64', '']
-         swift-version: ['release', 'devel', 'trunk']
+         swift-version: ['release', 'swift-6.2-branch', 'development']
      runs-on: ubuntu-24.04
      steps:
       - name: Free Disk Space
@@ -52,7 +52,7 @@ jobs:
         run: |
           # these variabes are used by build-docker and build-local
           # to determine which Swift version to build for
-          echo "BUILD_VERSION=${{ matrix.swift-version }}" >> $GITHUB_ENV
+          echo "BUILD_SCHEME=${{ matrix.swift-version }}" >> $GITHUB_ENV
           echo "TARGET_ARCHS=${{ matrix.arch }}" >> $GITHUB_ENV
           echo "WORKDIR=${{ runner.temp }}/swift-android-sdk" >> $GITHUB_ENV
       - name: Checkout repository
@@ -62,12 +62,12 @@ jobs:
         working-directory: swift-ci/sdks/android
         run: |
           sudo apt install -q ninja-build patchelf
-          ./build-local ${BUILD_VERSION} ${WORKDIR}
+          ./build-local ${BUILD_SCHEME} ${WORKDIR}
       - name: Build Android SDK (Docker)
         if: ${{ matrix.build-type == 'docker' }}
         working-directory: swift-ci/sdks/android
         run: |
-          ./build-docker ${BUILD_VERSION} ${WORKDIR}
+          ./build-docker ${BUILD_SCHEME} ${WORKDIR}
       - name: Install Host Toolchain
         if: ${{ matrix.build-type == 'docker' }}
         working-directory: swift-ci/sdks/android

swift-ci/sdks/android/build-docker

@@ -12,7 +12,7 @@ TARGET_ARCHS=${TARGET_ARCHS:-aarch64,x86_64,armv7}
 ANDROID_NDK_VERSION=android-ndk-r27c
 ANDROID_API=28
 
-export BUILD_VERSION=${1}
+export BUILD_SCHEME=${1}
 # note that WORKDIR must not be under the current checkout or the patches will fail to apply
 WORKDIR=${2}
 if [[ "${WORKDIR}" == '' ]]; then

swift-ci/sdks/android/build-local

@@ -12,7 +12,7 @@ TARGET_ARCHS=${TARGET_ARCHS:-aarch64,x86_64,armv7}
 ANDROID_NDK_VERSION=android-ndk-r27c
 ANDROID_API=28
 
-export BUILD_VERSION=${1}
+export BUILD_SCHEME=${1}
 # note that WORKDIR must not be under the current checkout or the patches will fail to apply
 WORKDIR=${2}
 if [[ "${WORKDIR}" == '' ]]; then

swift-ci/sdks/android/scripts/patch-sources.sh

@@ -28,19 +28,19 @@ perl -pi -e 's;dispatch android-execinfo;dispatch;g' $swift_android_patch
 perl -pi -e 's;call ln -sf;call ln -svf;g' $swift_android_patch
 perl -pi -e 's%linux-x86_64/sysroot/usr/lib"%linux-x86_64/sysroot/usr/lib"; echo "VALIDATING SYMBOLIC LINK"; ls -la "\${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib"; ls -la "\${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/swift"; %g' $swift_android_patch
 
-case "${BUILD_VERSION}" in
+case "${BUILD_SCHEME}" in
     release)
         testing_patch="${patches_dir}/swift-android-testing-release.patch"
         ;;
-    devel)
+    swift-*-branch)
         testing_patch="${patches_dir}/swift-android-testing-except-release.patch"
         ;;
-    trunk)
+    development)
         testing_patch="${patches_dir}/swift-android-testing-except-release.patch"
         dispatch_patch="${patches_dir}/swift-android-trunk-libdispatch.patch"
         ;;
     *)
-        echo "$0: invalid BUILD_VERSION=${BUILD_VERSION}"
+        echo "$0: invalid BUILD_SCHEME=${BUILD_SCHEME}"
         exit 1
         ;;
 esac

swift-ci/sdks/android/scripts/toolchain-vars.sh

@@ -7,32 +7,32 @@
 # ===----------------------------------------------------------------------===
 
 # This script is meant to be sourced from another script that sets the
-# BUILD_VERSION environment variable to one of "release", "devel", or "trunk"
+# BUILD_SCHEME environment variable to one of "release", "swift-VERSION-branch", or "development"
 # and will set check the latest builds for each build type in order
 # to provide information about the Swift tag name in use and where to
 # obtain the latest toolchain for building.
 
 OS=$(echo $HOST_OS | tr -d '.')
 
-case "${BUILD_VERSION}" in
+case "${BUILD_SCHEME}" in
     release)
         # e.g., "swift-6.1-RELEASE"
         SWIFT_TAG=$(curl -fsSL https://www.swift.org/api/v1/install/releases.json | jq -r '.[-1].tag')
         # e.g., "swift-6.1-release"
         SWIFT_BRANCH=$(echo "${SWIFT_TAG}" | tr '[A-Z]' '[a-z]')
         ;;
-    devel)
+    swift-*-branch)
         # e.g., swift-6.2-DEVELOPMENT-SNAPSHOT-2025-05-15-a
-        SWIFT_TAG=$(curl -fsSL https://download.swift.org/swift-6.2-branch/$OS/latest-build.yml | grep '^dir: ' | cut -f 2 -d ' ')
-        SWIFT_BRANCH="swift-$(echo $SWIFT_TAG | cut -d- -f2)-branch"
+        SWIFT_TAG=$(curl -fsSL https://download.swift.org/$BUILD_SCHEME/$OS/latest-build.yml | grep '^dir: ' | cut -f 2 -d ' ')
+        SWIFT_BRANCH=$BUILD_SCHEME
         ;;
-    trunk)
+    development)
         # e.g., swift-DEVELOPMENT-SNAPSHOT-2025-05-14-a
         SWIFT_TAG=$(curl -fsSL https://download.swift.org/development/$OS/latest-build.yml | grep '^dir: ' | cut -f 2 -d ' ')
         SWIFT_BRANCH="development"
         ;;
     *)
-        echo "$0: invalid BUILD_VERSION=${BUILD_VERSION}"
+        echo "$0: invalid BUILD_SCHEME=${BUILD_SCHEME}"
         exit 1
         ;;
 esac