Skip to content

Commit 89adc3e

Browse files
committed
Bump to Swift 6 compiler for Linux and WASI
1 parent 82ad5dd commit 89adc3e

File tree

5 files changed

+5
-180
lines changed

5 files changed

+5
-180
lines changed

.github/workflows/ubuntu.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
swift_version: ["5.10"]
15+
swift_version: ["6.0"]
1616
runs-on: ubuntu-22.04
1717
env:
1818
OPENGRAPH_WERROR: 1
19-
OPENGRAPH_SWIFT_TESTING: 1
2019
OPENGRAPH_ATTRIBUTEGRAPH: 0
2120
OPENGRAPH_COMPATIBILITY_TEST: 0
2221
container: swift:${{ matrix.swift_version }}-jammy

.github/workflows/wasm.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
swift_version: ["5.10.0-RELEASE"]
15+
swift_version: ["6.0-SNAPSHOT-2024-09-18-a"]
1616
os: [ubuntu-22.04]
1717
runs-on: ${{ matrix.os }}
1818
env:
1919
OPENGRAPH_WERROR: 1
20-
OPENGRAPH_SWIFT_TESTING: 0
2120
OPENGRAPH_ATTRIBUTEGRAPH: 0
2221
OPENGRAPH_COMPATIBILITY_TEST: 0
2322
steps:
@@ -28,7 +27,6 @@ jobs:
2827
- name: build
2928
run: |
3029
swift build --triple wasm32-unknown-wasi
31-
# Blocked by upstream support for WASM. See https://github.com/apple/swift-testing/issues/228
32-
# - name: test
33-
# run: |
34-
# swift test --triple wasm32-unknown-wasi
30+
- name: test
31+
run: |
32+
swift test --triple wasm32-unknown-wasi

[email protected]

Lines changed: 0 additions & 170 deletions
This file was deleted.

Scripts/build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ OPENGRAPH_ROOT="$(dirname $(dirname $(filepath $0)))"
99

1010
cd $OPENGRAPH_ROOT
1111

12-
export OPENGRAPH_SWIFT_TESTING=0
1312
swift build

Scripts/og_swiftinterface.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ OG_ROOT="$(dirname $(dirname $(filepath $0)))"
99

1010
cd $OG_ROOT
1111

12-
export OPENGRAPH_SWIFT_TESTING=0
1312
swift build -Xswiftc -emit-module-interface -Xswiftc -enable-library-evolution

0 commit comments

Comments
 (0)