From ae62526b9e2d6c7ab24f8beacf3efe60c8c0b6aa Mon Sep 17 00:00:00 2001 From: muryanto1 Date: Fri, 10 Apr 2020 09:51:19 -0700 Subject: [PATCH 1/3] drop py2 build, added py36 py38 builds --- .circleci/config.yml | 84 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 71 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b63a27..9f66ed1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -71,7 +71,7 @@ aliases: jobs: macos_setup: macos: - xcode: "11.3.0" + xcode: "11.4.0" environment: WORKDIR: /Users/distiller/project/macos_build PKG_NAME: "genutil" @@ -103,16 +103,16 @@ jobs: paths: - linux_build - macos_genutil_py2: + macos_genutil_py36: macos: - xcode: "11.3.0" + xcode: "11.4.0" environment: WORKDIR: /Users/distiller/project/macos_build PKG_NAME: "genutil" REPO_NAME: "genutil" ENV_NAME: "test_genutil" - CONDA_PY_VER: "python<3" - BUILD_VARIANT_VER: "2.7" + CONDA_PY_VER: "python>=3.6,<3.7" + BUILD_VARIANT_VER: "3.6" steps: - checkout - attach_workspace: @@ -130,7 +130,7 @@ jobs: macos_genutil_py37: macos: - xcode: "11.3.0" + xcode: "11.4.0" environment: WORKDIR: /Users/distiller/project/macos_build PKG_NAME: "genutil" @@ -153,7 +153,32 @@ jobs: paths: - macos_build/miniconda/conda-bld/osx-64/genutil*tar.bz2 - linux_genutil_py2: + macos_genutil_py38: + macos: + xcode: "11.4.0" + environment: + WORKDIR: /Users/distiller/project/macos_build + PKG_NAME: "genutil" + REPO_NAME: "genutil" + ENV_NAME: "test_genutil" + CONDA_PY_VER: "python>=3.8,<3.9" + BUILD_VARIANT_VER: "3.8" + steps: + - checkout + - attach_workspace: + at: . + - run: *conda_build + - run: *setup_run_tests + - run: *run_tests + - store_artifacts: + path: tests_html + destination: tests_html + - persist_to_workspace: + root: . + paths: + - macos_build/miniconda/conda-bld/osx-64/genutil*tar.bz2 + + linux_genutil_py36: machine: image: circleci/classic:latest environment: @@ -161,8 +186,8 @@ jobs: PKG_NAME: "genutil" REPO_NAME: "genutil" ENV_NAME: "test_genutil" - CONDA_PY_VER: "python<3" - BUILD_VARIANT_VER: "2.7" + CONDA_PY_VER: "python>=3.6,<3.7" + BUILD_VARIANT_VER: "3.6" steps: - checkout - attach_workspace: @@ -206,6 +231,31 @@ jobs: paths: - linux_build/miniconda/conda-bld/linux-64/genutil*tar.bz2 + linux_genutil_py38: + machine: + image: circleci/classic:latest + environment: + WORKDIR: /home/circleci/project/linux_build + PKG_NAME: "genutil" + REPO_NAME: "genutil" + ENV_NAME: "test_genutil" + CONDA_PY_VER: "python>=3.8,<3.9" + BUILD_VARIANT_VER: "3.8" + steps: + - checkout + - attach_workspace: + at: . + - run: *conda_build + - run: *setup_run_tests + - run: *run_tests + - store_artifacts: + path: tests_html + destination: tests_html + - persist_to_workspace: + root: . + paths: + - linux_build/miniconda/conda-bld/linux-64/genutil*tar.bz2 + upload: machine: image: circleci/classic:latest @@ -227,21 +277,29 @@ workflows: jobs: - macos_setup - linux_setup - - macos_genutil_py2: + - macos_genutil_py36: requires: - macos_setup - macos_genutil_py37: requires: - macos_setup - - linux_genutil_py2: + - macos_genutil_py38: + requires: + - macos_setup + - linux_genutil_py36: requires: - linux_setup - linux_genutil_py37: requires: - linux_setup + - linux_genutil_py38: + requires: + - linux_setup - upload: requires: - - macos_genutil_py2 + - macos_genutil_py36 - macos_genutil_py37 - - linux_genutil_py2 + - macos_genutil_py38 + - linux_genutil_py36 - linux_genutil_py37 + - linux_genutil_py38 From 91e77f46333e9bb544f0bf2dd828325aea589490 Mon Sep 17 00:00:00 2001 From: muryanto1 Date: Fri, 10 Apr 2020 09:54:08 -0700 Subject: [PATCH 2/3] use validateNightlyNew branch of conda-recipes, and temporarily upload from this branch --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9f66ed1..13e1555 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ aliases: name: setup_miniconda command: | mkdir -p workspace - git clone -b validateNightly git@github.com:CDAT/cdat workspace/cdat + git clone -b validateNightlyNew git@github.com:CDAT/cdat workspace/cdat # install_miniconda.py installs miniconda3 under $WORKDIR/miniconda python workspace/cdat/scripts/install_miniconda.py -w $WORKDIR -p 'py3' @@ -51,9 +51,9 @@ aliases: - &conda_upload name: conda_upload command: | - if [[ $CIRCLE_BRANCH != "master" ]]; then - exit 0 - fi + #if [[ $CIRCLE_BRANCH != "master" ]]; then + # exit 0 + #fi source $WORKDIR/miniconda/etc/profile.d/conda.sh conda activate base UPLOAD_OPTIONS="-t $CONDA_UPLOAD_TOKEN upload -u $USER -l $LABEL" From f1928aba338917f449152415616a954af535b512 Mon Sep 17 00:00:00 2001 From: muryanto1 Date: Fri, 10 Apr 2020 11:18:44 -0700 Subject: [PATCH 3/3] only upload from master --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 13e1555..dc9cf79 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -51,9 +51,9 @@ aliases: - &conda_upload name: conda_upload command: | - #if [[ $CIRCLE_BRANCH != "master" ]]; then - # exit 0 - #fi + if [[ $CIRCLE_BRANCH != "master" ]]; then + exit 0 + fi source $WORKDIR/miniconda/etc/profile.d/conda.sh conda activate base UPLOAD_OPTIONS="-t $CONDA_UPLOAD_TOKEN upload -u $USER -l $LABEL"