Merge pull request #5 from regro-cf-autotick-bot/rebuild-qt515-0-1_hd…

…6acc6 Rebuild for qt515
conda-forge · Aug 27, 2022 · f28a19e · f28a19e
2 parents be234cc + 6a59ba7
commit f28a19e
Show file tree

Hide file tree

Showing 16 changed files with 269 additions and 85 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/.ci_support/README b/.ci_support/README
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -1,19 +1,16 @@
 cdt_name:
 - cos6
 channel_sources:
-- conda-forge,defaults
+- conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '7'
+- '10'
 docker_image:
-- condaforge/linux-anvil-comp7
-pin_run_as_build:
-  qt:
-    max_pin: x.x
-qt:
-- '5.12'
+- quay.io/condaforge/linux-anvil-cos7-x86_64
+qt_main:
+- '5.15'
 target_platform:
 - linux-64
diff --git a/.ci_support/migrations/qt515.yaml b/.ci_support/migrations/qt515.yaml
@@ -0,0 +1,10 @@
+migrator_ts: 1653771978
+__migrator:
+  kind: version
+  migration_number: 1
+  bump_number: 1
+
+qt:
+  - 5.15
+qt_main:
+  - 5.15
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -1,19 +1,16 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
 channel_sources:
-- conda-forge,defaults
+- conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '10'
+- '13'
 macos_machine:
 - x86_64-apple-darwin13.4.0
-pin_run_as_build:
-  qt:
-    max_pin: x.x
-qt:
-- '5.12'
+qt_main:
+- '5.15'
 target_platform:
 - osx-64
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.gitattributes b/.gitattributes
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh