Skip to content
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.

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

Update re-usable workflows to use nightly_next #3122

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ on:
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."
description: "⚠️ Deprecated, use linux_nightly_next_enabled."
default: true
linux_nightly_next_enabled:
type: boolean
description: "Boolean to enable the Linux nightly matrix job for the next Swift version. Defaults to true."
default: true
linux_nightly_main_enabled:
type: boolean
Expand Down Expand Up @@ -67,7 +71,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_1_ENABLED: ${{ inputs.linux_nightly_6_1_enabled }}
MATRIX_LINUX_NIGHTLY_NEXT_ENABLED: ${{ inputs.linux_nightly_6_1_enabled && inputs.linux_nightly_next_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
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ on:
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."
description: "⚠️ Deprecated, use linux_nightly_next_enabled."
default: true
linux_nightly_next_enabled:
type: boolean
description: "Boolean to enable the Linux matrix job using the nightly build for the next Swift version. Defaults to true."
default: true
linux_nightly_main_enabled:
type: boolean
Expand Down Expand Up @@ -60,7 +64,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_1_ENABLED: ${{ inputs.linux_nightly_6_1_enabled }}
MATRIX_LINUX_NIGHTLY_NEXT_ENABLED: ${{ inputs.linux_nightly_6_1_enabled && inputs.linux_nightly_next_enabled }}
MATRIX_LINUX_NIGHTLY_MAIN_ENABLED: ${{ inputs.linux_nightly_main_enabled }}

cxx-interop:
Expand Down
32 changes: 24 additions & 8 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,19 @@ on:
default: ""
linux_nightly_6_1_enabled:
type: boolean
description: "Boolean to enable the Linux nightly 6.1 Swift version matrix job. Defaults to true."
description: "⚠️ Deprecated, use linux_nightly_next_enabled."
default: true
linux_nightly_6_1_arguments_override:
type: string
description: "The arguments passed to swift test in the Linux nightly 6.1 Swift version matrix job."
description: "⚠️ Deprecated, use linux_nightly_next_arguments_override."
default: ""
linux_nightly_next_enabled:
type: boolean
description: "Boolean to enable the Linux matrix job using the nightly build for the next Swift version. Defaults to true."
default: true
linux_nightly_next_arguments_override:
type: string
description: "The arguments passed to swift test in the Linux matrix job using the nightly build for the next Swift version."
default: ""
linux_nightly_main_enabled:
type: boolean
Expand Down Expand Up @@ -70,11 +78,19 @@ on:
default: ""
windows_nightly_6_1_enabled:
type: boolean
description: "Boolean to enable the Windows nightly 6.1 Swift version matrix job. Defaults to false."
description: "⚠️ Deprecated, use windows_nightly_next_enabled."
default: false
windows_nightly_6_1_arguments_override:
type: string
description: "The arguments passed to swift test in the Windows nightly 6.1 Swift version matrix job."
description: "⚠️ Deprecated, use windows_nightly_next_arguments_override."
default: ""
windows_nightly_next_enabled:
type: boolean
description: "Boolean to enable the Windows matrix job using the nightly build for the next Swift version. Defaults to true."
default: true
windows_nightly_next_arguments_override:
type: string
description: "The arguments passed to swift test in the Windows matrix job using the nightly build for the next Swift version."
default: ""
windows_nightly_main_enabled:
type: boolean
Expand Down Expand Up @@ -106,15 +122,15 @@ jobs:
MATRIX_LINUX_5_10_COMMAND_ARGUMENTS: ${{ inputs.linux_5_10_arguments_override }}
MATRIX_LINUX_6_0_ENABLED: ${{ inputs.linux_6_0_enabled }}
MATRIX_LINUX_6_0_COMMAND_ARGUMENTS: ${{ inputs.linux_6_0_arguments_override }}
MATRIX_LINUX_NIGHTLY_6_1_ENABLED: ${{ inputs.linux_nightly_6_1_enabled }}
MATRIX_LINUX_NIGHTLY_6_1_COMMAND_ARGUMENTS: ${{ inputs.linux_nightly_6_1_arguments_override }}
MATRIX_LINUX_NIGHTLY_NEXT_ENABLED: ${{ inputs.linux_nightly_6_1_enabled && inputs.linux_nightly_next_enabled }}
MATRIX_LINUX_NIGHTLY_NEXT_COMMAND_ARGUMENTS: ${{ inputs.linux_nightly_6_1_arguments_override }} ${{ inputs.linux_nightly_next_arguments_override }}
MATRIX_LINUX_NIGHTLY_MAIN_ENABLED: ${{ inputs.linux_nightly_main_enabled }}
MATRIX_LINUX_NIGHTLY_MAIN_COMMAND_ARGUMENTS: ${{ inputs.linux_nightly_main_arguments_override }}
MATRIX_WINDOWS_COMMAND: "swift test"
MATRIX_WINDOWS_6_0_ENABLED: ${{ inputs.windows_6_0_enabled }}
MATRIX_WINDOWS_6_0_COMMAND_ARGUMENTS: ${{ inputs.windows_6_0_arguments_override }}
MATRIX_WINDOWS_NIGHTLY_6_1_ENABLED: ${{ inputs.windows_nightly_6_1_enabled }}
MATRIX_WINDOWS_NIGHTLY_6_1_COMMAND_ARGUMENTS: ${{ inputs.windows_nightly_6_1_arguments_override }}
MATRIX_WINDOWS_NIGHTLY_NEXT_ENABLED: ${{ inputs.windows_nightly_6_1_enabled && inputs.windows_nightly_next_enabled }}
MATRIX_WINDOWS_NIGHTLY_NEXT_COMMAND_ARGUMENTS: ${{ inputs.windows_nightly_6_1_arguments_override }} ${{ inputs.windows_nightly_next_arguments_override }}
MATRIX_WINDOWS_NIGHTLY_MAIN_ENABLED: ${{ inputs.windows_nightly_main_enabled }}
MATRIX_WINDOWS_NIGHTLY_MAIN_COMMAND_ARGUMENTS: ${{ inputs.windows_nightly_main_arguments_override }}

Expand Down
Loading