diff --git a/.circleci/config.yml b/.circleci/config.yml index 45aa1c0..8e3d688 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,8 +7,8 @@ orbs: orb-tools: circleci/orb-tools@11.6.1 circleci-cli: circleci/circleci-cli@0.1.9 dynamic: bjd2385/dynamic-continuation@dev:alpha - # dynamic: bjd2385/dynamic-continuation@3.6.8 - general: bjd2385/general@0.6.3 + # dynamic: bjd2385/dynamic-continuation@3.6.9 + general: bjd2385/general@0.7.1 slack: circleci/slack@4.12.5 diff --git a/.circleci/src.yml b/.circleci/src.yml index e8b5ca0..55e9fa4 100644 --- a/.circleci/src.yml +++ b/.circleci/src.yml @@ -4,7 +4,7 @@ version: 2.1 orbs: orb-tools: circleci/orb-tools@11.6.1 circleci-cli: circleci/circleci-cli@0.1.9 - general: bjd2385/general@0.6.1 + general: bjd2385/general@0.7.1 workflows: diff --git a/src/commands/filter.yml b/src/commands/filter.yml index 044ec02..7918f61 100644 --- a/src/commands/filter.yml +++ b/src/commands/filter.yml @@ -24,7 +24,7 @@ parameters: wildmatch-version: description: Wildmatch package version to install. For available versions, check PyPI - https://pypi.org/project/wildmatch/ type: string - default: 0.3.1 + default: 0.3.3 circle-token: description: Token to authenticate with CircleCI type: string diff --git a/src/jobs/continue.yml b/src/jobs/continue.yml index b498bc9..4540849 100644 --- a/src/jobs/continue.yml +++ b/src/jobs/continue.yml @@ -33,7 +33,7 @@ parameters: wildmatch-version: description: Wildmatch package version to install. For available versions, check PyPI - https://pypi.org/project/wildmatch/#description type: string - default: 0.3.1 + default: 0.3.3 circle-token: description: Token to authenticate with CircleCI type: string @@ -116,9 +116,18 @@ parameters: circleci-cli-version: description: Version of the CircleCI CLI to install. (Cf. https://github.com/CircleCI-Public/circleci-cli/releases.) type: string - default: v0.1.23845 + default: v0.1.26837 steps: - checkout + - run: + name: 'Pre: remove .python-version' + # checked-out .python-version files conflict with the executor version used by dynamic-continuation's dependencies. + # This move does _not_ effect whether or not a change to .python-version will enable a root workflow, since + # `git diff-tree` is checking changes between two commits, not unstaged changes. + command: | + if [ -f .python-version ]; then + rm .python-version + fi - when: condition: << parameters.pre-script >> steps: