Repair main and release/5.9 build

.github/scripts/build-matrix.rb

@@ -6,7 +6,10 @@
     "build_os": "ubuntu-18.04",
     "agent_query": "ubuntu-20.04",
     "target": "ubuntu18.04_x86_64",
-    "container": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-18.04",
+    "containers": {
+      "main": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-18.04",
+      "release/5.9": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-18.04@sha256:c996b1fe2babba4e468a6422d9fbe1a9e080e4745c5cb933e4eeaed0a5a95840",
+    },
     "run_stdlib_test": true,
     "run_full_test": false,
     "run_e2e_test": true,
@@ -18,7 +21,10 @@
     "build_os": "ubuntu-20.04",
     "agent_query": "ubuntu-20.04",
     "target": "ubuntu20.04_x86_64",
-    "container": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04",
+    "containers": {
+      "main": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04",
+      "release/5.9": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04@sha256:61d40c32e63abbebb35fa682d78991e0cb9b186f280ba42adec89443905af2f4",
+    },
     "run_stdlib_test": true,
     "run_full_test": false,
     "run_e2e_test": true,
@@ -30,7 +36,10 @@
     "build_os": "ubuntu-22.04",
     "agent_query": "ubuntu-22.04",
     "target": "ubuntu22.04_x86_64",
-    "container": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-22.04",
+    "containers": {
+      "main": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-22.04",
+      "release/5.9": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-22.04@sha256:a55c1ab110d3ef8b1605234245803b5917484990d0b3a00077f9957ae386da97",
+    },
     "run_stdlib_test": true,
     "run_full_test": false,
     "run_e2e_test": true,
@@ -42,7 +51,10 @@
     "build_os": "amazon-linux-2",
     "agent_query": "ubuntu-22.04",
     "target": "amazonlinux2_x86_64",
-    "container": "ghcr.io/swiftwasm/swift-ci:main-amazon-linux-2",
+    "containers": {
+      "main": "ghcr.io/swiftwasm/swift-ci:main-amazon-linux-2",
+      "release/5.9": "ghcr.io/swiftwasm/swift-ci:main-amazon-linux-2@sha256:5aa7643df1a0d2ea43d86e1dfa603848760deb6efba50349bd00fee9395d0ded",
+    },
     "run_stdlib_test": false,
     "run_full_test": false,
     "run_e2e_test": false,
@@ -105,7 +117,10 @@ def main
         "build_os": "ubuntu-20.04",
         "agent_query": label,
         "target": "ubuntu20.04_aarch64",
-        "container": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04",
+        "containers": {
+          "main": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04",
+          "release/5.9": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04@sha256:61d40c32e63abbebb35fa682d78991e0cb9b186f280ba42adec89443905af2f4",
+        },
         "run_stdlib_test": false,
         "run_full_test": false,
         "run_e2e_test": false,
@@ -133,7 +148,10 @@ def main
       raise "Unknown scheme: #{scheme}"
     end
     matrix_entries.map do |entry|
-      entry.merge("scheme": scheme, toolchain_channel: toolchain_channel)
+      container = if containers = entry[:containers]
+        containers[scheme.to_sym] || containers[:main]
+      end
+      entry.merge("scheme": scheme, toolchain_channel: toolchain_channel, container: container)
     end
   end
 

.github/workflows/build-toolchain.yml

@@ -65,7 +65,7 @@ jobs:
     name: Build matrix
     needs: [start-runner]
     runs-on: ubuntu-latest
-    if: ${{ always() }}
+    if: ${{ !cancelled() }}
     outputs:
       entries: ${{ steps.generate.outputs.entries }}
     steps:
@@ -99,7 +99,7 @@ jobs:
       # https://github.com/actions/cache/blob/main/tips-and-workarounds.md#cache-segment-restore-timeout
       SEGMENT_DOWNLOAD_TIMEOUT_MINS: 30
     needs: [build-matrix]
-    if: ${{ always() }}
+    if: ${{ !cancelled() }}
     strategy:
       fail-fast: false
       matrix:
@@ -113,8 +113,6 @@ jobs:
         if: ${{ matrix.free_disk_space }}
         run: |
           df -h
-          sudo swapoff -a
-          sudo rm -f /swapfile
           sudo rm -rf /opt/hostedtoolcache
           sudo rm -rf /usr/share/dotnet
           sudo apt clean
@@ -188,6 +186,7 @@ jobs:
             --cap-add=SYS_PTRACE \
             --security-opt seccomp=unconfined \
             -dit \
+            -e CI=$CI \
             -w /home/build-user/ \
             -v ${{ github.workspace }}:/source \
             -v oss-swift-package:/home/build-user \
@@ -196,7 +195,7 @@ jobs:
           docker cp swiftwasm-ci-buildbot:/home/build-user/swift-wasm-${{ matrix.toolchain_channel }}-SNAPSHOT-${{ matrix.target }}.tar.gz .
 
       - name: Extract build-cache from Docker container
-        if: ${{ matrix.container != null && always() }}
+        if: ${{ matrix.container != null && !cancelled() }}
         run: |
           rm -rf ${{ github.workspace }}/build-cache
           docker cp swiftwasm-ci-buildbot:/home/build-user/build-cache ${{ github.workspace }}/build-cache
