diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index f9ecb9a8f..faeb8f9d0 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,12 +8,12 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_c_compiler_version10c_stdlib_version2.17cuda_compiler_version11.2cxx_compiler_version10: - CONFIG: linux_64_c_compiler_version10c_stdlib_version2.17cuda_compiler_version11.2cxx_compiler_version10 + linux_64_c_compiler_version10c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10: + CONFIG: linux_64_c_compiler_version10c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12: - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12 + linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12: + CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index c12db6fb2..f57e6cad1 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,11 +8,11 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_cuda_compiler_version11.2: - CONFIG: win_64_cuda_compiler_version11.2 + win_64_cuda_compilerNonecuda_compiler_versionNone: + CONFIG: win_64_cuda_compilerNonecuda_compiler_versionNone UPLOAD_PACKAGES: 'True' - win_64_cuda_compiler_versionNone: - CONFIG: win_64_cuda_compiler_versionNone + win_64_cuda_compilernvcccuda_compiler_version11.2: + CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.2 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_c_compiler_version10c_stdlib_version2.17cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_64_c_compiler_version10c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml similarity index 99% rename from .ci_support/linux_64_c_compiler_version10c_stdlib_version2.17cuda_compiler_version11.2cxx_compiler_version10.yaml rename to .ci_support/linux_64_c_compiler_version10c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml index f5c11c821..6c9372d64 100644 --- a/.ci_support/linux_64_c_compiler_version10c_stdlib_version2.17cuda_compiler_version11.2cxx_compiler_version10.yaml +++ b/.ci_support/linux_64_c_compiler_version10c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml @@ -69,7 +69,7 @@ python: re2: - 2023.09.01 snappy: -- '1.1' +- '1.2' target_platform: - linux-64 thrift_cpp: diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml similarity index 99% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index bf61efd2a..bf42bf8d0 100644 --- a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -69,7 +69,7 @@ python: re2: - 2023.09.01 snappy: -- '1.1' +- '1.2' target_platform: - linux-64 thrift_cpp: diff --git a/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml index 1305d52ea..90afb0c9c 100644 --- a/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml @@ -73,7 +73,7 @@ python: re2: - 2023.09.01 snappy: -- '1.1' +- '1.2' target_platform: - linux-aarch64 thrift_cpp: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index 99f7f1cca..30808f80e 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -73,7 +73,7 @@ python: re2: - 2023.09.01 snappy: -- '1.1' +- '1.2' target_platform: - linux-aarch64 thrift_cpp: diff --git a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml index 409b6b55d..897e44de5 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml @@ -69,7 +69,7 @@ python: re2: - 2023.09.01 snappy: -- '1.1' +- '1.2' target_platform: - linux-ppc64le thrift_cpp: diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index 59d295017..92f1a82bb 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -69,7 +69,7 @@ python: re2: - 2023.09.01 snappy: -- '1.1' +- '1.2' target_platform: - linux-ppc64le thrift_cpp: diff --git a/.ci_support/migrations/snappy120.yaml b/.ci_support/migrations/snappy120.yaml new file mode 100644 index 000000000..10e1f141f --- /dev/null +++ b/.ci_support/migrations/snappy120.yaml @@ -0,0 +1,7 @@ +migrator_ts: 1712592149 +__migrator: + kind: version + migration_number: 1 + bump_number: 1 +snappy: + - 1.2 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 50bec27e4..d8f9a9e90 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -65,7 +65,7 @@ python: re2: - 2023.09.01 snappy: -- '1.1' +- '1.2' target_platform: - osx-64 thrift_cpp: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 68aa24d16..5ea1bb304 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -65,7 +65,7 @@ python: re2: - 2023.09.01 snappy: -- '1.1' +- '1.2' target_platform: - osx-arm64 thrift_cpp: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml similarity index 99% rename from .ci_support/win_64_cuda_compiler_versionNone.yaml rename to .ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml index a4de053ad..d6d0f2786 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml @@ -65,7 +65,7 @@ python: re2: - 2023.09.01 snappy: -- '1.1' +- '1.2' target_platform: - win-64 thrift_cpp: diff --git a/.ci_support/win_64_cuda_compiler_version11.2.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.2.yaml similarity index 99% rename from .ci_support/win_64_cuda_compiler_version11.2.yaml rename to .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.2.yaml index 7890dbc9a..997f35bf4 100644 --- a/.ci_support/win_64_cuda_compiler_version11.2.yaml +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.2.yaml @@ -65,7 +65,7 @@ python: re2: - 2023.09.01 snappy: -- '1.1' +- '1.2' target_platform: - win-64 thrift_cpp: diff --git a/README.md b/README.md index 8ee94fae4..d825e2f3d 100644 --- a/README.md +++ b/README.md @@ -139,17 +139,17 @@ Current build status
Variant | Status | |
---|---|---|
linux_64_c_compiler_version10c_stdlib_version2.17cuda_compiler_version11.2cxx_compiler_version10 | +linux_64_c_compiler_version10c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 | - + |
linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12 | +linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 | - + |
win_64_cuda_compiler_version11.2 | +win_64_cuda_compilerNonecuda_compiler_versionNone | - + |
win_64_cuda_compiler_versionNone | +win_64_cuda_compilernvcccuda_compiler_version11.2 | - + |