diff --git a/.allowed-licenses b/.allowed-licenses index 995a54f..1093263 100644 --- a/.allowed-licenses +++ b/.allowed-licenses @@ -10,6 +10,10 @@ Apache Software License, BSD License BSD BSD License +# Variants of the ISC License +ISCL +ISC License (ISCL) + # Variants of the LGPL GNU Library or Lesser General Public License (LGPL) LGPL diff --git a/.circleci/config.yml b/.circleci/config.yml index d493b31..f8f20eb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,8 +31,8 @@ jobs: command: | if [ -z "<< pipeline.git.base_revision >>" ]; then echo "No previous build, run license check by default." - elif git diff-tree --no-commit-id --name-only -r << pipeline.git.revision >> << pipeline.git.base_revision >> | grep py<< parameters.python-version >>-requirements.txt ; then - echo "Changes in py<< parameters.python-version >>-requirements.txt, run license check." + elif git diff-tree --no-commit-id --name-only -r << pipeline.git.revision >> << pipeline.git.base_revision >> | grep ".allowed-licenses\|py<< parameters.python-version >>-requirements.txt" ; then + echo "Changes in .allowed-licenses or py<< parameters.python-version >>-requirements.txt, run license check." else echo "No relevant changes found, skip running license check." circleci-agent step halt @@ -56,6 +56,10 @@ workflows: all-tests: jobs: - test: - <<: *version-matrix + matrix: + parameters: + python-version: ["3.5", "3.6", "3.7", "3.8", "3.9"] - license-scan: - <<: *version-matrix + matrix: + parameters: + python-version: [ "3.6", "3.7", "3.8", "3.9" ]