Skip to content

Commit 8fde111

Browse files
committed
Support Swift 6 only
1 parent b2a134c commit 8fde111

File tree

4 files changed

+9
-16
lines changed

4 files changed

+9
-16
lines changed

.github/composites/setup/action.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ name: Setup
33
description: Setup for swift, cache, etc.
44

55
inputs:
6-
swift:
7-
required: true
86
os:
97
required: true
108

@@ -15,14 +13,7 @@ runs:
1513
- uses: jdx/mise-action@v4
1614
env:
1715
MISE_DATA_DIR: ${{ runner.temp }}/${{ github.action }}/mise
18-
with:
19-
mise_toml: |
20-
[tools]
21-
swift = "${{ inputs.swift }}"
22-
"spm:apple/swift-openapi-generator" = "latest"
23-
[settings]
24-
experimental = true
25-
16+
2617
- name: "Xcode Cache"
2718
if: contains(inputs.os, 'macos')
2819
uses: irgaly/xcode-cache@v1

.github/workflows/DependabotCommit.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ jobs:
2323
- ubuntu-latest
2424
# - macos-latest #Fix: The macos-latest workflow label currently uses the macOS 12 runner image.
2525
# - macos-13
26-
swift:
27-
- 6
26+
2827
runs-on: ${{ matrix.os }}
2928
timeout-minutes: 100
3029
steps:
@@ -35,7 +34,6 @@ jobs:
3534

3635
- uses: ./.github/composites/setup
3736
with:
38-
swift: ${{ matrix.swift }}
3937
os: ${{ matrix.os }}
4038

4139
- uses: ./.github/composites/git-config

.github/workflows/Test.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ jobs:
1919
os:
2020
- ubuntu-latest
2121
# - macos-latest
22-
swift:
23-
- 6
22+
2423
runs-on: ${{ matrix.os }}
2524
timeout-minutes: 30
2625
steps:
@@ -30,7 +29,6 @@ jobs:
3029

3130
- uses: ./.github/composites/setup
3231
with:
33-
swift: ${{ matrix.swift }}
3432
os: ${{ matrix.os }}
3533

3634
- run: swift build

mise.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[tools]
2+
swift = "6"
3+
"spm:apple/swift-openapi-generator" = "latest"
4+
5+
[settings]
6+
experimental = true

0 commit comments

Comments
 (0)