Skip to content

Commit 33b7586

Browse files
committed
Merge branch 'dev'
2 parents a77d11c + 688deb9 commit 33b7586

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

.github/workflows/swift.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@ name: Swift
55

66
on:
77
push:
8-
branches: [ "main" ]
8+
branches: [ "main", "dev" ]
99
pull_request:
1010
branches: [ "main" ]
1111

1212
jobs:
1313
build:
1414
strategy:
1515
matrix:
16-
os: [macos-15, ubuntu-latest, windows-latest]
16+
os: [macos-26, ubuntu-latest, windows-latest]
1717

1818
runs-on: ${{ matrix.os }}
1919
continue-on-error: ${{ matrix.os == 'windows-latest' }}
2020

2121
steps:
2222
- uses: SwiftyLab/setup-swift@latest
2323
with:
24-
swift-version: ${{ matrix.os == 'windows-latest' && '6.3.1' || '6.2.3' }}
24+
swift-version: '6.3.2'
2525
- uses: actions/checkout@v4
2626

2727
- name: Install Linux dependencies
@@ -34,5 +34,4 @@ jobs:
3434
run: swift build -v
3535

3636
- name: Test
37-
if: matrix.os != 'windows-latest'
3837
run: swift test -v

.swift-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6.3.2

Package.resolved

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let package = Package(
1010
.executable(name: "Helical-Demo", targets: ["Demo"]),
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/tomasf/Cadova.git", .upToNextMinor(from: "0.8.0")),
13+
.package(url: "https://github.com/tomasf/Cadova.git", .upToNextMinor(from: "0.9.0")),
1414
],
1515
targets: [
1616
.target(

0 commit comments

Comments
 (0)