Skip to content

Commit e3eaeb0

Browse files
committed
Setting Swift minimum version to 5.7
Updates copyright from 2023 to 2024 & formats code - updates formatting rules Updates CI to run with swift 5.7 Adds wasmer & updates command to run carton as a swift plugin Update bazelci to also accept swift 5.7
1 parent 67eb95d commit e3eaeb0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1132
-194
lines changed

.bazelci/presubmit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ platforms:
55
ubuntu1804:
66
environment:
77
CC: clang
8-
SWIFT_VERSION: "5.5.3"
8+
SWIFT_VERSION: "5.7"
99
SWIFT_HOME: "$HOME/swift-$SWIFT_VERSION"
1010
PATH: "$PATH:$SWIFT_HOME/usr/bin"
1111
shell_commands:
@@ -19,7 +19,7 @@ platforms:
1919
ubuntu2004:
2020
environment:
2121
CC: clang
22-
SWIFT_VERSION: "5.5.3"
22+
SWIFT_VERSION: "5.7"
2323
SWIFT_HOME: "$HOME/swift-$SWIFT_VERSION"
2424
PATH: "$PATH:$SWIFT_HOME/usr/bin"
2525
shell_commands:

.github/workflows/build.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -478,9 +478,17 @@ jobs:
478478
479479
build-swift:
480480
name: Build Swift
481+
strategy:
482+
matrix:
483+
swift: ["5.7", "5.8", "5.9"]
481484
runs-on: ubuntu-22.04-64core
482485
steps:
483486
- uses: actions/checkout@v3
487+
- uses: swift-actions/setup-swift@v1
488+
with:
489+
swift-version: ${{ matrix.swift }}
490+
- name: Get swift version
491+
run: swift --version
484492
- name: test
485493
working-directory: tests/swift/tests
486494
run: |
@@ -490,15 +498,16 @@ jobs:
490498
build-swift-wasm:
491499
name: Build Swift Wasm
492500
runs-on: ubuntu-22.04-64core
493-
container:
494-
image: ghcr.io/swiftwasm/carton:0.15.3
495501
steps:
496502
- uses: actions/checkout@v3
497503
- name: Setup Wasmer
498504
uses: wasmerio/setup-wasmer@v2
505+
- uses: swiftwasm/setup-swiftwasm@v1
506+
with:
507+
swift-version: "wasm-5.9.2-RELEASE"
499508
- name: Test
500509
working-directory: tests/swift/Wasm.tests
501-
run: carton test
510+
run: swift run carton test
502511

503512
build-ts:
504513
name: Build TS

MODULE.bazel

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
###############################################################################
2+
# Bazel now uses Bzlmod by default to manage external dependencies.
3+
# Please consider migrating your external dependencies from WORKSPACE to MODULE.bazel.
4+
#
5+
# For more details, please check https://github.com/bazelbuild/bazel/issues/18958
6+
###############################################################################

0 commit comments

Comments
 (0)