Update CI

Author: ptoffy

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: test
 
 on:
   push:
-    branches: [main]
+    branches: [ main ]
   pull_request:
-    branches: [main]
+    branches: [ main ]
 
 permissions:
   contents: read
@@ -20,6 +20,10 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
+      - name: Setup Swift
+        uses: swift-actions/setup-swift@v3
+        with:
+          swift-version: "6.3"
       - name: Run tests
         run: swift test
 
@@ -35,12 +39,16 @@ jobs:
           - name: tvOS
             destination: platform=tvOS Simulator,OS=latest,name=Apple TV 4K (3rd generation)
           - name: watchOS
-            destination: platform=watchOS Simulator,OS=latest,name=Apple Watch Series 10 (46mm)
+            destination: platform=watchOS Simulator,OS=latest,name=Apple Watch Series 10
           - name: visionOS
             destination: platform=visionOS Simulator,OS=latest,name=Apple Vision Pro
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
+      - name: Setup Swift
+        uses: swift-actions/setup-swift@v3
+        with:
+          swift-version: "6.3"
       - name: Run tests
         run: |
           xcodebuild test \
@@ -54,7 +62,8 @@ jobs:
         include:
           - name: "6.3"
             container: "swift:6.3"
-            test-args: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
+            test-args: "-Xswiftc -warnings-as-errors
+              --explicit-target-dependency-import-check error"
           - name: "nightly-main"
             container: "swiftlang/swift:nightly-main-jammy"
             test-args: ""
@@ -74,6 +83,7 @@ jobs:
         uses: actions/checkout@v6
       - name: Install Swift SDK for Linux Musl
         run: |
+          apt-get update -y -q && apt-get install -y -q curl jq
           version_num="$(swiftc --version | grep -oE '[0-9]+\.[0-9]+(\.[0-9]+)?' | head -1)"
           tag="swift-${version_num}-RELEASE"
           sdk_info="$(curl -s https://www.swift.org/api/v1/install/releases.json | jq -r --arg tag "$tag" '.[] | select(.tag == $tag).platforms[] | select(.platform == "static-sdk") | [.version, .checksum] | @tsv')"
@@ -95,9 +105,11 @@ jobs:
           tag="$(swiftc --version | grep -Po '(?<=\().+(?=\))')"
           checksum="$(curl -s https://www.swift.org/api/v1/install/releases.json | \
             jq -r --arg tag "$tag" '.[] | select(.tag == $tag).platforms[] | select(.platform == "wasm-sdk").checksum // empty')"
-          swift sdk install https://download.swift.org/$(echo $tag | tr [A-Z] [a-z])/wasm-sdk/$tag/${tag}_wasm.artifactbundle.tar.gz --checksum "$checksum"
+          swift sdk install https://download.swift.org/$(echo $tag | tr [A-Z] [a-z])/wasm-sdk/$tag/"$tag"_wasm.artifactbundle.tar.gz --checksum $checksum
       - name: Build for WebAssembly
-        run: swift build --swift-sdk wasm32-unknown-wasi
+        run: |
+          tag="$(swiftc --version | grep -Po '(?<=\().+(?=\))')"
+          swift build --swift-sdk "$tag"_wasm
 
   windows:
     strategy:

Sources/CZlib/include/CZlib.h

@@ -2,8 +2,18 @@
 #define CZLIB_H
 
 #include "zlib.h"
+#if __has_include(<lifetimebound.h>)
 #include <lifetimebound.h>
+#endif
+#if __has_include(<ptrcheck.h>)
 #include <ptrcheck.h>
+#endif
+#ifndef __counted_by
+#define __counted_by(N)
+#endif
+#ifndef __noescape
+#define __noescape
+#endif
 
 #if defined(_WIN32)
 typedef unsigned char uint8_t;