Skip to content

Update CI scripts for 6.2#3374

Merged
Lukasa merged 10 commits intomainfrom
ff-update-ci-scripts
Sep 19, 2025
Merged

Update CI scripts for 6.2#3374
Lukasa merged 10 commits intomainfrom
ff-update-ci-scripts

Conversation

@fabianfett
Copy link
Copy Markdown
Member

Replaces: #3373

@fabianfett fabianfett requested a review from rnro September 18, 2025 14:49
@fabianfett fabianfett added the semver/none No version bump required. label Sep 18, 2025
@fabianfett fabianfett force-pushed the ff-update-ci-scripts branch 3 times, most recently from 58c5d4b to 58401c5 Compare September 18, 2025 15:11
Comment on lines +90 to +93
xcode_16_4_setup_command:
type: string
description: "The command(s) to be executed before all other work."
default: ""
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this had a weird position that I fixed.

xcode_16_4_test_arguments_override="${MATRIX_MACOS_16_4_TEST_ARGUMENTS_OVERRIDE:=""}"
xcode_16_4_setup_command="${MATRIX_MACOS_16_4_SETUP_COMMAND:=""}"
xcode_26_0_enabled="${MATRIX_MACOS_12_30ENABLED:=true}"
xcode_26_0_enabled="${MATRIX_MACOS_26_0_ENABLED:=true}"
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rnro was this intended?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, that's a bug, thank you

@fabianfett
Copy link
Copy Markdown
Member Author

Copy link
Copy Markdown
Contributor

@rnro rnro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great, thanks for the thorough changes @fabianfett

@Lukasa
Copy link
Copy Markdown
Contributor

Lukasa commented Sep 19, 2025

Admin merge over the broken checks.

@Lukasa Lukasa merged commit 6c114e3 into main Sep 19, 2025
1 check passed
@Lukasa Lukasa deleted the ff-update-ci-scripts branch September 19, 2025 12:55
rnro pushed a commit that referenced this pull request Sep 19, 2025
euanh added a commit to euanh/swift-container-plugin that referenced this pull request Sep 22, 2025
Motivation
----------

Swift NIO's unit test matrix job has been [updated for Swift
6.2](apple/swift-nio#3374),
so additional override flags must be defined.

Modifications
-------------

Define `linux_6.2_arguments_override` for pull requests and the
scheduled build on main.

Result
------

Tests with Swift 6.2 will pass.

Test Plan
---------

Existing tests pass again.
euanh added a commit to apple/swift-container-plugin that referenced this pull request Sep 22, 2025
Motivation
----------

Swift NIO's unit test matrix job has been [updated for Swift
6.2](apple/swift-nio#3374), so additional
override flags must be defined.

Modifications
-------------

Define `linux_6_2_arguments_override` for pull requests and the
scheduled build on main.

Result
------

Tests with Swift 6.2 will pass.

Test Plan
---------

Existing tests pass again.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

semver/none No version bump required.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants