Merge pull request #12 from regro-cf-autotick-bot/rebuild-boost1780-0…

…-3_h5aba1c Rebuild for boost1780
conda-forge · Sep 19, 2022 · 46d9918 · 46d9918
2 parents 510153d + 392e76f
commit 46d9918
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 25 deletions.
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/...support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10.yaml b/...support/linux_64_c_compiler_version10cuda_compiler_version11.1cxx_compiler_version10.yaml
@@ -1,5 +1,5 @@
 boost_cpp:
-- 1.74.0
+- 1.78.0
 c_compiler:
 - gcc
 c_compiler_version:

diff --git a/...support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml b/...support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml
@@ -1,5 +1,5 @@
 boost_cpp:
-- 1.74.0
+- 1.78.0
 c_compiler:
 - gcc
 c_compiler_version:

diff --git a/...support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10.yaml b/...support/linux_64_c_compiler_version10cuda_compiler_versionNonecxx_compiler_version10.yaml
@@ -1,5 +1,5 @@
 boost_cpp:
-- 1.74.0
+- 1.78.0
 c_compiler:
 - gcc
 c_compiler_version:

diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cxx_compiler_version7.yaml
@@ -1,5 +1,5 @@
 boost_cpp:
-- 1.74.0
+- 1.78.0
 c_compiler:
 - gcc
 c_compiler_version:

diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cxx_compiler_version9.yaml
@@ -1,5 +1,5 @@
 boost_cpp:
-- 1.74.0
+- 1.78.0
 c_compiler:
 - gcc
 c_compiler_version:

diff --git a/.ci_support/migrations/boost1780.yaml b/.ci_support/migrations/boost1780.yaml
@@ -0,0 +1,9 @@
+__migrator:
+  build_number: 1
+  kind: version
+  migration_number: 3
+boost:
+- 1.78.0
+boost_cpp:
+- 1.78.0
+migrator_ts: 1662825971
diff --git a/.ci_support/migrations/vlfeat0921.yaml b/.ci_support/migrations/vlfeat0921.yaml
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -1,11 +1,11 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
 boost_cpp:
-- 1.74.0
+- 1.78.0
 c_compiler:
 - clang
 c_compiler_version:
-- '13'
+- '14'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -15,7 +15,7 @@ cuda_compiler_version:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '13'
+- '14'
 flann:
 - 1.9.1
 gflags:
@@ -27,7 +27,7 @@ glog:
 gmp:
 - '6'
 llvm_openmp:
-- '13'
+- '14'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 pin_run_as_build:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -1,11 +1,11 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
 boost_cpp:
-- 1.74.0
+- 1.78.0
 c_compiler:
 - clang
 c_compiler_version:
-- '13'
+- '14'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -15,7 +15,7 @@ cuda_compiler_version:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '13'
+- '14'
 flann:
 - 1.9.1
 gflags:
@@ -27,7 +27,7 @@ glog:
 gmp:
 - '6'
 llvm_openmp:
-- '13'
+- '14'
 macos_machine:
 - arm64-apple-darwin20.0.0
 pin_run_as_build:

diff --git a/conda-forge.yml b/conda-forge.yml
@@ -1,9 +1,9 @@
+build_platform:
+  osx_arm64: osx_64
 conda_forge_output_validation: true
 github:
   branch_name: main
   tooling_branch_name: main
-build_platform:
-  osx_arm64: osx_64
-test_on_native_only: true
 os_version:
   linux_64: cos7
+test_on_native_only: true
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = "colmap" %}
 {% set version = "3.7" %}
-{% set build = 5 %}
+{% set build = 6 %}
 
 {% set processor = "cpu" if cuda_compiler_version == "None" else "gpu" %}  # [not osx]
 {% set processor = "cpu" %}  # [osx]