Fix pre-build command and support Swift build flags

Author: jrflat

.github/workflows/pull_request.yml

@@ -10,11 +10,15 @@ jobs:
     uses: ./.github/workflows/swift_package_test.yml
     with:
       # Linux
-      linux_pre_build_command: |
+      linux_build_command: |
+        mkdir MyPackage
+        cd MyPackage
+        swift package init --type library
+        swift build
+      linux_static_sdk_pre_build_command: |
         mkdir MyPackage
         cd MyPackage
         swift package init --type library
-      linux_build_command: "swift build"
       enable_linux_static_sdk_build: true
       # Windows
       windows_build_command: |

.github/workflows/scripts/install-and-build-with-sdk.sh

@@ -21,6 +21,7 @@ fatal() { error "$@"; exit 1; }
 INSTALL_STATIC=false
 INSTALL_WASM=false
 SWIFT_VERSION_INPUT=""
+SWIFT_BUILD_FLAGS=""
 
 while [[ $# -gt 0 ]]; do
     case $1 in
@@ -32,6 +33,14 @@ while [[ $# -gt 0 ]]; do
             INSTALL_WASM=true
             shift
             ;;
+        --flags)
+            if [[ -n "$2" && "$2" != --* ]]; then
+                SWIFT_BUILD_FLAGS="$2"
+                shift 2
+            else
+                fatal "--flags requires an argument"
+            fi
+            ;;
         -*)
             fatal "Unknown option: $1"
             ;;
@@ -48,7 +57,7 @@ done
 
 # Validate arguments
 if [[ -z "$SWIFT_VERSION_INPUT" ]]; then
-    fatal "Usage: $0 [--static] [--wasm] <swift-version>"
+    fatal "Usage: $0 [--static] [--wasm] [--flags \"<build-flags>\"] <swift-version>"
 fi
 
 if [[ "$INSTALL_STATIC" == false && "$INSTALL_WASM" == false ]]; then
@@ -57,7 +66,10 @@ fi
 
 log "Requested Swift version: $SWIFT_VERSION_INPUT"
 log "Install static SDK: $INSTALL_STATIC"
-log "Install WASM SDK: $INSTALL_WASM"
+log "Install wasm SDK: $INSTALL_WASM"
+if [[ -n "$SWIFT_BUILD_FLAGS" ]]; then
+    log "Additional build flags: $SWIFT_BUILD_FLAGS"
+fi
 
 # Install dependencies
 command -v curl >/dev/null || (apt update -q && apt install -yq curl)
@@ -474,23 +486,35 @@ install_sdks() {
 
 build() {
     if [[ "$INSTALL_STATIC" == true ]]; then
-        local sdk_name="${STATIC_SDK_TAG}_static-linux-0.0.1"
         log "Running Swift build with static SDK"
-        log "Command: ${SWIFT_EXECUTABLE_FOR_STATIC_SDK} build --swift-sdk ${sdk_name}"
 
-        if "$SWIFT_EXECUTABLE_FOR_STATIC_SDK" build --swift-sdk "$sdk_name"; then
+        local sdk_name="${STATIC_SDK_TAG}_static-linux-0.0.1"
+        local build_command="$SWIFT_EXECUTABLE_FOR_STATIC_SDK build --swift-sdk $sdk_name"
+        if [[ -n "$SWIFT_BUILD_FLAGS" ]]; then
+            build_command="$build_command $SWIFT_BUILD_FLAGS"
+        fi
+
+        log "Running: $build_command"
+
+        if eval "$build_command"; then
             log "✅ Swift build with static SDK completed successfully"
         else
             fatal "Swift build with static SDK failed"
         fi
     fi
 
     if [[ "$INSTALL_WASM" == true ]]; then
-        local sdk_name="${WASM_SDK_TAG}_wasm"
         log "Running Swift build with wasm SDK"
-        log "Command: ${SWIFT_EXECUTABLE_FOR_WASM_SDK} build --swift-sdk ${sdk_name}"
 
-        if "$SWIFT_EXECUTABLE_FOR_WASM_SDK" build --swift-sdk "$sdk_name"; then
+        local sdk_name="${WASM_SDK_TAG}_wasm"
+        local build_command="$SWIFT_EXECUTABLE_FOR_WASM_SDK build --swift-sdk $sdk_name"
+        if [[ -n "$SWIFT_BUILD_FLAGS" ]]; then
+            build_command="$build_command $SWIFT_BUILD_FLAGS"
+        fi
+
+        log "Running: $build_command"
+
+        if eval "$build_command"; then
             log "✅ Swift build with wasm SDK completed successfully"
         else
             fatal "Swift build with wasm SDK failed"

.github/workflows/swift_package_test.yml

@@ -55,6 +55,10 @@ on:
         type: string
         description: "Linux command to execute before building the Swift package"
         default: ""
+      linux_static_sdk_pre_build_command:
+        type: string
+        description: "Linux command to execute before building the Swift package with the static SDK"
+        default: ""
       macos_pre_build_command:
         type: string
         description: "macOS command to execute before building the Swift package"
@@ -213,9 +217,13 @@ jobs:
       - name: Pre-build
         run: ${{ inputs.linux_pre_build_command }}
       - name: Install static SDK and build
+        env:
+          BUILD_FLAGS: ${{ (contains(matrix.swift_version, 'nightly') && inputs.swift_nightly_flags) || inputs.swift_flags }}
         run: |
+          ${{ inputs.linux_static_sdk_pre_build_command }}
           which curl || (apt -q update && apt -yq install curl)
-          curl -s --retry 3 https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/install-and-build-with-sdk.sh | bash -s -- --static
+          curl -s --retry 3 https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/install-and-build-with-sdk.sh | \
+          bash -s -- --static --flags "$BUILD_FLAGS" ${{ matrix.swift_version }}
 
   windows-build:
     name: Windows (${{ matrix.swift_version }} - windows-2022)