Strip -unknown- from target triple to align with build-script convention

This change aligns the target triple with the build-script convention
by stripping `-unknown-` from the target triple.

Author: kateinoigakukun

.github/workflows/build-toolchain.yml

@@ -228,8 +228,8 @@ jobs:
       - name: Extract installable archive from Docker container
         if: ${{ matrix.container != null && matrix.only_swift_sdk }}
         run: |
-          docker cp swiftwasm-ci-buildbot:/home/build-user/swift-wasm-${{ matrix.toolchain_channel }}-SNAPSHOT-wasm32-unknown-wasi.artifactbundle.zip .
-          docker cp swiftwasm-ci-buildbot:/home/build-user/swift-wasm-${{ matrix.toolchain_channel }}-SNAPSHOT-wasm32-unknown-wasip1-threads.artifactbundle.zip .
+          docker cp swiftwasm-ci-buildbot:/home/build-user/swift-wasm-${{ matrix.toolchain_channel }}-SNAPSHOT-wasm32-wasi.artifactbundle.zip .
+          docker cp swiftwasm-ci-buildbot:/home/build-user/swift-wasm-${{ matrix.toolchain_channel }}-SNAPSHOT-wasm32-wasip1-threads.artifactbundle.zip .
 
       - name: Extract build-cache from Docker container
         if: ${{ matrix.container != null && !cancelled() }}
@@ -264,18 +264,18 @@ jobs:
           path: swift-wasm-${{ matrix.toolchain_channel }}-SNAPSHOT-${{ matrix.target }}.artifactbundle.zip
           if-no-files-found: ignore
 
-      - name: Upload Swift SDK artifact bundle (wasm32-unknown-wasi)
+      - name: Upload Swift SDK artifact bundle (wasm32-wasi)
         uses: actions/upload-artifact@v4
         if: ${{ matrix.only_swift_sdk }}
         with:
-          name: ${{ matrix.scheme }}-wasm32-unknown-wasi-artifactbundle
-          path: swift-wasm-${{ matrix.toolchain_channel }}-SNAPSHOT-wasm32-unknown-wasi.artifactbundle.zip
-      - name: Upload Swift SDK artifact bundle (wasm32-unknown-wasip1-threads)
+          name: ${{ matrix.scheme }}-wasm32-wasi-artifactbundle
+          path: swift-wasm-${{ matrix.toolchain_channel }}-SNAPSHOT-wasm32-wasi.artifactbundle.zip
+      - name: Upload Swift SDK artifact bundle (wasm32-wasip1-threads)
         uses: actions/upload-artifact@v4
         if: ${{ matrix.only_swift_sdk }}
         with:
-          name: ${{ matrix.scheme }}-wasm32-unknown-wasip1-threads-artifactbundle
-          path: swift-wasm-${{ matrix.toolchain_channel }}-SNAPSHOT-wasm32-unknown-wasip1-threads.artifactbundle.zip
+          name: ${{ matrix.scheme }}-wasm32-wasip1-threads-artifactbundle
+          path: swift-wasm-${{ matrix.toolchain_channel }}-SNAPSHOT-wasm32-wasip1-threads.artifactbundle.zip
 
       # Prepare for running tests
       - uses: bytecodealliance/actions/wasmtime/setup@v1
@@ -332,7 +332,7 @@ jobs:
         run: |
           echo 'print("Hello, world!")' > hello.swift
           $TOOLCHAIN/usr/bin/swiftc \
-                -target wasm32-unknown-wasi \
+                -target wasm32-wasi \
                 -sdk $TOOLCHAIN/usr/share/wasi-sysroot \
                 -resource-dir $TOOLCHAIN/usr/lib/swift_static \
                 hello.swift -o hello.wasm && \

schemes/main/build/build-target-toolchain.sh

@@ -160,13 +160,13 @@ main() {
     "$OPTIONS_SWIFT_BIN"
   )
 
-  build_target_toolchain "${BUILD_TOOLS_ARGS[@]}" "wasm32-unknown-wasi" "wasmstdlib" "wasi"
-  build_target_toolchain "${BUILD_TOOLS_ARGS[@]}" "wasm32-unknown-wasip1-threads" "wasmthreadsstdlib" "wasip1"
+  build_target_toolchain "${BUILD_TOOLS_ARGS[@]}" "wasm32-wasi" "wasmstdlib" "wasi"
+  build_target_toolchain "${BUILD_TOOLS_ARGS[@]}" "wasm32-wasip1-threads" "wasmthreadsstdlib" "wasip1"
 
   rsync -av "$WASI_SYSROOT_PATH/" "$PACKAGING_DIR/wasi-sysroot/"
 
