From f4222d92bd72d708925aeb28ba06c991c8186a01 Mon Sep 17 00:00:00 2001 From: "Philipp S. Sommer" Date: Thu, 6 Jan 2022 10:26:13 +0100 Subject: [PATCH 1/8] Fix sed pattern in conda environment setup (#36) * Fix sed pattern in conda environment setup to make sure we can use / in the branch name * set package version to 1.5.31 --- src/commands/configure-conda.yml | 2 +- src/commands/deploy-pkg.yml | 2 +- src/scripts/setup-conda-env.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/commands/configure-conda.yml b/src/commands/configure-conda.yml index bcffb93..c5fb44c 100644 --- a/src/commands/configure-conda.yml +++ b/src/commands/configure-conda.yml @@ -29,7 +29,7 @@ parameters: Version for the python deploy package to use. See https://anaconda.org/psyplot/psyplot-ci-orb type: string - default: "1.5.30" + default: "1.5.31" steps: - run: environment: diff --git a/src/commands/deploy-pkg.yml b/src/commands/deploy-pkg.yml index 6b8d561..5c503b9 100644 --- a/src/commands/deploy-pkg.yml +++ b/src/commands/deploy-pkg.yml @@ -40,7 +40,7 @@ parameters: Version for the python deploy package to use. See https://anaconda.org/psyplot/psyplot-ci-orb type: string - default: "1.5.30" + default: "1.5.31" steps: - run: environment: diff --git a/src/scripts/setup-conda-env.sh b/src/scripts/setup-conda-env.sh index 9336e28..647daa7 100644 --- a/src/scripts/setup-conda-env.sh +++ b/src/scripts/setup-conda-env.sh @@ -10,7 +10,7 @@ setup-conda-env() { if [[ "${CONDAENV_FILE}" != "" ]] && [[ -e "${CONDAENV_FILE}" ]]; then if [ "${CIRCLE_TAG}" == "" ] && [ "${CIRCLE_BRANCH}" != "" ]; then - sed -i "s/__CURRENTBRANCH__/${CIRCLE_BRANCH}/" "${CONDAENV_FILE}" + sed -i "s#__CURRENTBRANCH__#${CIRCLE_BRANCH}#" "${CONDAENV_FILE}" fi mamba env create -n "${CONDAENV_NAME}" -f "${CONDAENV_FILE}" From 9258f6cb1d3787152fbe5d2984c115c9e33769c3 Mon Sep 17 00:00:00 2001 From: "Philipp S. Sommer" Date: Thu, 6 Jan 2022 12:39:48 +0100 Subject: [PATCH 2/8] add install option for deploy-pkg job (#37) --- src/jobs/deploy-pkg.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/jobs/deploy-pkg.yml b/src/jobs/deploy-pkg.yml index f732ba2..bc5c36a 100755 --- a/src/jobs/deploy-pkg.yml +++ b/src/jobs/deploy-pkg.yml @@ -18,10 +18,18 @@ parameters: description: Build the package prior to deployment type: boolean default: false + install: + description: Install conda prior to deployment + type: boolean + default: false recipe_dir: description: Path to the recipe to build relative to the project directory type: string default: ci/conda-recipe + recipe_append: + description: The full content for recipe_append.yml + type: string + default: "" python_version: description: Python version type: string @@ -49,6 +57,14 @@ parameters: description: A workspace to attach. Attach none if empty. type: string default: "~" + channels: + description: Further default channels for conda + type: string + default: conda-forge + checkout: + description: Do a checkout + type: boolean + default: false run-job: description: "Whether to run the job or stop it." type: boolean @@ -61,9 +77,24 @@ steps: steps: - attach_workspace: at: << parameters.workspace >> + - when: + condition: << parameters.checkout >> + steps: + - checkout + - when: + condition: << parameters.install >> + steps: + - install: + condadir: <> + main_channel: "" + channels: <> + packages: conda-build anaconda-client conda-verify - when: condition: << parameters.build_pkg >> steps: + - configure-recipe: + recipe_dir: <> + recipe_append: <> - build-recipe: condadir: << parameters.condadir >> recipe_dir: << parameters.recipe_dir >> From 6e3e9edd0a2f9373e272dd9ef2e65e29a9620843 Mon Sep 17 00:00:00 2001 From: Philipp Sommer Date: Thu, 6 Jan 2022 13:01:24 +0100 Subject: [PATCH 3/8] [semver:patch] add install option for deploy-pkg job (#38) * Fix sed pattern in conda environment setup (#36) * Fix sed pattern in conda environment setup to make sure we can use / in the branch name * set package version to 1.5.31 * add install option for deploy-pkg job (#37) From ac8318f10970fdd9fc5a643566409a892ef6ea58 Mon Sep 17 00:00:00 2001 From: "Philipp S. Sommer" Date: Thu, 14 Apr 2022 16:50:19 +0200 Subject: [PATCH 4/8] remove deprecated machine image (#39) --- src/executors/default.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/executors/default.yml b/src/executors/default.yml index 5338d10..77de67b 100755 --- a/src/executors/default.yml +++ b/src/executors/default.yml @@ -1,3 +1,4 @@ description: > The default machine executor -machine: true +machine: + image: ubuntu-2004:202111-02 From ae657ac44fed46ebe043e1db6df2a78a1b4bb5a1 Mon Sep 17 00:00:00 2001 From: Philipp Sommer Date: Fri, 15 Apr 2022 07:00:08 +0200 Subject: [PATCH 5/8] increase version to 1.5.32 --- src/commands/configure-conda.yml | 2 +- src/commands/deploy-pkg.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/commands/configure-conda.yml b/src/commands/configure-conda.yml index c5fb44c..d49de22 100644 --- a/src/commands/configure-conda.yml +++ b/src/commands/configure-conda.yml @@ -29,7 +29,7 @@ parameters: Version for the python deploy package to use. See https://anaconda.org/psyplot/psyplot-ci-orb type: string - default: "1.5.31" + default: "1.5.32" steps: - run: environment: diff --git a/src/commands/deploy-pkg.yml b/src/commands/deploy-pkg.yml index 5c503b9..e443570 100644 --- a/src/commands/deploy-pkg.yml +++ b/src/commands/deploy-pkg.yml @@ -40,7 +40,7 @@ parameters: Version for the python deploy package to use. See https://anaconda.org/psyplot/psyplot-ci-orb type: string - default: "1.5.31" + default: "1.5.32" steps: - run: environment: From d2e8b9de74a25c47ea1ed02418e5284eace0d3a8 Mon Sep 17 00:00:00 2001 From: Philipp Sommer Date: Mon, 14 Aug 2023 10:05:53 +0200 Subject: [PATCH 6/8] use 1.5.32 for dev-orb --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 44214f2..baf704f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,7 +37,7 @@ parameters: This value is automatically adjusted by the "trigger-integration-tests-workflow" job to correspond with the specific version created by the commit and should not be edited. A "dev:alpha" version must exist for the initial pipeline run. type: string - default: "dev:alpha" + default: "1.5.32" jobs: # Define one or more jobs which will utilize your orb's commands and parameters to validate your changes. From e4db0dbfcf2d26adcb9494370aa11766ffd18699 Mon Sep 17 00:00:00 2001 From: Philipp Sommer Date: Mon, 14 Aug 2023 10:10:30 +0200 Subject: [PATCH 7/8] omit bats tests --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index baf704f..137aebd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,7 +37,7 @@ parameters: This value is automatically adjusted by the "trigger-integration-tests-workflow" job to correspond with the specific version created by the commit and should not be edited. A "dev:alpha" version must exist for the initial pipeline run. type: string - default: "1.5.32" + default: "dev:alpha" jobs: # Define one or more jobs which will utilize your orb's commands and parameters to validate your changes. @@ -91,10 +91,10 @@ workflows: dir: ./src/scripts exclude: SC2148,SC2001,SC2129 # optional: Run BATS tests against your scripts - - bats/run: - name: unit-tests - path: ./src/tests - exec_environment: << pipeline.parameters.unit-test-executor >> + # - bats/run: + # name: unit-tests + # path: ./src/tests + # exec_environment: << pipeline.parameters.unit-test-executor >> # If you accept building open source forks, protect your secrects behind a restricted context. # A job containing restricted context (which holds your orb publishing credentials) may only be accessed by a user with proper permissions. # An open source user may begin a pipeline with a PR, and once the pipeline is approved by an authorized user at this point, the pipeline will continue with the proper context permissions. From 078ce689e32eedc4d3c5cf007cbd918751c2c4b1 Mon Sep 17 00:00:00 2001 From: Philipp Sommer Date: Mon, 14 Aug 2023 10:12:06 +0200 Subject: [PATCH 8/8] minor --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 137aebd..701e0de 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,7 +37,7 @@ parameters: This value is automatically adjusted by the "trigger-integration-tests-workflow" job to correspond with the specific version created by the commit and should not be edited. A "dev:alpha" version must exist for the initial pipeline run. type: string - default: "dev:alpha" + default: "1.5.32" jobs: # Define one or more jobs which will utilize your orb's commands and parameters to validate your changes. @@ -104,7 +104,7 @@ workflows: requires: - orb-tools/lint - orb-tools/pack - - unit-tests + # - unit-tests - shellcheck/check - hold-for-dev-publish: type: approval