Skip to content

more 6.0 nightly to 6.1 nightly CI changes #3078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rnro merged 3 commits into from
Jan 22, 2025
Merged

more 6.0 nightly to 6.1 nightly CI changes #3078

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6691624
more 6.0 nightly to 6.1 nightly CI changes
rnro Jan 22, 2025
2d0da23
update thresholds
rnro Jan 22, 2025
4ea42f3
update integration test thresholds
rnro Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions .github/workflows/benchmarks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ on:
default: true
linux_nightly_6_0_enabled:
type: boolean
description: "Boolean to enable the Linux nightly 6.0 Swift version matrix job. Defaults to true."
description: "⚠️ Deprecated, we no longer run against 6.0 nightly."
default: false
linux_nightly_6_1_enabled:
type: boolean
description: "Boolean to enable the Linux nightly 6.1 Swift version matrix job. Defaults to true."
default: true
linux_nightly_main_enabled:
type: boolean
Expand All @@ -33,15 +37,15 @@ on:

windows_6_0_enabled:
type: boolean
description: "Boolean to enable the Windows 6.0 Swift version matrix job. Defaults to true."
description: "Boolean to enable the Windows 6.0 Swift version matrix job. Currently has no effect!" # TODO: implement Windows benchmarking
default: false
windows_nightly_6_0_enabled:
type: boolean
description: "Boolean to enable the Windows nightly 6.0 Swift version matrix job. Defaults to true."
description: "⚠️ Deprecated, we no longer run against 6.0 nightly." # TODO: implement Windows benchmarking
default: false
windows_nightly_main_enabled:
type: boolean
description: "Boolean to enable the Windows nightly main Swift version matrix job. Defaults to true."
description: "Boolean to enable the Windows nightly main Swift version matrix job. Currently has no effect!" # TODO: implement Windows benchmarking
default: false

jobs:
Expand All @@ -63,7 +67,7 @@ jobs:
MATRIX_LINUX_5_9_ENABLED: ${{ inputs.linux_5_9_enabled }}
MATRIX_LINUX_5_10_ENABLED: ${{ inputs.linux_5_10_enabled }}
MATRIX_LINUX_6_0_ENABLED: ${{ inputs.linux_6_0_enabled }}
MATRIX_LINUX_NIGHTLY_6_0_ENABLED: ${{ inputs.linux_nightly_6_0_enabled }}
MATRIX_LINUX_NIGHTLY_6_1_ENABLED: ${{ inputs.linux_nightly_6_1_enabled }}
MATRIX_LINUX_NIGHTLY_MAIN_ENABLED: ${{ inputs.linux_nightly_main_enabled }}

benchmarks:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/cxx_interop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ on:
description: "Boolean to enable the Linux 6.0 Swift version matrix job. Defaults to true."
default: true
linux_nightly_6_0_enabled:
type: boolean
description: "⚠️ Deprecated, we no longer run against 6.0 nightly."
default: false
linux_nightly_6_1_enabled:
type: boolean
description: "Boolean to enable the Linux nightly 6.0 Swift version matrix job. Defaults to true."
default: true
Expand All @@ -30,7 +34,7 @@ on:
default: false
windows_nightly_6_0_enabled:
type: boolean
description: "Boolean to enable the Windows nightly 6.0 Swift version matrix job. Defaults to false. Currently has no effect!" # TODO: implement Windows Cxx compat checking
description: "⚠️ Deprecated, we no longer run against 6.0 nightly." # TODO: implement Windows Cxx compat checking
default: false
windows_nightly_main_enabled:
type: boolean
Expand All @@ -56,7 +60,7 @@ jobs:
MATRIX_LINUX_5_9_ENABLED: ${{ inputs.linux_5_9_enabled }}
MATRIX_LINUX_5_10_ENABLED: ${{ inputs.linux_5_10_enabled }}
MATRIX_LINUX_6_0_ENABLED: ${{ inputs.linux_6_0_enabled }}
MATRIX_LINUX_NIGHTLY_6_0_ENABLED: ${{ inputs.linux_nightly_6_0_enabled }}
MATRIX_LINUX_NIGHTLY_6_1_ENABLED: ${{ inputs.linux_nightly_6_1_enabled }}
MATRIX_LINUX_NIGHTLY_MAIN_ENABLED: ${{ inputs.linux_nightly_main_enabled }}

cxx-interop:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
linux_nightly_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
linux_nightly_6_1_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"

cxx-interop:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
linux_nightly_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
linux_nightly_6_1_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"

benchmarks:
Expand Down
6 changes: 3 additions & 3 deletions scripts/check-matrix-job.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ $command = $env:COMMAND
$command_5_9 = $env:COMMAND_OVERRIDE_5_9
$command_5_10 = $env:COMMAND_OVERRIDE_5_10
$command_6_0 = $env:COMMAND_OVERRIDE_6_0
$command_nightly_6_0 = $env:COMMAND_OVERRIDE_NIGHTLY_6_0
$command_nightly_6_1 = $env:COMMAND_OVERRIDE_NIGHTLY_6_1
$command_nightly_main = $env:COMMAND_OVERRIDE_NIGHTLY_MAIN

if ($swift_version -eq "5.9" -and $command_5_9) {
Expand All @@ -64,9 +64,9 @@ if ($swift_version -eq "5.9" -and $command_5_9) {
} elseif ($swift_version -eq "6.0" -and $command_6_0) {
Log "Running 6.0 command override"
Invoke-Expression $command_6_0
} elseif ($swift_version -eq "nightly-6.0" -and $command_nightly_6_0) {
} elseif ($swift_version -eq "nightly-6.0" -and $command_nightly_6_1) {
Log "Running nightly 6.0 command override"
Invoke-Expression $command_nightly_6_0
Invoke-Expression $command_nightly_6_1
} elseif ($swift_version -eq "nightly-main" -and $command_nightly_main) {
Log "Running nightly main command override"
Invoke-Expression $command_nightly_main
Expand Down
6 changes: 3 additions & 3 deletions scripts/check-matrix-job.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ command="$COMMAND"
command_5_9="$COMMAND_OVERRIDE_5_9"
command_5_10="$COMMAND_OVERRIDE_5_10"
command_6_0="$COMMAND_OVERRIDE_6_0"
command_nightly_6_0="$COMMAND_OVERRIDE_NIGHTLY_6_0"
command_nightly_6_1="$COMMAND_OVERRIDE_NIGHTLY_6_1"
command_nightly_main="$COMMAND_OVERRIDE_NIGHTLY_MAIN"

if [[ "$swift_version" == "5.9" ]] && [[ -n "$command_5_9" ]]; then
Expand All @@ -37,9 +37,9 @@ elif [[ "$swift_version" == "5.10" ]] && [[ -n "$command_5_10" ]]; then
elif [[ "$swift_version" == "6.0" ]] && [[ -n "$command_6_0" ]]; then
log "Running 6.0 command override"
eval "$command_6_0"
elif [[ "$swift_version" == "nightly-6.0" ]] && [[ -n "$command_nightly_6_0" ]]; then
elif [[ "$swift_version" == "nightly-6.0" ]] && [[ -n "$command_nightly_6_1" ]]; then
log "Running nightly 6.0 command override"
eval "$command_nightly_6_0"
eval "$command_nightly_6_1"
elif [[ "$swift_version" == "nightly-main" ]] && [[ -n "$command_nightly_main" ]]; then
log "Running nightly main command override"
eval "$command_nightly_main"
Expand Down
Loading