Skip to content

Commit 439e629

Browse files
authored
switch CI to 6.2 release images (#26)
* switched to awk and release images * bump JavaScriptKit
1 parent eb0e8ee commit 439e629

File tree

11 files changed

+19
-26
lines changed

11 files changed

+19
-26
lines changed

.github/workflows/ci-examples.yaml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,18 @@ jobs:
1919
strategy:
2020
matrix:
2121
swift:
22-
- swiftly-version: 6.2-snapshot-2025-08-21
23-
wask-sdk-url: https://download.swift.org/swift-6.2-branch/wasm-sdk/swift-6.2-DEVELOPMENT-SNAPSHOT-2025-08-21-a/swift-6.2-DEVELOPMENT-SNAPSHOT-2025-08-21-a_wasm.artifactbundle.tar.gz
24-
wasm-sdk-checksum: 46984066d3c93add1ef2e12914fc5af3814b722ada26aa13690def663236e675
22+
- image: swift:6.2
23+
wask-sdk-url: https://download.swift.org/swift-6.2-release/wasm/swift-6.2-RELEASE/swift-6.2-RELEASE_wasm.artifactbundle.tar.gz
24+
wasm-sdk-checksum: fe4e8648309fce86ea522e9e0d1dc48e82df6ba6e5743dbf0c53db8429fb5224
2525
examples:
2626
- Examples/Swiftle
2727
- Examples/Basic
28+
container: ${{ matrix.swift.image }}
2829

2930
steps:
3031
- name: Checkout
3132
uses: actions/checkout@v4
3233

33-
- uses: beeauvin/swiftly-swift@v1
34-
with:
35-
swift-version: ${{ matrix.swift.swiftly-version }}
36-
3734
- name: Install Swift WASM SDK
3835
run: swift sdk install ${{ matrix.swift.wask-sdk-url }} --checksum ${{ matrix.swift.wasm-sdk-checksum }}
3936

.github/workflows/deploy-example.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,13 @@ jobs:
2222
name: github-pages
2323
url: ${{ steps.deployment.outputs.page_url }}
2424
runs-on: ubuntu-latest
25+
container: swift:6.2
2526
env:
26-
SWIFT_VERSION: 6.2-snapshot-2025-08-21
27-
WASM_SDK_URL: https://download.swift.org/swift-6.2-branch/wasm-sdk/swift-6.2-DEVELOPMENT-SNAPSHOT-2025-08-21-a/swift-6.2-DEVELOPMENT-SNAPSHOT-2025-08-21-a_wasm.artifactbundle.tar.gz
28-
WASM_SDK_CHECKSUM: 46984066d3c93add1ef2e12914fc5af3814b722ada26aa13690def663236e675
27+
WASM_SDK_URL: https://download.swift.org/swift-6.2-release/wasm/swift-6.2-RELEASE/swift-6.2-RELEASE_wasm.artifactbundle.tar.gz
28+
WASM_SDK_CHECKSUM: fe4e8648309fce86ea522e9e0d1dc48e82df6ba6e5743dbf0c53db8429fb5224
2929
steps:
3030
- name: Checkout
3131
uses: actions/checkout@v4
32-
- uses: beeauvin/swiftly-swift@v1
33-
with:
34-
swift-version: ${{ env.SWIFT_VERSION }}
3532
- name: Install Swift WASM SDK
3633
run: swift sdk install ${{ env.WASM_SDK_URL }} --checksum ${{ env.WASM_SDK_CHECKSUM }}
3734
- name: Install wasm-opt

Examples/Basic/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ let package = Package(
66
platforms: [.macOS(.v15)],
77
dependencies: [
88
.package(name: "ElementaryDOM", path: "../../"),
9-
.package(url: "https://github.com/swiftwasm/JavaScriptKit.git", .upToNextMinor(from: "0.33.1")),
9+
.package(url: "https://github.com/swiftwasm/JavaScriptKit.git", from: "0.36.0"),
1010
],
1111
targets: [
1212
.executableTarget(

Examples/Basic/build-dev.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ OUTDIR=Public/lib/example
22
set -ex
33

44
swift package \
5-
--swift-sdk "$(swiftc -print-target-info | jq -r '.swiftCompilerTag')_wasm" \
5+
--swift-sdk "$(swiftc -print-target-info | awk -F'"' '/swiftCompilerTag/ {print $4}')_wasm" \
66
--allow-writing-to-package-directory \
7-
js -c debug --output $OUTDIR --use-cdn
7+
js -c debug --output $OUTDIR --use-cdn
8+
9+

Examples/Basic/build-full.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ set -ex
44
rm -rf $OUTDIR
55

66
swift package \
7-
--swift-sdk "$(swiftc -print-target-info | jq -r '.swiftCompilerTag')_wasm" \
7+
--swift-sdk "$(swiftc -print-target-info | awk -F'"' '/swiftCompilerTag/ {print $4}')_wasm" \
88
--allow-writing-to-package-directory \
99
js -c release --output $OUTDIR --use-cdn

Examples/Basic/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ set -ex
44
rm -rf $OUTDIR
55

66
swift package \
7-
--swift-sdk "$(swiftc -print-target-info | jq -r '.swiftCompilerTag')_wasm-embedded" \
7+
--swift-sdk "$(swiftc -print-target-info | awk -F'"' '/swiftCompilerTag/ {print $4}')_wasm-embedded" \
88
--allow-writing-to-package-directory \
99
js -c release --output $OUTDIR --use-cdn

Examples/Swiftle/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ let package = Package(
77
dependencies: [
88
.package(path: "../../"),
99
.package(url: "https://github.com/sliemeobn/elementary-css", branch: "main"),
10-
.package(url: "https://github.com/swiftwasm/JavaScriptKit.git", .upToNextMinor(from: "0.33.1")),
10+
.package(url: "https://github.com/swiftwasm/JavaScriptKit.git", from: "0.36.0"),
1111
],
1212
targets: [
1313
.executableTarget(

Examples/Swiftle/build-dev.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ OUTDIR=Public/lib/swiftle
22
set -ex
33

44
swift package \
5-
--swift-sdk "$(swiftc -print-target-info | jq -r '.swiftCompilerTag')_wasm" \
6-
--enable-experimental-prebuilts \
5+
--swift-sdk "$(swiftc -print-target-info | awk -F'"' '/swiftCompilerTag/ {print $4}')_wasm" \
76
--allow-writing-to-package-directory \
87
js -c debug --output $OUTDIR --use-cdn --debug-info-format dwarf

Examples/Swiftle/build-full-release.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ OUTDIR=Public/lib/swiftle
22
set -ex
33

44
swift package \
5-
--swift-sdk "$(swiftc -print-target-info | jq -r '.swiftCompilerTag')_wasm" \
6-
--enable-experimental-prebuilts \
5+
--swift-sdk "$(swiftc -print-target-info | awk -F'"' '/swiftCompilerTag/ {print $4}')_wasm" \
76
--allow-writing-to-package-directory \
87
js -c release --output $OUTDIR --use-cdn --debug-info-format dwarf

Examples/Swiftle/build.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ set -ex
44
rm -rf $OUTDIR
55

66
swift package \
7-
--swift-sdk "$(swiftc -print-target-info | jq -r '.swiftCompilerTag')_wasm-embedded" \
8-
--enable-experimental-prebuilts \
7+
--swift-sdk "$(swiftc -print-target-info | awk -F'"' '/swiftCompilerTag/ {print $4}')_wasm-embedded" \
98
--allow-writing-to-package-directory \
109
js -c release --output $OUTDIR --use-cdn

0 commit comments

Comments
 (0)