Skip to content

Commit e9eae43

Browse files
committed
fix archive test job
1 parent 7a3418a commit e9eae43

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

.github/workflows/integration_tests.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@ on:
4141
# Note: we don't use Amazon Linux 2 here because zip is not installed by default.
4242
description: "Container image for the matrix test jobs. Defaults to Swift 6.2 on Amazon Linux 2."
4343
default: "swift:6.2-amazonlinux2"
44-
archive_linux_swift_container_image:
45-
type: string
46-
# Note: we don't use Amazon Linux 2 here because zip is not installed by default.
47-
description: "Container image for the plugin test job. Defaults to Swift 6.2 on Ubuntu."
48-
default: "swift:6.2-noble"
4944

5045
## We are cancelling previously triggered workflow runs
5146
concurrency:
@@ -111,11 +106,7 @@ jobs:
111106
fail-fast: false
112107
matrix:
113108
examples: ${{ fromJson(inputs.archive_plugin_examples) }}
114-
# We are using only one Swift version
115-
swift:
116-
- image: ${{ inputs.archive_linux_swift_container_image }}
117-
container:
118-
image: ${{ matrix.swift.image }}
109+
# These must run on Ubuntu and not in a container, because the plugin uses docker
119110
steps:
120111
- name: Checkout repository
121112
uses: actions/checkout@v4

Examples/HelloWorld/Package.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
// swift-tools-version:6.2
1+
// swift-tools-version:6.1
2+
// This example has to be in Swift 6.1 because it is used in the test archive plugin CI job
3+
// That job runs on GitHub's ubuntu-latest environment that only supports Swift 6.1
4+
// https://github.com/actions/runner-images?tab=readme-ov-file
5+
// https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
6+
// We can update to Swift 6.2 when GitHUb hosts will have Swift 6.2
27

38
import PackageDescription
49

Examples/ResourcesPackaging/Package.swift

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
// swift-tools-version: 6.2
2-
// The swift-tools-version declares the minimum version of Swift required to build this package.
1+
// swift-tools-version:6.1
2+
// This example has to be in Swift 6.1 because it is used in the test archive plugin CI job
3+
// That job runs on GitHub's ubuntu-latest environment that only supports Swift 6.1
4+
// https://github.com/actions/runner-images?tab=readme-ov-file
5+
// https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
6+
// We can update to Swift 6.2 when GitHUb hosts will have Swift 6.2
37

48
import PackageDescription
59

0 commit comments

Comments
 (0)