Skip to content

Commit 96ea618

Browse files
committed
Replace k3d with minikube for testing and update ci workflow
1 parent efa5576 commit 96ea618

File tree

2 files changed

+28
-38
lines changed

2 files changed

+28
-38
lines changed

.github/workflows/ci.yml

+27-37
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
branches: [ "*" ]
88

99
jobs:
10+
1011
swiftformat-lint:
1112
runs-on: ubuntu-latest
1213
steps:
@@ -17,58 +18,47 @@ jobs:
1718
url: https://github.com/nicklockwood/SwiftFormat
1819
- name: Lint Sources
1920
run: swiftformat --lint Sources
20-
21-
macOS:
22-
runs-on: macos-latest
23-
steps:
24-
- uses: actions/checkout@v2
25-
- uses: actions/cache@v2
26-
with:
27-
path: .build
28-
key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
29-
restore-keys: |
30-
${{ runner.os }}-spm-
31-
- name: Build
32-
run: swift build
33-
- name: Test
34-
run: swift test --skip K3d
35-
3621
iOS:
3722
name: Test iOS
3823
runs-on: macOS-latest
3924
strategy:
4025
matrix:
41-
destination: ["platform=iOS Simulator,OS=16.2,name=iPhone 14 Pro"]
26+
destination:
27+
- "platform=iOS Simulator,OS=17.5,name=iPhone 15 Pro"
28+
- "platform=iOS Simulator,OS=18.2,name=iPhone 16 Pro"
4229
steps:
43-
- uses: actions/checkout@v2
44-
- uses: actions/cache@v2
45-
with:
46-
path: .build
47-
key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
48-
restore-keys: |
49-
${{ runner.os }}-spm-
30+
- name: Checkout
31+
uses: actions/checkout@v2
5032
- name: iOS - ${{ matrix.destination }}
5133
run: set -o pipefail && xcodebuild -scheme SwiftkubeClient -destination "${{ matrix.destination }}" clean build | xcpretty
5234

53-
linux:
54-
runs-on: ubuntu-latest
35+
build:
36+
name: Swift ${{ matrix.swift }} on ${{ matrix.os }}
37+
runs-on: ${{ matrix.os }}
38+
strategy:
39+
matrix:
40+
os: [ubuntu-latest, macos-latest]
41+
swift: ["5.9", "5.10", "6.0"]
5542
steps:
56-
- uses: actions/checkout@v2
57-
- uses: actions/cache@v2
43+
- name: Checkout
44+
uses: actions/checkout@v2
45+
- name: SPM Cache
46+
uses: actions/cache@v2
5847
with:
5948
path: .build
60-
key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
49+
key: ${{ matrix.os }}-${{ matrix.swift }}-${{ hashFiles('**/Package.resolved') }}
6150
restore-keys: |
62-
${{ runner.os }}-spm-
63-
- name: Create cluster
64-
uses: AbsaOSS/k3d-action@v2
51+
${{ matrix.os }}-${{ matrix.swift }}-
52+
- name: Start minikube
53+
uses: medyagh/setup-minikube@latest
54+
id: minikube
6555
with:
66-
cluster-name: "swiftkube"
67-
args: -c k3d/swiftkube.yaml
68-
- name: Setup Swift
69-
uses: fwal/setup-swift@v1
56+
minikube-version: 1.35.0
57+
- uses: swift-actions/setup-swift@v2
7058
with:
71-
swift-version: "5.8"
59+
swift-version: ${{ matrix.swift }}
60+
- name: Get swift version
61+
run: swift --version
7262
- name: Build
7363
run: swift build
7464
- name: Test

Tests/SwiftkubeClientTests/K3dNodeTests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ final class K3dNodeTests: K3dTestCase {
2222

2323
func testListNodes() async {
2424
let nodes = try? await K3dTestCase.client.nodes.list()
25-
XCTAssertEqual(nodes?.items.count, 3)
25+
XCTAssertEqual(nodes?.items.count, 1)
2626
}
2727
}

0 commit comments

Comments
 (0)