From 7eb3da6cdac2872d7bcafe96d81c74be32bc35d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Rodr=C3=ADguez-Guerra?= Date: Tue, 4 Aug 2020 11:35:30 +0200 Subject: [PATCH 1/2] Build 7.5.0 beta1 --- recipe/meta.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 00ab361..89b035e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,6 @@ {% set name = "openmm" %} -{% set version = "7.4.2" %} +{% set version = "7.5.0b1" %} +{% set commit_hash = "cc3c4b5" %} {% set build = 0 %} package: @@ -7,8 +8,10 @@ package: version: {{ version }} source: - url: https://github.com/openmm/{{ name }}/archive/{{ version }}.tar.gz - sha256: 2e121ad5cfcc4840861032bb1b11d4d0aea2d3ca3c59baaed73b8b0b4fd069cc + git_url: https://github.com/openmm/openmm.git + git_rev: {{ commit_hash }} + git_depth: 1 + build: number: {{ build }} From eee28d34c1116106e8d5030dfdcf761aceab0a81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Rodr=C3=ADguez-Guerra?= Date: Tue, 4 Aug 2020 13:20:23 +0200 Subject: [PATCH 2/2] Add artifacts support --- .azure-pipelines/azure-pipelines-linux.yml | 155 +++++++++++---------- .azure-pipelines/azure-pipelines-osx.yml | 67 +++++---- 2 files changed, 122 insertions(+), 100 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 1e6b6ca..61ea363 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -3,77 +3,88 @@ # -*- mode: yaml -*- jobs: -- job: linux - pool: - vmImage: ubuntu-16.04 - strategy: - matrix: - linux_cuda_compiler_version10.0python3.6.____cpython: - CONFIG: linux_cuda_compiler_version10.0python3.6.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.0 - linux_cuda_compiler_version10.0python3.7.____cpython: - CONFIG: linux_cuda_compiler_version10.0python3.7.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.0 - linux_cuda_compiler_version10.0python3.8.____cpython: - CONFIG: linux_cuda_compiler_version10.0python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.0 - linux_cuda_compiler_version10.1python3.6.____cpython: - CONFIG: linux_cuda_compiler_version10.1python3.6.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.1 - linux_cuda_compiler_version10.1python3.7.____cpython: - CONFIG: linux_cuda_compiler_version10.1python3.7.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.1 - linux_cuda_compiler_version10.1python3.8.____cpython: - CONFIG: linux_cuda_compiler_version10.1python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.1 - linux_cuda_compiler_version10.2python3.6.____cpython: - CONFIG: linux_cuda_compiler_version10.2python3.6.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.2 - linux_cuda_compiler_version10.2python3.7.____cpython: - CONFIG: linux_cuda_compiler_version10.2python3.7.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.2 - linux_cuda_compiler_version10.2python3.8.____cpython: - CONFIG: linux_cuda_compiler_version10.2python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.2 - linux_cuda_compiler_version9.2python3.6.____cpython: - CONFIG: linux_cuda_compiler_version9.2python3.6.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-cuda:9.2 - linux_cuda_compiler_version9.2python3.7.____cpython: - CONFIG: linux_cuda_compiler_version9.2python3.7.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-cuda:9.2 - linux_cuda_compiler_version9.2python3.8.____cpython: - CONFIG: linux_cuda_compiler_version9.2python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: condaforge/linux-anvil-cuda:9.2 - maxParallel: 8 - timeoutInMinutes: 360 + - job: linux + pool: + vmImage: ubuntu-16.04 + strategy: + matrix: + linux_cuda_compiler_version10.0python3.6.____cpython: + CONFIG: linux_cuda_compiler_version10.0python3.6.____cpython + UPLOAD_PACKAGES: "True" + DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.0 + linux_cuda_compiler_version10.0python3.7.____cpython: + CONFIG: linux_cuda_compiler_version10.0python3.7.____cpython + UPLOAD_PACKAGES: "True" + DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.0 + linux_cuda_compiler_version10.0python3.8.____cpython: + CONFIG: linux_cuda_compiler_version10.0python3.8.____cpython + UPLOAD_PACKAGES: "True" + DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.0 + linux_cuda_compiler_version10.1python3.6.____cpython: + CONFIG: linux_cuda_compiler_version10.1python3.6.____cpython + UPLOAD_PACKAGES: "True" + DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.1 + linux_cuda_compiler_version10.1python3.7.____cpython: + CONFIG: linux_cuda_compiler_version10.1python3.7.____cpython + UPLOAD_PACKAGES: "True" + DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.1 + linux_cuda_compiler_version10.1python3.8.____cpython: + CONFIG: linux_cuda_compiler_version10.1python3.8.____cpython + UPLOAD_PACKAGES: "True" + DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.1 + linux_cuda_compiler_version10.2python3.6.____cpython: + CONFIG: linux_cuda_compiler_version10.2python3.6.____cpython + UPLOAD_PACKAGES: "True" + DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.2 + linux_cuda_compiler_version10.2python3.7.____cpython: + CONFIG: linux_cuda_compiler_version10.2python3.7.____cpython + UPLOAD_PACKAGES: "True" + DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.2 + linux_cuda_compiler_version10.2python3.8.____cpython: + CONFIG: linux_cuda_compiler_version10.2python3.8.____cpython + UPLOAD_PACKAGES: "True" + DOCKER_IMAGE: condaforge/linux-anvil-cuda:10.2 + linux_cuda_compiler_version9.2python3.6.____cpython: + CONFIG: linux_cuda_compiler_version9.2python3.6.____cpython + UPLOAD_PACKAGES: "True" + DOCKER_IMAGE: condaforge/linux-anvil-cuda:9.2 + linux_cuda_compiler_version9.2python3.7.____cpython: + CONFIG: linux_cuda_compiler_version9.2python3.7.____cpython + UPLOAD_PACKAGES: "True" + DOCKER_IMAGE: condaforge/linux-anvil-cuda:9.2 + linux_cuda_compiler_version9.2python3.8.____cpython: + CONFIG: linux_cuda_compiler_version9.2python3.8.____cpython + UPLOAD_PACKAGES: "True" + DOCKER_IMAGE: condaforge/linux-anvil-cuda:9.2 + maxParallel: 8 + timeoutInMinutes: 360 - steps: - # configure qemu binfmt-misc running. This allows us to run docker containers - # embedded qemu-static - - script: | - docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes - ls /proc/sys/fs/binfmt_misc/ - condition: not(startsWith(variables['CONFIG'], 'linux_64')) - displayName: Configure binfmt_misc + steps: + # configure qemu binfmt-misc running. This allows us to run docker containers + # embedded qemu-static + - script: | + docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes + ls /proc/sys/fs/binfmt_misc/ + condition: not(startsWith(variables['CONFIG'], 'linux_64')) + displayName: Configure binfmt_misc - - script: | - export CI=azure - export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME - .scripts/run_docker_build.sh - displayName: Run docker build - env: - BINSTAR_TOKEN: $(BINSTAR_TOKEN) - FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + - script: | + export CI=azure + export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME + .scripts/run_docker_build.sh + displayName: Run docker build + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + + - script: | + if [ -d build_artifacts ]; then + echo "##vso[task.setVariable variable=CONDA_BLD_DIR_EXISTS]true" + fi + displayName: Check for conda build artifacts + condition: succeededOrFailed() + + - publish: build_artifacts/ + artifact: conda_artifacts_$(CONFIG)_$(system.JobId) + condition: eq(variables.CONDA_BLD_DIR_EXISTS, 'true') diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index be31e1e..deba946 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -3,32 +3,43 @@ # -*- mode: yaml -*- jobs: -- job: osx - pool: - vmImage: macOS-10.14 - strategy: - matrix: - osx_python3.6.____cpython: - CONFIG: osx_python3.6.____cpython - UPLOAD_PACKAGES: 'True' - osx_python3.7.____cpython: - CONFIG: osx_python3.7.____cpython - UPLOAD_PACKAGES: 'True' - osx_python3.8.____cpython: - CONFIG: osx_python3.8.____cpython - UPLOAD_PACKAGES: 'True' - maxParallel: 8 - timeoutInMinutes: 360 + - job: osx + pool: + vmImage: macOS-10.14 + strategy: + matrix: + osx_python3.6.____cpython: + CONFIG: osx_python3.6.____cpython + UPLOAD_PACKAGES: "True" + osx_python3.7.____cpython: + CONFIG: osx_python3.7.____cpython + UPLOAD_PACKAGES: "True" + osx_python3.8.____cpython: + CONFIG: osx_python3.8.____cpython + UPLOAD_PACKAGES: "True" + maxParallel: 8 + timeoutInMinutes: 360 - steps: - # TODO: Fast finish on azure pipelines? - - script: | - export CI=azure - export OSX_FORCE_SDK_DOWNLOAD="1" - export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME - ./.scripts/run_osx_build.sh - displayName: Run OSX build - env: - BINSTAR_TOKEN: $(BINSTAR_TOKEN) - FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + steps: + # TODO: Fast finish on azure pipelines? + - script: | + export CI=azure + export OSX_FORCE_SDK_DOWNLOAD="1" + export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME + ./.scripts/run_osx_build.sh + displayName: Run OSX build + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + + - script: | + if [ -d /Users/runner/miniforge3/conda-bld/ ]; then + echo "##vso[task.setVariable variable=CONDA_BLD_DIR_EXISTS]true" + fi + displayName: Check for conda build artifacts + condition: succeededOrFailed() + + - publish: /Users/runner/miniforge3/conda-bld/ + artifact: conda_artifacts_$(CONFIG)_$(system.JobId) + condition: eq(variables.CONDA_BLD_DIR_EXISTS, 'true')