Fix ros3 driver for curl>7.69 and enable ros3 on Windows

automerged PR by conda-forge/automerge-action
conda-forge · Nov 27, 2020 · a07e09b · a07e09b · conda-forge-linter · Nov 27, 2020
2 parents d09cd44 + 85c63c0
commit a07e09b
Show file tree

Hide file tree

Showing 32 changed files with 105 additions and 835 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/...t/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpimpich.yaml b/...t/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpimpich.yaml
diff --git a/...t/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpinompi.yaml b/...t/linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpinompi.yaml
diff --git a/...linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpiopenmpi.yaml b/...linux_64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpiopenmpi.yaml
diff --git a/...on9fortran_compiler_version9mpimpich.yaml → .ci_support/linux_64_mpimpich.yaml b/...on9fortran_compiler_version9mpimpich.yaml → .ci_support/linux_64_mpimpich.yaml
@@ -2,6 +2,8 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '9'
+cdt_name:
+- cos6
 channel_sources:
 - conda-forge,defaults
 channel_targets:
@@ -11,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '9'
 docker_image:
-- condaforge/linux-anvil-comp7
+- quay.io/condaforge/linux-anvil-comp7
 fortran_compiler:
 - gfortran
 fortran_compiler_version:

diff --git a/...on9fortran_compiler_version9mpinompi.yaml → .ci_support/linux_64_mpinompi.yaml b/...on9fortran_compiler_version9mpinompi.yaml → .ci_support/linux_64_mpinompi.yaml
@@ -2,6 +2,8 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '9'
+cdt_name:
+- cos6
 channel_sources:
 - conda-forge,defaults
 channel_targets:
@@ -11,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '9'
 docker_image:
-- condaforge/linux-anvil-comp7
+- quay.io/condaforge/linux-anvil-comp7
 fortran_compiler:
 - gfortran
 fortran_compiler_version:

diff --git a/...9fortran_compiler_version9mpiopenmpi.yaml → .ci_support/linux_64_mpiopenmpi.yaml b/...9fortran_compiler_version9mpiopenmpi.yaml → .ci_support/linux_64_mpiopenmpi.yaml
@@ -2,6 +2,8 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '9'
+cdt_name:
+- cos6
 channel_sources:
 - conda-forge,defaults
 channel_targets:
@@ -11,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '9'
 docker_image:
-- condaforge/linux-anvil-comp7
+- quay.io/condaforge/linux-anvil-comp7
 fortran_compiler:
 - gfortran
 fortran_compiler_version:

diff --git a/...ux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpimpich.yaml b/...ux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpimpich.yaml
diff --git a/...ux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpinompi.yaml b/...ux_aarch64_c_compiler_version7cxx_compiler_version7fortran_compiler_version7mpinompi.yaml