From 11dd63df5aca7bc434184477c8e0628853f33d05 Mon Sep 17 00:00:00 2001 From: Philipp Sommer Date: Wed, 16 Aug 2023 14:46:35 +0200 Subject: [PATCH 1/3] increase orb_version --- 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 f5830e3..4093f56 100644 --- a/src/commands/configure-conda.yml +++ b/src/commands/configure-conda.yml @@ -30,7 +30,7 @@ parameters: Version for the python deploy package to use. See https://anaconda.org/psyplot/psyplot-ci-orb type: string - default: "1.5.32" + default: "1.5.33" steps: - run: environment: diff --git a/src/commands/deploy-pkg.yml b/src/commands/deploy-pkg.yml index e443570..81fe31b 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.32" + default: "1.5.33" steps: - run: environment: From 790e5e58d99e79731941256c9b8fd2c15a80d4cd Mon Sep 17 00:00:00 2001 From: Philipp Sommer Date: Wed, 16 Aug 2023 15:03:01 +0200 Subject: [PATCH 2/3] add job filters --- .circleci/config.yml | 3 +++ .circleci/test-deploy.yml | 1 + 2 files changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3abb1f8..7923af9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,6 +38,7 @@ workflows: - shellcheck/check: filters: *filters - bats/run: + filters: *filters name: unit-tests path: ./src/tests exec_environment: << pipeline.parameters.unit-test-executor >> @@ -45,6 +46,7 @@ workflows: # 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. - mattermost-plugin-notify/approval-notification: + filters: *filters message: Hello @all! A workflow on https://app.circleci.com/pipelines/github/psyplot/psyplot-ci-orb is awaiting your approval. context: mattermost requires: @@ -54,6 +56,7 @@ workflows: - unit-tests - shellcheck/check - hold-for-dev-publish: + filters: *filters type: approval requires: - mattermost-plugin-notify/approval-notification diff --git a/.circleci/test-deploy.yml b/.circleci/test-deploy.yml index ca77237..1e2d25c 100644 --- a/.circleci/test-deploy.yml +++ b/.circleci/test-deploy.yml @@ -125,6 +125,7 @@ workflows: context: orb-publishing filters: *release-filters - deploy-python: + filters: *filters context: anaconda requires: - publish-orb From 0f1974b7216fa2484f88ccfb18ab504509ab3322 Mon Sep 17 00:00:00 2001 From: Philipp Sommer Date: Wed, 16 Aug 2023 15:34:44 +0200 Subject: [PATCH 3/3] minor fix for deploy --- .circleci/test-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/test-deploy.yml b/.circleci/test-deploy.yml index 1e2d25c..ff44d52 100644 --- a/.circleci/test-deploy.yml +++ b/.circleci/test-deploy.yml @@ -112,7 +112,7 @@ workflows: filters: *release-filters - orb-tools/publish: name: publish-orb - orb_name: / + orb_name: psyplot/psyplot-ci-orb vcs_type: << pipeline.project.type >> pub_type: production # Ensure this job requires all test jobs and the pack job.