-  build_target_corelibs "${BUILD_TOOLS_ARGS[@]}" "wasm32-unknown-wasi"
-  build_target_corelibs "${BUILD_TOOLS_ARGS[@]}" "wasm32-unknown-wasip1-threads"
+  build_target_corelibs "${BUILD_TOOLS_ARGS[@]}" "wasm32-wasi"
+  build_target_corelibs "${BUILD_TOOLS_ARGS[@]}" "wasm32-wasip1-threads"
 }
 
 main "$@"

tools/build/build-toolchain.sh

@@ -40,7 +40,7 @@ if need_build_cross_compiler; then
   # compilers in the base toolchain with the just built ones
   # in the host toolchain. So we copy the host toolchain to
   # target toolchain first.
-  TARGET_TOOLCHAIN_DESTDIR=$PACKAGING_DIR/target-toolchain/wasm32-unknown-wasi
+  TARGET_TOOLCHAIN_DESTDIR=$PACKAGING_DIR/target-toolchain/wasm32-wasi
   rm -rf "$TARGET_TOOLCHAIN_DESTDIR"
   mkdir -p "$TARGET_TOOLCHAIN_DESTDIR"
   rsync -a "$CROSS_COMPILER_DESTDIR/" "$TARGET_TOOLCHAIN_DESTDIR"

tools/build/package-toolchain

@@ -71,7 +71,7 @@ class PackageAction(Action):
     def __init__(self, options, snapshot_info: SnapshotInfo):
         super().__init__(options)
         self.snapshot_info = snapshot_info
-        self.target_triple = "wasm32-unknown-wasi"
+        self.target_triple = "wasm32-wasi"
 
     def run(self):
         import shutil
@@ -104,10 +104,10 @@ class PackageAction(Action):
         # e.g.
         # The canonical way to build a static executable is to use -static-executable and specify -sdk because
         # we don't have good concensus for the wasi-sysroot layout and the driver should not assume the SDK path.
-        # $ echo | ./usr/bin/swiftc -target wasm32-unknown-wasi -o /dev/null - -static-executable -sdk ./usr/share/wasi-sysroot
+        # $ echo | ./usr/bin/swiftc -target wasm32-wasi -o /dev/null - -static-executable -sdk ./usr/share/wasi-sysroot
         # But we don't want to force users to specify -sdk, so we have a hack in the legacy driver to assume
         # the SDK path and pass -static-executable (effectively -use-static-resource-dir).
-        # $ echo | ./usr/bin/swiftc -target wasm32-unknown-wasi -o /dev/null -
+        # $ echo | ./usr/bin/swiftc -target wasm32-wasi -o /dev/null -
         # The new swift-driver doesn't have this hack, so we remove swift-driver from the toolchain for now.
         swift_driver_path = os.path.join(dist_toolchain_path, 'usr', 'bin', 'swift-driver')
         if os.path.exists(swift_driver_path) and \
@@ -440,7 +440,7 @@ def main():
 
         toolchain_channel = derive_toolchain_channel(options.scheme)
         for target_triple in [
-            "wasm32-unknown-wasi", "wasm32-unknown-wasip1-threads"
+            "wasm32-wasi", "wasm32-wasip1-threads"
         ]:
             snapshot_info = SnapshotInfo(
                 now.year, now.month, now.day,

tools/gh-distribute-toolchain

@@ -768,12 +768,12 @@ def derive_platform_suffix_and_scheme(
     Returns platform suffix, scheme, and target triple derived from the
     artifact name.
     e.g.
-        "main-wasm32-unknown-wasi-artifactbundle", scheme="main"
-          -> [None, "main", "wasm32-unknown-wasi"]
+        "main-wasm32-wasi-artifactbundle", scheme="main"
+          -> [None, "main", "wasm32-wasi"]
         "macos_x86_64-main-artifactbundle", scheme="main"
-          -> ["macos_x86_64", "main", "wasm32-unknown-wasi"]
+          -> ["macos_x86_64", "main", "wasm32-wasi"]
         "ubuntu22.04_x86_64-installable", scheme="main"
-          -> ["ubuntu22.04_x86_64", "main", "wasm32-unknown-wasi"]
+          -> ["ubuntu22.04_x86_64", "main", "wasm32-wasi"]
     """
 
     # v3 artifact name: <scheme>-<target-triple>-artifactbundle
@@ -800,10 +800,10 @@ def derive_platform_suffix_and_scheme(
     components = name.split("-")
     if len(components) >= 3:
         scheme = "-".join(components[1:-1])
-        return [components[0], scheme, "wasm32-unknown-wasi"]
+        return [components[0], scheme, "wasm32-wasi"]
     else:
         # Assume legacy representation only used for the main scheme
-        return [components[0], "main", "wasm32-unknown-wasi"]
+        return [components[0], "main", "wasm32-wasi"]
 
 
 def latest_success_run_id(gh: GitHub, workflow_name: str, branch: str, scheme: str):