diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index a450674..d62625f 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -45,8 +45,8 @@ jobs: windows_build_command: | mkdir MyPackage cd MyPackage - swift package init --type library - swift build + Invoke-Program swift package init --type library + Invoke-Program swift build -vv enable_windows_docker: true tests_without_docker: @@ -59,8 +59,8 @@ jobs: windows_build_command: | mkdir MyPackage cd MyPackage - swift package init --type library - swift build + Invoke-Program swift package init --type library + Invoke-Program swift build -vv enable_windows_docker: false tests_macos: diff --git a/.github/workflows/swift_package_test.yml b/.github/workflows/swift_package_test.yml index d29b835..2ba37d1 100644 --- a/.github/workflows/swift_package_test.yml +++ b/.github/workflows/swift_package_test.yml @@ -22,7 +22,7 @@ on: linux_swift_versions: type: string description: "Include Linux Swift version list (JSON)" - default: "[ \"5.9\", \"5.10\", \"6.0\", \"6.1\", \"nightly-main\", \"nightly-6.2\"]" + default: "[ \"5.10\", \"6.0\", \"6.1\", \"nightly-main\", \"nightly-6.2\"]" linux_exclude_swift_versions: type: string description: "Exclude Linux Swift version list (JSON)" @@ -46,8 +46,7 @@ on: windows_swift_versions: type: string description: "Include Windows Swift version list (JSON)" - # "5.10" is omitted for Windows because the container image is broken. - default: "[\"5.9\", \"6.0\", \"6.1\", \"nightly\", \"nightly-6.2\"]" + default: "[\"5.10\", \"6.0\", \"6.1\", \"nightly\", \"nightly-6.2\"]" windows_exclude_swift_versions: type: string description: "Exclude Windows Swift version list (JSON)" @@ -102,7 +101,7 @@ on: Windows Command Prompt command to build and test the package. Note that Powershell does not automatically exit if a subcommand fails. The Invoke-Program utility is available to propagate non-zero exit codes. It is strongly encouraged to run all command using `Invoke-Program` unless you want to continue on error eg. `Invoke-Program git apply patch.diff` instead of `git apply patch.diff`. - default: "swift test" + default: "Invoke-Program swift test" macos_env_vars: description: "Newline separated list of environment variables" type: string