Skip to content
This repository was archived by the owner on Apr 22, 2026. It is now read-only.

Commit 36c643a

Browse files
authored
Drop Swift 6.0 (#67)
Motivation: Swift 6.0 is no longer supported, we should bump the tools version and remove it from our CI. Modifications: * Bump the Swift tools version to Swift 6.1 * Remove Swift 6.0 jobs where appropriate in main.yml, pull_request.yml Result: Code reflects our support window.
1 parent 7d040e8 commit 36c643a

5 files changed

Lines changed: 2 additions & 16 deletions

File tree

.github/workflows/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ jobs:
1111
name: Unit tests
1212
uses: ./.github/workflows/unit_tests.yml
1313
with:
14-
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error"
1514
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error"
1615
linux_6_2_arguments_override: "--explicit-target-dependency-import-check error"
1716
linux_6_3_arguments_override: "--explicit-target-dependency-import-check error"

.github/workflows/pull_request.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
name: Unit tests
1616
uses: ./.github/workflows/unit_tests.yml
1717
with:
18-
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error"
1918
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error"
2019
linux_6_2_arguments_override: "--explicit-target-dependency-import-check error"
2120
linux_6_3_arguments_override: "--explicit-target-dependency-import-check error"

.github/workflows/unit_tests.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@ name: Unit tests
33
on:
44
workflow_call:
55
inputs:
6-
linux_6_0_enabled:
7-
type: boolean
8-
description: "Boolean to enable the Linux 6.0 Swift version matrix job. Defaults to true."
9-
default: true
10-
linux_6_0_arguments_override:
11-
type: string
12-
description: "The arguments passed to swift test in the Linux 6.0 Swift version matrix job."
13-
default: ""
146
linux_6_1_enabled:
157
type: boolean
168
description: "Boolean to enable the Linux 6.1 Swift version matrix job. Defaults to true."
@@ -53,9 +45,6 @@ jobs:
5345
matrix:
5446
# We are specifying only the major and minor of the docker images to automatically pick up the latest patch release
5547
swift:
56-
- image: "swift:6.0-jammy"
57-
swift_version: "6.0"
58-
enabled: ${{ inputs.linux_6_0_enabled }}
5948
- image: "swift:6.1-jammy"
6049
swift_version: "6.1"
6150
enabled: ${{ inputs.linux_6_1_enabled }}
@@ -84,7 +73,6 @@ jobs:
8473
env:
8574
SWIFT_VERSION: ${{ matrix.swift.swift_version }}
8675
COMMAND: "swift test"
87-
COMMAND_OVERRIDE_6_0: "swift test ${{ inputs.linux_6_0_arguments_override }}"
8876
COMMAND_OVERRIDE_6_1: "swift test ${{ inputs.linux_6_1_arguments_override }}"
8977
COMMAND_OVERRIDE_6_2: "swift test ${{ inputs.linux_6_2_arguments_override }}"
9078
COMMAND_OVERRIDE_6_3: "swift test ${{ inputs.linux_6_3_arguments_override }}"

Benchmarks/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:6.0
1+
// swift-tools-version:6.1
22
//===----------------------------------------------------------------------===//
33
//
44
// This source file is part of the SwiftCertificates open source project

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:6.0
1+
// swift-tools-version:6.1
22
//===----------------------------------------------------------------------===//
33
//
44
// This source file is part of the swift-memcache-gsoc open source project

0 commit comments

Comments
 (0)