Fix Wasm capitalization and logging

Author: jrflat

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

@@ -62,7 +62,7 @@ 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
@@ -74,7 +74,7 @@ command -v jq >/dev/null || (apt update -q && apt install -yq jq)
 SWIFT_API_INSTALL_ROOT="https://www.swift.org/api/v1/install"
 
 # Transforms a minor Swift release version into its latest patch version
-# and gets the checksum for the patch version's static and/or wasm SDK.
+# and gets the checksum for the patch version's static and/or Wasm SDK.
 #
 # $1 (string): A minor Swift version, e.g. "6.1"
 # Output: A string of the form "<patch-version>|<static-checksum>|<wasm-checksum>
@@ -130,16 +130,16 @@ find_latest_swift_version() {
         ')
 
         if [[ -z "$wasm_checksum" ]]; then
-            fatal "No wasm SDK checksum found for Swift $latest_version"
+            fatal "No Wasm SDK checksum found for Swift $latest_version"
         fi
 
-        log "Found wasm SDK checksum: ${wasm_checksum:0:12}..."
+        log "Found Wasm SDK checksum: ${wasm_checksum:0:12}..."
     fi
 
     echo "${latest_version}|${static_checksum}|${wasm_checksum}"
 }
 
-# Finds the latest static or wasm SDK development snapshot
+# Finds the latest static or Wasm SDK development snapshot
 # for the inputted Swift version and its checksum.
 #
 # $1 (string): Nightly Swift version, e.g. "6.2" or "main"
@@ -226,7 +226,7 @@ if [[ "$INSTALL_STATIC" == true && -z "$STATIC_SDK_TAG" ]]; then
 fi
 
 if [[ "$INSTALL_WASM" == true && -z "$WASM_SDK_TAG" ]]; then
-    fatal "WASM_SDK_TAG is not set but wasm SDK installation was requested"
+    fatal "WASM_SDK_TAG is not set but Wasm SDK installation was requested"
 fi
 
 get_installed_swift_tag() {
@@ -406,6 +406,7 @@ SWIFT_EXECUTABLE_FOR_WASM_SDK=""
 
 if [[ "$INSTALL_STATIC" == true ]]; then
     if [[ "$INSTALLED_SWIFT_TAG" == "$STATIC_SDK_TAG" ]]; then
+        log "Current toolchain matches static SDK snapshot: $STATIC_SDK_TAG"
         SWIFT_EXECUTABLE_FOR_STATIC_SDK="swift"
     else
         log "Installing Swift toolchain to match static SDK snapshot: $STATIC_SDK_TAG"
@@ -416,9 +417,10 @@ fi
 
 if [[ "$INSTALL_WASM" == true ]]; then
     if [[ "$INSTALLED_SWIFT_TAG" == "$WASM_SDK_TAG" ]]; then
+        log "Current toolchain matches Wasm SDK snapshot: $STATIC_SDK_TAG"
         SWIFT_EXECUTABLE_FOR_WASM_SDK="swift"
     else
-        log "Installing Swift toolchain to match wasm SDK snapshot: $WASM_SDK_TAG"
+        log "Installing Swift toolchain to match Wasm SDK snapshot: $WASM_SDK_TAG"
         initialize_os_info
         SWIFT_EXECUTABLE_FOR_WASM_SDK=$(download_and_extract_toolchain "$WASM_SDK_TAG")
     fi
@@ -449,23 +451,23 @@ install_static_sdk() {
 }
 
 install_wasm_sdk() {
-    # Check if the wasm SDK is already installed
+    # Check if the Wasm SDK is already installed
     if "$SWIFT_EXECUTABLE_FOR_WASM_SDK" sdk list 2>/dev/null | grep -q "^${WASM_SDK_TAG}_wasm"; then
-        log "✅ Static SDK ${WASM_SDK_TAG} is already installed, skipping installation"
+        log "✅ Wasm SDK ${WASM_SDK_TAG} is already installed, skipping installation"
         return 0
     fi
 
-    log "Installing Swift Static SDK: $WASM_SDK_TAG"
+    log "Installing Swift Wasm SDK: $WASM_SDK_TAG"
 
     local wasm_sdk_filename="${WASM_SDK_TAG}_wasm.artifactbundle.tar.gz"
     local sdk_url="${WASM_SDK_DOWNLOAD_ROOT}/${WASM_SDK_TAG}/${wasm_sdk_filename}"
 
     log "Running: ${SWIFT_EXECUTABLE_FOR_WASM_SDK} sdk install ${sdk_url} --checksum ${WASM_SDK_CHECKSUM}"
 
     if "$SWIFT_EXECUTABLE_FOR_WASM_SDK" sdk install "$sdk_url" --checksum "$WASM_SDK_CHECKSUM"; then
-        log "✅ Static SDK installed successfully"
+        log "✅ Wasm SDK installed successfully"
     else
-        fatal "Failed to install wasm SDK"
+        fatal "Failed to install Wasm SDK"
     fi
 }
 
@@ -476,7 +478,7 @@ install_sdks() {
     fi
 
     if [[ "$INSTALL_WASM" == true ]]; then
-        log "Starting install of Swift ${SWIFT_VERSION_INPUT} wasm SDK"
+        log "Starting install of Swift ${SWIFT_VERSION_INPUT} Wasm SDK"
         install_wasm_sdk
     fi
 }
@@ -501,7 +503,7 @@ build() {
     fi
 
     if [[ "$INSTALL_WASM" == true ]]; then
-        log "Running Swift build with wasm SDK"
+        log "Running Swift build with Wasm SDK"
 
         local sdk_name="${WASM_SDK_TAG}_wasm"
         local build_command="$SWIFT_EXECUTABLE_FOR_WASM_SDK build --swift-sdk $sdk_name"
@@ -512,9 +514,9 @@ build() {
         log "Running: $build_command"
 
         if eval "$build_command"; then
-            log "✅ Swift build with wasm SDK completed successfully"
+            log "✅ Swift build with Wasm SDK completed successfully"
         else
-            fatal "Swift build with wasm SDK failed"
+            fatal "Swift build with Wasm SDK failed"
         fi
     fi
 }