Merge branch 'main' into yt/swift-testing

Author: kateinoigakukun

.github/scripts/build-matrix.rb

@@ -27,7 +27,7 @@
       "main": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04",
       # "release-5.9": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04@sha256:cc1b99e352ee207da2c75c7bcf81aa8b1d2c08215fd1d05dc0777c40a62f31f1",
       "release-5.10": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04@sha256:cc1b99e352ee207da2c75c7bcf81aa8b1d2c08215fd1d05dc0777c40a62f31f1",
-      "release-6.0": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04@sha256:cc1b99e352ee207da2c75c7bcf81aa8b1d2c08215fd1d05dc0777c40a62f31f1",
+      "release-6.0": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04@sha256:9007661fb6d57ebef902618e831458e88068350b0ecc8d85e56441d25a9f4312",
     },
     "run_stdlib_test": true,
     "run_full_test": false,
@@ -45,7 +45,7 @@
       "main": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-22.04",
       # "release-5.9": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04@sha256:adfa0a8fbc6e5cc7ce5e38a5a9406d4fa5c557871204a65f0690478022d6b359",
       "release-5.10": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04@sha256:adfa0a8fbc6e5cc7ce5e38a5a9406d4fa5c557871204a65f0690478022d6b359",
-      "release-6.0": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04@sha256:adfa0a8fbc6e5cc7ce5e38a5a9406d4fa5c557871204a65f0690478022d6b359",
+      "release-6.0": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04@sha256:8060adba9c044b1fc751b9671167320c9cc0094d0a45d7b8fedb707c49b764c2",
     },
     "run_stdlib_test": true,
     "run_full_test": false,
@@ -63,7 +63,7 @@
       "main": "ghcr.io/swiftwasm/swift-ci:main-amazon-linux-2",
       # "release-5.9": "ghcr.io/swiftwasm/swift-ci:main-amazon-linux-2@sha256:d5264ac43e935249b1c8777f6809ebbd2836cb0e8f7dac3bfeeb0b3cdb479b70",
       "release-5.10": "ghcr.io/swiftwasm/swift-ci:main-amazon-linux-2@sha256:d5264ac43e935249b1c8777f6809ebbd2836cb0e8f7dac3bfeeb0b3cdb479b70",
-      "release-6.0": "ghcr.io/swiftwasm/swift-ci:main-amazon-linux-2@sha256:d5264ac43e935249b1c8777f6809ebbd2836cb0e8f7dac3bfeeb0b3cdb479b70",
+      "release-6.0": "ghcr.io/swiftwasm/swift-ci:main-amazon-linux-2@sha256:fc95912c595faecacbb869635fa871f8f31b8d6ed2f0df6792b53628db7ada94",
     },
     "run_stdlib_test": false,
     "run_full_test": false,
@@ -94,6 +94,7 @@
     "run_e2e_test": true,
     "build_hello_wasm": true,
     "clean_build_dir": true,
+    "free_disk_space": true,
     "only_swift_sdk": false,
   },
   {
@@ -116,7 +117,7 @@
     "target": "ubuntu22.04_x86_64",
     "containers": {
       "main": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-22.04",
-      "release-6.0": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04@sha256:adfa0a8fbc6e5cc7ce5e38a5a9406d4fa5c557871204a65f0690478022d6b359",
+      "release-6.0": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04@sha256:8060adba9c044b1fc751b9671167320c9cc0094d0a45d7b8fedb707c49b764c2",
     },
     "run_stdlib_test": true,
     "run_full_test": false,
@@ -187,7 +188,7 @@ def main
           "main": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04",
           # "release-5.9": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04@sha256:0e04dd550557d9f4f773bda55a6ac355c7c9696ea6efc3e59318bd49569aa00e",
           "release-5.10": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04@sha256:0e04dd550557d9f4f773bda55a6ac355c7c9696ea6efc3e59318bd49569aa00e",
-          "release-6.0": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04@sha256:0e04dd550557d9f4f773bda55a6ac355c7c9696ea6efc3e59318bd49569aa00e",
+          "release-6.0": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04@sha256:2a977060476a0f6f702d59ed0cd4e8506c7c1f1ed48d85a1a684d2d3fb62c297",
         },
         "run_stdlib_test": false,
         "run_full_test": false,

.github/workflows/build-toolchain.yml

@@ -121,7 +121,7 @@ jobs:
     runs-on: ${{ matrix.agent_query }}
     steps:
       - name: Free disk space
-        if: ${{ matrix.free_disk_space }}
+        if: ${{ matrix.free_disk_space && !startsWith(matrix.build_os, 'macos-') }}
         run: |
           df -h
           sudo rm -rf /opt/hostedtoolcache
@@ -133,6 +133,18 @@ jobs:
           fi
           df -h
 
+      - name: Free disk space by removing unused Xcode
+        if: ${{ matrix.free_disk_space && startsWith(matrix.build_os, 'macos-') }}
+        run: |
+          IN_USE_XCODE=$(xcode-select -p)
+          echo "Removing all Xcode installations except $IN_USE_XCODE"
+          for xcode in /Applications/Xcode*.app; do
+            if [[ $IN_USE_XCODE != "$xcode"* ]]; then
+              echo "Removing $xcode"
+              rm -rf $xcode
+            fi
+          done
+
       - uses: actions/checkout@v4
         with:
           path: swiftwasm-build