Skip to content

Commit

Permalink
Fix argument name in windows CI
Browse files Browse the repository at this point in the history
We are using `cxx` as the host compiler and `std` as the C++ version for linux tests.

However, on windows we use `cxx` for the standard version, which annoys me to no end.
  • Loading branch information
miscco committed Nov 23, 2023
1 parent 8e6da27 commit 373aa13
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dispatch-build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ jobs:
include: ${{ fromJSON(inputs.per_cuda_compiler_matrix) }}
with:
test_name: ${{matrix.cpu}}/${{matrix.compiler.name}}${{matrix.compiler.version}}/C++${{matrix.std}}
build_script: "./ci/windows/build_${{ inputs.project_name }}.ps1 ${{matrix.std}}"
build_script: "./ci/windows/build_${{ inputs.project_name }}.ps1 -std ${{matrix.std}}"
container_image: rapidsai/devcontainers:${{inputs.devcontainer_version}}-cuda${{matrix.cuda}}-${{matrix.compiler.name}}${{matrix.compiler.version}}-${{matrix.os}}
2 changes: 1 addition & 1 deletion ci/windows/build_common.psm1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Param(
[Parameter(Mandatory = $true)]
[Alias("cxx")]
[Alias("std")]
[ValidateNotNullOrEmpty()]
[ValidateSet(11, 14, 17, 20)]
[int]$CXX_STANDARD = 17
Expand Down
2 changes: 1 addition & 1 deletion ci/windows/build_cub.ps1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Param(
[Parameter(Mandatory = $true)]
[Alias("cxx")]
[Alias("std")]
[ValidateNotNullOrEmpty()]
[ValidateSet(11, 14, 17, 20)]
[int]$CXX_STANDARD = 17
Expand Down
2 changes: 1 addition & 1 deletion ci/windows/build_libcudacxx.ps1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Param(
[Parameter(Mandatory = $true)]
[Alias("cxx")]
[Alias("std")]
[ValidateNotNullOrEmpty()]
[ValidateSet(11, 14, 17, 20)]
[int]$CXX_STANDARD = 17
Expand Down
2 changes: 1 addition & 1 deletion ci/windows/build_thrust.ps1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Param(
[Parameter(Mandatory = $true)]
[Alias("cxx")]
[Alias("std")]
[ValidateNotNullOrEmpty()]
[ValidateSet(11, 14, 17, 20)]
[int]$CXX_STANDARD = 17
Expand Down

0 comments on commit 373aa13

Please sign in to comment.