From 6edcc59fc242b36ba3d090c4f92586e0a00ffb27 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Fri, 30 Oct 2020 09:12:50 +1000 Subject: [PATCH 1/8] v11.2 --- recipe/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 89b359d9..add83ab5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "gazebo" %} -{% set version = "11.1.0" %} +{% set version = "11.2.0" %} package: name: {{ name }} @@ -7,7 +7,7 @@ package: source: - url: https://github.com/osrf/{{ name }}/archive/{{ name }}{{ version.split('.')[0] }}_{{ version }}.tar.gz - sha256: 6a1166c5a7dfde176c6db5f0ce76994283a18ca2fc7dbbe95ba3f26fee125485 + sha256: 4b59b5d43805ca094dfe06027b1cbcb5fb81790c873cdce6ad41e270f0cc7fc4 patches: - fix_build.patch # [unix] - use-external-libs-config.patch # [win] @@ -17,7 +17,7 @@ source: build: number: 0 - skip: false + skip: true # [win] run_exports: - {{ pin_subpackage('gazebo', max_pin='x.x') }} @@ -128,7 +128,7 @@ about: home: http://gazebosim.org/ license: Apache-2.0 license_file: LICENSE - summary: 'Advanced robot simulator for research, design, and development.' + summary: Advanced robot simulator for research, design, and development. extra: recipe-maintainers: From 6367d46eb0821f65c0abc9f54cae1d1eebb9698f Mon Sep 17 00:00:00 2001 From: conda-forge-linter Date: Thu, 29 Oct 2020 23:16:32 +0000 Subject: [PATCH 2/8] MNT: Re-rendered with conda-build 3.20.5, conda-smithy 3.8.4, and conda-forge-pinning 2020.10.29.11.45.42 --- .azure-pipelines/azure-pipelines-win.yml | 113 ----------------------- .ci_support/win_64_boost_cpp1.72.0.yaml | 29 ------ .ci_support/win_64_boost_cpp1.74.0.yaml | 29 ------ README.md | 14 --- azure-pipelines.yml | 1 - 5 files changed, 186 deletions(-) delete mode 100755 .azure-pipelines/azure-pipelines-win.yml delete mode 100644 .ci_support/win_64_boost_cpp1.72.0.yaml delete mode 100644 .ci_support/win_64_boost_cpp1.74.0.yaml diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml deleted file mode 100755 index 66ba03ea..00000000 --- a/.azure-pipelines/azure-pipelines-win.yml +++ /dev/null @@ -1,113 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- - -jobs: -- job: win - pool: - vmImage: vs2017-win2016 - strategy: - matrix: - win_64_boost_cpp1.72.0: - CONFIG: win_64_boost_cpp1.72.0 - UPLOAD_PACKAGES: 'True' - win_64_boost_cpp1.74.0: - CONFIG: win_64_boost_cpp1.74.0 - UPLOAD_PACKAGES: 'True' - timeoutInMinutes: 360 - variables: - CONDA_BLD_PATH: D:\\bld\\ - - steps: - - script: | - choco install vcpython27 -fdv -y --debug - condition: contains(variables['CONFIG'], 'vs2008') - displayName: Install vcpython27.msi (if needed) - - # Cygwin's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) - # - script: rmdir C:\cygwin /s /q - # continueOnError: true - - - powershell: | - Set-PSDebug -Trace 1 - - $batchcontent = @" - ECHO ON - SET vcpython=C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0 - - DIR "%vcpython%" - - CALL "%vcpython%\vcvarsall.bat" %* - "@ - - $batchDir = "C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0\VC" - $batchPath = "$batchDir" + "\vcvarsall.bat" - New-Item -Path $batchPath -ItemType "file" -Force - - Set-Content -Value $batchcontent -Path $batchPath - - Get-ChildItem -Path $batchDir - - Get-ChildItem -Path ($batchDir + '\..') - - condition: contains(variables['CONFIG'], 'vs2008') - displayName: Patch vs2008 (if needed) - - - task: CondaEnvironment@1 - inputs: - packageSpecs: 'python=3.6 conda-build conda "conda-forge-ci-setup=3" pip' # Optional - installOptions: "-c conda-forge" - updateConda: true - displayName: Install conda-build and activate environment - - - script: set PYTHONUNBUFFERED=1 - displayName: Set PYTHONUNBUFFERED - - # Configure the VM - - script: | - call activate base - setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml - displayName: conda-forge CI setup - - # Configure the VM. - - script: | - set "CI=azure" - call activate base - run_conda_forge_build_setup - displayName: conda-forge build setup - - - # Special cased version setting some more things! - - script: | - call activate base - conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml - displayName: Build recipe (vs2008) - env: - VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin" - PYTHONUNBUFFERED: 1 - condition: contains(variables['CONFIG'], 'vs2008') - - - script: | - call activate base - conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml - displayName: Build recipe - env: - PYTHONUNBUFFERED: 1 - condition: not(contains(variables['CONFIG'], 'vs2008')) - - script: | - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - call activate base - validate_recipe_outputs "%FEEDSTOCK_NAME%" - displayName: Validate Recipe Outputs - - - script: | - set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - call activate base - upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml - displayName: Upload package - env: - BINSTAR_TOKEN: $(BINSTAR_TOKEN) - FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False'))) \ No newline at end of file diff --git a/.ci_support/win_64_boost_cpp1.72.0.yaml b/.ci_support/win_64_boost_cpp1.72.0.yaml deleted file mode 100644 index 5500f7d8..00000000 --- a/.ci_support/win_64_boost_cpp1.72.0.yaml +++ /dev/null @@ -1,29 +0,0 @@ -boost_cpp: -- 1.72.0 -c_compiler: -- vs2017 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -curl: -- '7' -cxx_compiler: -- vs2017 -libcurl: -- '7' -libprotobuf: -- '3.13' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x - curl: - max_pin: x - libcurl: - max_pin: x - qt: - max_pin: x.x -qt: -- '5.12' -target_platform: -- win-64 diff --git a/.ci_support/win_64_boost_cpp1.74.0.yaml b/.ci_support/win_64_boost_cpp1.74.0.yaml deleted file mode 100644 index d597b888..00000000 --- a/.ci_support/win_64_boost_cpp1.74.0.yaml +++ /dev/null @@ -1,29 +0,0 @@ -boost_cpp: -- 1.74.0 -c_compiler: -- vs2017 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -curl: -- '7' -cxx_compiler: -- vs2017 -libcurl: -- '7' -libprotobuf: -- '3.13' -pin_run_as_build: - boost-cpp: - max_pin: x.x.x - curl: - max_pin: x - libcurl: - max_pin: x - qt: - max_pin: x.x -qt: -- '5.12' -target_platform: -- win-64 diff --git a/README.md b/README.md index 29a63e0f..cfb4b50e 100644 --- a/README.md +++ b/README.md @@ -54,20 +54,6 @@ Current build status variant - - win_64_boost_cpp1.72.0 - - - variant - - - - win_64_boost_cpp1.74.0 - - - variant - - diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f50..33a441c1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,4 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file From 86681c9f2b4b6f7e8c54d9a692b3d36c72fbf9a1 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Sat, 31 Oct 2020 20:31:03 +1000 Subject: [PATCH 3/8] Do not skip win --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index add83ab5..f6e0249b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,7 +17,7 @@ source: build: number: 0 - skip: true # [win] + skip: false run_exports: - {{ pin_subpackage('gazebo', max_pin='x.x') }} From 26d246b2918da50c71198f85bc31ecfae1b9fd0d Mon Sep 17 00:00:00 2001 From: conda-forge-linter Date: Sat, 31 Oct 2020 10:33:51 +0000 Subject: [PATCH 4/8] MNT: Re-rendered with conda-build 3.20.5, conda-smithy 3.8.4, and conda-forge-pinning 2020.10.31.07.48.09 --- .azure-pipelines/azure-pipelines-win.yml | 113 +++++++++++++++++++++++ .ci_support/win_64_boost_cpp1.72.0.yaml | 29 ++++++ .ci_support/win_64_boost_cpp1.74.0.yaml | 29 ++++++ README.md | 14 +++ azure-pipelines.yml | 1 + 5 files changed, 186 insertions(+) create mode 100755 .azure-pipelines/azure-pipelines-win.yml create mode 100644 .ci_support/win_64_boost_cpp1.72.0.yaml create mode 100644 .ci_support/win_64_boost_cpp1.74.0.yaml diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml new file mode 100755 index 00000000..66ba03ea --- /dev/null +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -0,0 +1,113 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +jobs: +- job: win + pool: + vmImage: vs2017-win2016 + strategy: + matrix: + win_64_boost_cpp1.72.0: + CONFIG: win_64_boost_cpp1.72.0 + UPLOAD_PACKAGES: 'True' + win_64_boost_cpp1.74.0: + CONFIG: win_64_boost_cpp1.74.0 + UPLOAD_PACKAGES: 'True' + timeoutInMinutes: 360 + variables: + CONDA_BLD_PATH: D:\\bld\\ + + steps: + - script: | + choco install vcpython27 -fdv -y --debug + condition: contains(variables['CONFIG'], 'vs2008') + displayName: Install vcpython27.msi (if needed) + + # Cygwin's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) + # - script: rmdir C:\cygwin /s /q + # continueOnError: true + + - powershell: | + Set-PSDebug -Trace 1 + + $batchcontent = @" + ECHO ON + SET vcpython=C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0 + + DIR "%vcpython%" + + CALL "%vcpython%\vcvarsall.bat" %* + "@ + + $batchDir = "C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0\VC" + $batchPath = "$batchDir" + "\vcvarsall.bat" + New-Item -Path $batchPath -ItemType "file" -Force + + Set-Content -Value $batchcontent -Path $batchPath + + Get-ChildItem -Path $batchDir + + Get-ChildItem -Path ($batchDir + '\..') + + condition: contains(variables['CONFIG'], 'vs2008') + displayName: Patch vs2008 (if needed) + + - task: CondaEnvironment@1 + inputs: + packageSpecs: 'python=3.6 conda-build conda "conda-forge-ci-setup=3" pip' # Optional + installOptions: "-c conda-forge" + updateConda: true + displayName: Install conda-build and activate environment + + - script: set PYTHONUNBUFFERED=1 + displayName: Set PYTHONUNBUFFERED + + # Configure the VM + - script: | + call activate base + setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml + displayName: conda-forge CI setup + + # Configure the VM. + - script: | + set "CI=azure" + call activate base + run_conda_forge_build_setup + displayName: conda-forge build setup + + + # Special cased version setting some more things! + - script: | + call activate base + conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml + displayName: Build recipe (vs2008) + env: + VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin" + PYTHONUNBUFFERED: 1 + condition: contains(variables['CONFIG'], 'vs2008') + + - script: | + call activate base + conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml + displayName: Build recipe + env: + PYTHONUNBUFFERED: 1 + condition: not(contains(variables['CONFIG'], 'vs2008')) + - script: | + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + call activate base + validate_recipe_outputs "%FEEDSTOCK_NAME%" + displayName: Validate Recipe Outputs + + - script: | + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + call activate base + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + displayName: Upload package + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False'))) \ No newline at end of file diff --git a/.ci_support/win_64_boost_cpp1.72.0.yaml b/.ci_support/win_64_boost_cpp1.72.0.yaml new file mode 100644 index 00000000..5500f7d8 --- /dev/null +++ b/.ci_support/win_64_boost_cpp1.72.0.yaml @@ -0,0 +1,29 @@ +boost_cpp: +- 1.72.0 +c_compiler: +- vs2017 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +curl: +- '7' +cxx_compiler: +- vs2017 +libcurl: +- '7' +libprotobuf: +- '3.13' +pin_run_as_build: + boost-cpp: + max_pin: x.x.x + curl: + max_pin: x + libcurl: + max_pin: x + qt: + max_pin: x.x +qt: +- '5.12' +target_platform: +- win-64 diff --git a/.ci_support/win_64_boost_cpp1.74.0.yaml b/.ci_support/win_64_boost_cpp1.74.0.yaml new file mode 100644 index 00000000..d597b888 --- /dev/null +++ b/.ci_support/win_64_boost_cpp1.74.0.yaml @@ -0,0 +1,29 @@ +boost_cpp: +- 1.74.0 +c_compiler: +- vs2017 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +curl: +- '7' +cxx_compiler: +- vs2017 +libcurl: +- '7' +libprotobuf: +- '3.13' +pin_run_as_build: + boost-cpp: + max_pin: x.x.x + curl: + max_pin: x + libcurl: + max_pin: x + qt: + max_pin: x.x +qt: +- '5.12' +target_platform: +- win-64 diff --git a/README.md b/README.md index cfb4b50e..29a63e0f 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,20 @@ Current build status variant + + win_64_boost_cpp1.72.0 + + + variant + + + + win_64_boost_cpp1.74.0 + + + variant + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 33a441c1..6b346f50 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,4 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file From fe1c990f74fbeeacd4701df1488f4725842ffac8 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Sat, 31 Oct 2020 21:08:31 +1000 Subject: [PATCH 5/8] Pin sdformat to 9.3 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f6e0249b..816dde93 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -53,7 +53,7 @@ requirements: - libglu # [linux] # deps - libprotobuf - - libsdformat + - libsdformat 9.3 - libignition-transport8 - libignition-common3 - libignition-fuel-tools4 From f6a61e8283f79432d0f4e44dc4eb30ebe55006e4 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Mon, 2 Nov 2020 08:29:26 +1000 Subject: [PATCH 6/8] Remove pin on libsdformat --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 816dde93..f6e0249b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -53,7 +53,7 @@ requirements: - libglu # [linux] # deps - libprotobuf - - libsdformat 9.3 + - libsdformat - libignition-transport8 - libignition-common3 - libignition-fuel-tools4 From f94a40778cc9e5b57705205be1a4025244231bd4 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Mon, 2 Nov 2020 09:28:13 +1000 Subject: [PATCH 7/8] Add pin back --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f6e0249b..16c1ce57 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -53,7 +53,7 @@ requirements: - libglu # [linux] # deps - libprotobuf - - libsdformat + - libsdformat 9.3 - libignition-transport8 - libignition-common3 - libignition-fuel-tools4 @@ -91,7 +91,7 @@ requirements: - libglu # [linux] # deps - libprotobuf - - libsdformat + - libsdformat 9.3 - libignition-transport8 - libignition-common3 - libignition-fuel-tools4 From ae2f59e6a4a350a215d822bbdf1e669a22de4175 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Thu, 5 Nov 2020 07:50:19 +1000 Subject: [PATCH 8/8] Try pinning libignition-common3 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 16c1ce57..16a944cb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -55,7 +55,7 @@ requirements: - libprotobuf - libsdformat 9.3 - libignition-transport8 - - libignition-common3 + - libignition-common3 3.6 - libignition-fuel-tools4 - qt - ogre 1.10.*