@@ -209,7 +208,7 @@ jobs:
         run: ./swiftwasm-build/tools/build/ci.sh ${{ matrix.scheme }}
 
       - uses: actions/cache/save@v3
-        if: ${{ always() }}
+        if: ${{ !cancelled() }}
         with:
           path: build-cache
           key: ${{ steps.cache_key.outputs.SCCACHE_KEY }}
@@ -223,7 +222,8 @@ jobs:
       - name: Run stdlib tests for wasi-wasm32
         if: ${{ matrix.run_stdlib_test && matrix.container != null }}
         run: |
-          docker exec swiftwasm-ci-buildbot /bin/bash -lc "cd build/WebAssembly/swift-stdlib-wasi-wasm32 && ninja check-swift-wasi-wasm32-custom"
+          docker exec swiftwasm-ci-buildbot /bin/bash -lc \
+            "ninja -C build/WebAssembly/swift-stdlib-wasi-wasm32 check-swift-wasi-wasm32-custom && rm -rf build"
       - name: Run stdlib tests for wasi-wasm32
         if: ${{ matrix.run_stdlib_test && matrix.container == null }}
         run: |
@@ -248,6 +248,13 @@ jobs:
           name: ${{ matrix.target }}-test-results
           path: ./swift-test-results.tar.gz
 
+      - name: Cleanup docker volume
+        if: ${{ matrix.container != null }}
+        run: |
+          docker stop swiftwasm-ci-buildbot
+          docker rm swiftwasm-ci-buildbot
+          docker volume rm --force oss-swift-package
+
       # Run e2e test
       - name: Prepare E2E test
         run: |
@@ -262,6 +269,7 @@ jobs:
           $TOOLCHAIN/usr/bin/swiftc \
                 -target wasm32-unknown-wasi \
                 -sdk $TOOLCHAIN/usr/share/wasi-sysroot \
+                -resource-dir $TOOLCHAIN/usr/lib/swift_static \
                 hello.swift -o hello.wasm && \
                 echo "Successfully linked hello.wasm"
       - name: Upload hello.wasm

schemes/main/manifest.json

@@ -1,8 +1,11 @@
 {
-  "base-tag": "swift-DEVELOPMENT-SNAPSHOT-2023-08-03-a",
+  "base-tag": "swift-DEVELOPMENT-SNAPSHOT-2023-10-27-a",
   "repos": {
     "swift-corelibs-foundation": "660624d0220c0efbef054f4919f9f01fd3866be1",
     "swift-corelibs-xctest": "77bc9f5386ee8a2a4e8da5ac30e846b451d101b6"
   },
+  "build-compiler": false,
+  "icu4c": "https://github.com/swiftwasm/icu4c-wasi/releases/download/0.7.0/icu4c-wasi.tar.xz",
+  "wasi-sysroot": "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-19/wasi-sysroot-19.0.tar.gz",
   "swift-org-download-channel": "development"
 }

schemes/main/swift-corelibs-foundation/0001-wasm-import-emulated-wasi-libc-module-for-mman-apis.patch

@@ -0,0 +1,37 @@
+From 2be8e97d311ee0a7530303d62bcd51e7cba6df59 Mon Sep 17 00:00:00 2001
+From: Yuta Saito <kateinoigakukun@gmail.com>
+Date: Sun, 29 Oct 2023 00:39:00 +0000
+Subject: [PATCH 1/2] [wasm] import emulated wasi-libc module for mman apis
+
+---
+ Sources/Foundation/Data.swift       | 1 +
+ Sources/Foundation/FileHandle.swift | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/Sources/Foundation/Data.swift b/Sources/Foundation/Data.swift
+index f6b9a06b..f396129a 100644
+--- a/Sources/Foundation/Data.swift
++++ b/Sources/Foundation/Data.swift
+@@ -29,6 +29,7 @@
+ @usableFromInline let memcpy = Glibc.memcpy
+ @usableFromInline let memcmp = Glibc.memcmp
+ #elseif canImport(WASILibc)
++@_implementationOnly import wasi_emulated_mman
+ @usableFromInline let calloc = WASILibc.calloc
+ @usableFromInline let malloc = WASILibc.malloc
+ @usableFromInline let free = WASILibc.free
+diff --git a/Sources/Foundation/FileHandle.swift b/Sources/Foundation/FileHandle.swift
+index 5e28678c..670d684f 100644
+--- a/Sources/Foundation/FileHandle.swift
++++ b/Sources/Foundation/FileHandle.swift
+@@ -26,6 +26,7 @@ fileprivate let _write = Glibc.write(_:_:_:)
+ fileprivate let _close = Glibc.close(_:)
+ #elseif canImport(WASILibc)
+ import WASILibc
++@_implementationOnly import wasi_emulated_mman
+ fileprivate let _read = WASILibc.read(_:_:_:)
+ fileprivate let _write = WASILibc.write(_:_:_:)
+ fileprivate let _close = WASILibc.close(_:)
+-- 
+2.40.0
+