From ab8f2d33005eb966a53e1aacfbc51cb551b0526e Mon Sep 17 00:00:00 2001 From: shayaharon Date: Tue, 17 Jan 2023 17:53:53 +0200 Subject: [PATCH 1/4] config updated --- .circleci/config.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 29e24b34e8..0b4d124f53 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -75,6 +75,8 @@ commands: jobs: build: + environment: + CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<> parameters: py_version: type: string @@ -87,6 +89,7 @@ jobs: steps: - deci-common/checkout_and_skip_build: check_version_file: true + skip_md_files: true - deci-common/get_persisted_version_info - when: condition: @@ -291,6 +294,8 @@ jobs: release_candidate: + environment: + CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<> parameters: py_version: type: string @@ -299,6 +304,8 @@ jobs: steps: - deci-common/checkout_and_skip_build: check_version_file: true + skip_md_files: true + - deci-common/get_persisted_version_info - run: name: edit package version @@ -318,6 +325,8 @@ jobs: version: $NEW_VERSION release_version: + environment: + CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<> parameters: py_version: type: string @@ -329,6 +338,7 @@ jobs: steps: - deci-common/checkout_and_skip_build: check_version_file: true + skip_md_files: true - run: name: add requirements.txt and requirements.pro.txt to source code command: | From 20029e39d90921df4cf540c777e8cfd50b741b61 Mon Sep 17 00:00:00 2001 From: shayaharon Date: Wed, 18 Jan 2023 14:49:50 +0200 Subject: [PATCH 2/4] bump up the orb --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0b4d124f53..8993a38b54 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ parameters: orb_version: type: string description: Deci ai ORB version https://circleci.com/developer/orbs/orb/deci-ai/circleci-common-orb - default: "10.3.1" + default: "10.5.0" # default: "dev:alpha" orbs: From c51c23b631274b1e4c249fac361083a17b91baa1 Mon Sep 17 00:00:00 2001 From: shayaharon Date: Wed, 18 Jan 2023 15:24:13 +0200 Subject: [PATCH 3/4] duplicates in config.ci fix --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8993a38b54..b65dcd13e4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,6 +17,9 @@ orbs: docker: circleci/docker@2.2.0 slack: circleci/slack@4.12.0 # see https://circleci.com/developer/orbs/orb/circleci/slack for examples and more +environment: &environment + CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<> + # This filter operates on SemVer2 tags only release_tag_filter: &release_tag_filter filters: @@ -75,8 +78,7 @@ commands: jobs: build: - environment: - CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<> + <<: *environment parameters: py_version: type: string @@ -294,8 +296,7 @@ jobs: release_candidate: - environment: - CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<> + <<: *environment parameters: py_version: type: string @@ -325,8 +326,7 @@ jobs: version: $NEW_VERSION release_version: - environment: - CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<> + <<: *environment parameters: py_version: type: string From a39b01aeb63b05b3998f592449ee22be45326be2 Mon Sep 17 00:00:00 2001 From: shayaharon Date: Wed, 18 Jan 2023 18:10:16 +0200 Subject: [PATCH 4/4] reverted back to working conf --- .circleci/config.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b65dcd13e4..b9541347e5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,9 +17,6 @@ orbs: docker: circleci/docker@2.2.0 slack: circleci/slack@4.12.0 # see https://circleci.com/developer/orbs/orb/circleci/slack for examples and more -environment: &environment - CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<> - # This filter operates on SemVer2 tags only release_tag_filter: &release_tag_filter filters: @@ -78,7 +75,8 @@ commands: jobs: build: - <<: *environment + environment: + CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<> parameters: py_version: type: string @@ -156,7 +154,7 @@ jobs: - store_artifacts: path: ~/sg_logs - + change_rc_to_b: description: "change rc in the tag to b" docker: @@ -166,14 +164,14 @@ jobs: - run: name: change the rc to b command: - | + | BETA_TAG=$(echo ${CIRCLE_TAG} | sed -e 's|rc|b|'); echo ${BETA_TAG} >> ~/BETA_TAG cat ~/BETA_TAG - persist_to_workspace: root: ~/ paths: - "BETA_TAG" - + @@ -221,7 +219,7 @@ jobs: if [[ $(RC_TAG=$(git tag --contains ${CIRCLE_SHA1} | grep -E '[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+rc[[:digit:]]+' | head -n 1)) ]] ; then echo "Found RC version: ${RC_TAG}" echo $RC_TAG >> ~/RC_TAG - else + else echo "No Rc Tag found for commit" circleci-agent step halt fi @@ -265,22 +263,22 @@ jobs: - run: command: | if [ -z $RC_TAG ] ; then - circleci-agent step halt - else + circleci-agent step halt + else echo $RC_TAG fi - adding_tag_to_ecr_container_image: image_repo: << parameters.image_repo >> source_image_tag: $RC_TAG new_image_tag: ${CIRCLE_TAG} - + testing_supergradients_docker_image: description: "running integration test on the code" parameters: image_repo: type: string #reserved for testing when will be done - #machine: true + #machine: true #resource_class: deci-ai/research-standard docker: - image: cimg/base:stable-20.04 @@ -296,7 +294,8 @@ jobs: release_candidate: - <<: *environment + environment: + CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<> parameters: py_version: type: string @@ -326,7 +325,8 @@ jobs: version: $NEW_VERSION release_version: - <<: *environment + environment: + CIRCLE_COMPARE_URL: << pipeline.project.git_url >>/compare/<< pipeline.git.base_revision >>..<> parameters: py_version: type: string