From 6affb0ca16152257fe5ffb072d53198a3cb4b620 Mon Sep 17 00:00:00 2001 From: Francisco Massa Date: Tue, 17 Sep 2019 09:38:18 -0300 Subject: [PATCH 1/3] Set block style serialization in yaml --- .circleci/regenerate.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/regenerate.py b/.circleci/regenerate.py index 7e6fd747399..cc94e624bec 100755 --- a/.circleci/regenerate.py +++ b/.circleci/regenerate.py @@ -76,7 +76,8 @@ def generate_upload_workflow(base_workflow_name, os_type, btype, cu_version): def indent(indentation, data_list): - return ("\n" + " " * indentation).join(yaml.dump(data_list).splitlines()) + return ("\n" + " " * indentation).join( + yaml.dump(data_list, default_flow_style=False).splitlines()) if __name__ == "__main__": From fd3fef0569e593c99a5a7e7e4a978ce372cf09ca Mon Sep 17 00:00:00 2001 From: Francisco Massa Date: Tue, 17 Sep 2019 09:39:13 -0300 Subject: [PATCH 2/3] Add new checkout command --- .circleci/config.yml | 26 ++++++++++++++++++++------ .circleci/config.yml.in | 26 ++++++++++++++++++++------ 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5c9301ec4a7..549aec84cef 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,6 +9,20 @@ version: 2.1 orbs: win: circleci/windows@1.0.0 +commands: + checkout_merge: + description: "checkout merge branch" + steps: + - checkout + - run: + name: Checkout merge branch + command: | + set -ex + git fetch --force origin ${CIRCLE_BRANCH}/merge:remotes/origin/${CIRCLE_BRANCH} + git reset --hard "$CIRCLE_SHA1" + git checkout -q -B "$CIRCLE_BRANCH" + git reset --hard "$CIRCLE_SHA1" + binary_common: &binary_common parameters: # Edit these defaults to do a release` @@ -60,7 +74,7 @@ jobs: - image: << parameters.wheel_docker_image >> resource_class: 2xlarge+ steps: - - checkout + - checkout_merge - run: packaging/build_wheel.sh - store_artifacts: path: dist @@ -75,7 +89,7 @@ jobs: - image: "soumith/conda-cuda" resource_class: 2xlarge+ steps: - - checkout + - checkout_merge - run: packaging/build_conda.sh - store_artifacts: path: /opt/conda/conda-bld/linux-64 @@ -90,7 +104,7 @@ jobs: image: ubuntu-1604:201903-01 resource_class: gpu.medium steps: - - checkout + - checkout_merge - run: name: Setup environment command: | @@ -159,7 +173,7 @@ jobs: name: win/vs2019 shell: bash.exe steps: - - checkout + - checkout_merge - run: command: | choco install miniconda3 @@ -173,7 +187,7 @@ jobs: macos: xcode: "9.0" steps: - - checkout + - checkout_merge - run: # Cannot easily deduplicate this as source'ing activate # will set environment variables which we need to propagate @@ -195,7 +209,7 @@ jobs: macos: xcode: "9.0" steps: - - checkout + - checkout_merge - run: command: | curl -o conda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index 70d5a613508..f2824e0a297 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -9,6 +9,20 @@ version: 2.1 orbs: win: circleci/windows@1.0.0 +commands: + checkout_merge: + description: "checkout merge branch" + steps: + - checkout + - run: + name: Checkout merge branch + command: | + set -ex + git fetch --force origin ${CIRCLE_BRANCH}/merge:remotes/origin/${CIRCLE_BRANCH} + git reset --hard "$CIRCLE_SHA1" + git checkout -q -B "$CIRCLE_BRANCH" + git reset --hard "$CIRCLE_SHA1" + binary_common: &binary_common parameters: # Edit these defaults to do a release` @@ -60,7 +74,7 @@ jobs: - image: << parameters.wheel_docker_image >> resource_class: 2xlarge+ steps: - - checkout + - checkout_merge - run: packaging/build_wheel.sh - store_artifacts: path: dist @@ -75,7 +89,7 @@ jobs: - image: "soumith/conda-cuda" resource_class: 2xlarge+ steps: - - checkout + - checkout_merge - run: packaging/build_conda.sh - store_artifacts: path: /opt/conda/conda-bld/linux-64 @@ -90,7 +104,7 @@ jobs: image: ubuntu-1604:201903-01 resource_class: gpu.medium steps: - - checkout + - checkout_merge - run: name: Setup environment command: | @@ -159,7 +173,7 @@ jobs: name: win/vs2019 shell: bash.exe steps: - - checkout + - checkout_merge - run: command: | choco install miniconda3 @@ -173,7 +187,7 @@ jobs: macos: xcode: "9.0" steps: - - checkout + - checkout_merge - run: # Cannot easily deduplicate this as source'ing activate # will set environment variables which we need to propagate @@ -195,7 +209,7 @@ jobs: macos: xcode: "9.0" steps: - - checkout + - checkout_merge - run: command: | curl -o conda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh From 4f01a054713003235bb6ee5944ecb6b18926a2d3 Mon Sep 17 00:00:00 2001 From: Francisco Massa Date: Tue, 17 Sep 2019 10:43:42 -0300 Subject: [PATCH 3/3] Put on a different branch name --- .circleci/config.yml | 6 ++---- .circleci/config.yml.in | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 549aec84cef..0cbbef4fdcd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,10 +18,8 @@ commands: name: Checkout merge branch command: | set -ex - git fetch --force origin ${CIRCLE_BRANCH}/merge:remotes/origin/${CIRCLE_BRANCH} - git reset --hard "$CIRCLE_SHA1" - git checkout -q -B "$CIRCLE_BRANCH" - git reset --hard "$CIRCLE_SHA1" + git fetch --force origin ${CIRCLE_BRANCH}/merge:merged/${CIRCLE_BRANCH} + git checkout "merged/$CIRCLE_BRANCH" binary_common: &binary_common parameters: diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index f2824e0a297..fe094ebcd1c 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -18,10 +18,8 @@ commands: name: Checkout merge branch command: | set -ex - git fetch --force origin ${CIRCLE_BRANCH}/merge:remotes/origin/${CIRCLE_BRANCH} - git reset --hard "$CIRCLE_SHA1" - git checkout -q -B "$CIRCLE_BRANCH" - git reset --hard "$CIRCLE_SHA1" + git fetch --force origin ${CIRCLE_BRANCH}/merge:merged/${CIRCLE_BRANCH} + git checkout "merged/$CIRCLE_BRANCH" binary_common: &binary_common parameters: