From 809002b1e039c095301c4bf724aff132967db77d Mon Sep 17 00:00:00 2001 From: Ankita Katiyar Date: Wed, 26 Jul 2023 09:59:52 +0100 Subject: [PATCH 01/12] port tests to GA Signed-off-by: Ankita Katiyar --- .circleci/continue_config.yml | 63 --------------------------- .github/workflows/e2e-tests.yml | 46 +++++++++++++++++++ .github/workflows/kedro-docs-only.yml | 24 ++++++++++ .github/workflows/kedro-tests.yml | 44 +++++++++++++++++++ .github/workflows/lint-tests.yml | 32 ++++++++++++++ .github/workflows/unit-tests.yml | 53 ++++++++++++++++++++++ Makefile | 8 +++- features/environment.py | 2 +- trufflehog-ignore.txt | 2 + 9 files changed, 209 insertions(+), 65 deletions(-) create mode 100644 .github/workflows/e2e-tests.yml create mode 100644 .github/workflows/kedro-docs-only.yml create mode 100644 .github/workflows/kedro-tests.yml create mode 100644 .github/workflows/lint-tests.yml create mode 100644 .github/workflows/unit-tests.yml diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index c83d6615cb..ca664f07f4 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -519,69 +519,6 @@ jobs: workflows: version: 2.1 - lint_only: - when: - and: - - <> - - not: <> - - not: <> - - not: <> - - not: <> - jobs: - - lint: - matrix: - parameters: - python_version: ["3.7", "3.8", "3.9", "3.10"] - - all_circleci_checks_succeeded: - requires: - - lint - - build_code: - when: - and: - - <> - - not: <> - - not: <> - - not: <> - jobs: - - e2e_tests: - matrix: - parameters: - python_version: ["3.7", "3.8", "3.9", "3.10"] - - win_e2e_tests: - matrix: - parameters: - python_version: ["3.7", "3.8", "3.9", "3.10"] - - unit_tests: - matrix: - parameters: - python_version: ["3.7", "3.8", "3.9", "3.10"] - - win_unit_tests: - matrix: - parameters: - python_version: ["3.7", "3.8", "3.9", "3.10"] - - lint: - matrix: - parameters: - python_version: ["3.7", "3.8", "3.9", "3.10"] - - pip_compile: - matrix: - parameters: - python_version: ["3.7", "3.8", "3.9", "3.10"] - - win_pip_compile: - matrix: - parameters: - python_version: ["3.7", "3.8", "3.9", "3.10"] - - all_circleci_checks_succeeded: - requires: - - e2e_tests - - win_e2e_tests - - unit_tests - - win_unit_tests - - lint - - pip_compile - - win_pip_compile - main_updated: when: and: diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml new file mode 100644 index 0000000000..6c317c7c40 --- /dev/null +++ b/.github/workflows/e2e-tests.yml @@ -0,0 +1,46 @@ +name: Run e2e-tests on Kedro + +on: + workflow_call: + inputs: + os: + type: string + python-version: + type: string + +env: + COLUMNS: 120 + LINES: 25 + +jobs: + e2e-tests: + runs-on: ${{ inputs.os }} + steps: + - name: Checkout code + uses: actions/checkout@v3 + - name: Set up Python ${{inputs.python-version}} + uses: actions/setup-python@v3 + with: + python-version: ${{inputs.python-version}} + - run: make install-pip-setuptools + - name: Cache python packages for Linux + if: inputs.os == 'ubuntu-latest' + uses: actions/cache@v3 + with: + path: ~/.cache/pip + key: ${{inputs.os}}-python-${{inputs.python-version}} + - name: Cache python packages for Windows + if: inputs.os == 'windows-latest' + uses: actions/cache@v3 + with: + path: ~\AppData\Local\pip\Cache + key: ${{inputs.os}}-python-${{inputs.python-version}} + - name: Install dependencies + run: | + pip --version + make install-test-requirements + make install-pre-commit + - name: pip freeze + run: pip freeze + - name: Run e2e tests + run: make e2e-tests diff --git a/.github/workflows/kedro-docs-only.yml b/.github/workflows/kedro-docs-only.yml new file mode 100644 index 0000000000..dd608462e2 --- /dev/null +++ b/.github/workflows/kedro-docs-only.yml @@ -0,0 +1,24 @@ +name: Run checks on Kedro Docs + +on: + push: + branches: + - main + paths: + - "docs/**" + pull_request: + branches: + - main + paths: + - "docs/**" + +jobs: + lint-tests: + strategy: + matrix: + os: [ ubuntu-latest ] + python-version: [ "3.7", "3.8", "3.9", "3.10" ] + uses: ./.github/workflows/lint-tests.yml + with: + os: ${{ matrix.os }} + python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/kedro-tests.yml b/.github/workflows/kedro-tests.yml new file mode 100644 index 0000000000..ad1482950d --- /dev/null +++ b/.github/workflows/kedro-tests.yml @@ -0,0 +1,44 @@ +name: Run checks on Kedro + +on: + push: + branches: + - main + paths-ignore: + - "docs/**" + pull_request: + branches: + - main + paths-ignore: + - "docs/**" + +jobs: + unit-tests: + strategy: + matrix: + os: [ ubuntu-latest, windows-latest ] + python-version: [ "3.7", "3.8", "3.9", "3.10" ] + uses: ./.github/workflows/unit-tests.yml + with: + os: ${{ matrix.os }} + python-version: ${{ matrix.python-version }} + + lint-tests: + strategy: + matrix: + os: [ ubuntu-latest ] + python-version: [ "3.8" ] + uses: ./.github/workflows/lint-tests.yml + with: + os: ${{ matrix.os }} + python-version: ${{ matrix.python-version }} + + e2e-tests: + strategy: + matrix: + os: [ ubuntu-latest, windows-latest ] + python-version: [ "3.7", "3.8", "3.9", "3.10" ] + uses: ./.github/workflows/e2e-tests.yml + with: + os: ${{ matrix.os }} + python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/lint-tests.yml b/.github/workflows/lint-tests.yml new file mode 100644 index 0000000000..9246ba9898 --- /dev/null +++ b/.github/workflows/lint-tests.yml @@ -0,0 +1,32 @@ +name: Run linters on Kedro + +on: + workflow_call: + inputs: + os: + type: string + python-version: + type: string + +jobs: + lint: + runs-on: ${{ inputs.os }} + steps: + - name: Checkout code + uses: actions/checkout@v3 + - name: Set up Python 3.8 + uses: actions/setup-python@v3 + with: + python-version: ${{ inputs.python-version }} + - name: Cache python packages + uses: actions/cache@v3 + with: + path: ~/.cache/pip + key: ${{inputs.os}}-python-${{inputs.python-version}} + - name: Install dependencies + run: | + make install-test-requirements + make install-pre-commit + pip freeze + - name: Run linter + run: make lint diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml new file mode 100644 index 0000000000..87ca8e0eed --- /dev/null +++ b/.github/workflows/unit-tests.yml @@ -0,0 +1,53 @@ +name: Run unit-tests on Kedro + +on: + workflow_call: + inputs: + os: + type: string + python-version: + type: string +jobs: + unit-tests: + runs-on: ${{ inputs.os }} + steps: + - name: Checkout code + uses: actions/checkout@v3 + - name: Set up Python ${{inputs.python-version}} + uses: actions/setup-python@v3 + with: + python-version: ${{inputs.python-version}} + - run: make install-pip-setuptools + - name: Cache python packages for Linux + if: inputs.os == 'ubuntu-latest' + uses: actions/cache@v3 + with: + path: ~/.cache/pip + key: ${{inputs.os}}-python-${{inputs.python-version}} + - name: Cache python packages for Windows + if: inputs.os == 'windows-latest' + uses: actions/cache@v3 + with: + path: ~\AppData\Local\pip\Cache + key: ${{inputs.os}}-python-${{inputs.python-version}} + - name: Install dependencies + run: | + make install-test-requirements + make install-pre-commit + - name: Install pytables (only for windows) + if: inputs.os == 'windows-latest' + run: pip install tables + - name: pip freeze + run: pip freeze + - name: Run unit tests + if: inputs.os == 'ubuntu-latest' && inputs.python-version == '3.10' + run: make test-sequential + - name: Run unit tests + if: inputs.os == 'ubuntu-latest' && inputs.python-version != '3.10' + run: make test + - name: Run unit tests (Windows) + if: inputs.os == 'windows-latest' && inputs.python-version == '3.10' + run: make test-no-spark-sequential + - name: Run unit tests (Windows) + if: inputs.os == 'windows-latest' && inputs.python-version != '3.10' + run: make test-no-spark diff --git a/Makefile b/Makefile index 5a1e85b558..bea1c7af02 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ clean: pre-commit clean || true install-pip-setuptools: - pip install -U "pip>=21.2" "setuptools>=65.5.1" wheel + python -m pip install -U "pip>=21.2, <23.2" "setuptools>=65.5.1" wheel lint: pre-commit run -a --hook-stage manual $(hook) @@ -19,6 +19,12 @@ test: test-no-spark: pytest --no-cov --ignore tests/extras/datasets/spark --numprocesses 4 --dist loadfile +test-sequential: + pytest tests --cov-config pyproject.toml + +test-no-spark-sequential: + pytest tests --no-cov --ignore tests/extras/datasets/spark + test-no-datasets: pytest --no-cov --ignore tests/extras/datasets/ --numprocesses 4 --dist loadfile diff --git a/features/environment.py b/features/environment.py index 218ff097e4..7892b6ba75 100644 --- a/features/environment.py +++ b/features/environment.py @@ -103,7 +103,7 @@ def _setup_minimal_env(context): "pip", "install", "-U", - "pip>=21.2", + "pip>=21.2, <23.2", "setuptools>=65.5.1", "wheel", ], diff --git a/trufflehog-ignore.txt b/trufflehog-ignore.txt index 14719c544e..cb5551a327 100644 --- a/trufflehog-ignore.txt +++ b/trufflehog-ignore.txt @@ -9,3 +9,5 @@ static/img/kedro_gitflow.svg .coverage.* .*\.log .*\.iml +tests/extras/datasets/tensorflow/test_tensorflow_model_dataset.py +docs/source/meta/images/kedro_gitflow.svg From 5f6c8fb0e8ab9a6e11f848b3118ae79f531452d2 Mon Sep 17 00:00:00 2001 From: Ankita Katiyar Date: Wed, 26 Jul 2023 11:01:44 +0100 Subject: [PATCH 02/12] Revert changes to CircleCI config Signed-off-by: Ankita Katiyar --- .circleci/continue_config.yml | 46 +++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index ca664f07f4..ad8747d396 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -519,6 +519,52 @@ jobs: workflows: version: 2.1 + build_code: + when: + and: + - <> + - not: <> + - not: <> + - not: <> + jobs: + - e2e_tests: + matrix: + parameters: + python_version: ["3.7", "3.8", "3.9", "3.10"] + - win_e2e_tests: + matrix: + parameters: + python_version: ["3.7", "3.8", "3.9", "3.10"] + - unit_tests: + matrix: + parameters: + python_version: ["3.7", "3.8", "3.9", "3.10"] + - win_unit_tests: + matrix: + parameters: + python_version: ["3.7", "3.8", "3.9", "3.10"] + - lint: + matrix: + parameters: + python_version: ["3.7", "3.8", "3.9", "3.10"] + - pip_compile: + matrix: + parameters: + python_version: ["3.7", "3.8", "3.9", "3.10"] + - win_pip_compile: + matrix: + parameters: + python_version: ["3.7", "3.8", "3.9", "3.10"] + - all_circleci_checks_succeeded: + requires: + - e2e_tests + - win_e2e_tests + - unit_tests + - win_unit_tests + - lint + - pip_compile + - win_pip_compile + main_updated: when: and: From 06b74c2eb33ac1aa71d30db672f16caf70234a30 Mon Sep 17 00:00:00 2001 From: Ankita Katiyar Date: Wed, 26 Jul 2023 11:20:53 +0100 Subject: [PATCH 03/12] Revert changes to CircleCI config Signed-off-by: Ankita Katiyar --- .circleci/continue_config.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index ad8747d396..c83d6615cb 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -519,6 +519,23 @@ jobs: workflows: version: 2.1 + lint_only: + when: + and: + - <> + - not: <> + - not: <> + - not: <> + - not: <> + jobs: + - lint: + matrix: + parameters: + python_version: ["3.7", "3.8", "3.9", "3.10"] + - all_circleci_checks_succeeded: + requires: + - lint + build_code: when: and: From 2dcb4bcec0ef2c0e5794f6ffa9b7fe5f0847df38 Mon Sep 17 00:00:00 2001 From: Ankita Katiyar Date: Wed, 26 Jul 2023 12:22:26 +0100 Subject: [PATCH 04/12] Suggestions from code review Signed-off-by: Ankita Katiyar --- .github/workflows/{kedro-tests.yml => all-checks.yml} | 4 ++-- .../workflows/{kedro-docs-only.yml => docs-only-checks.yml} | 4 ++-- .github/workflows/{lint-tests.yml => lint.yml} | 0 features/environment.py | 4 +++- pyproject.toml | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) rename .github/workflows/{kedro-tests.yml => all-checks.yml} (91%) rename .github/workflows/{kedro-docs-only.yml => docs-only-checks.yml} (82%) rename .github/workflows/{lint-tests.yml => lint.yml} (100%) diff --git a/.github/workflows/kedro-tests.yml b/.github/workflows/all-checks.yml similarity index 91% rename from .github/workflows/kedro-tests.yml rename to .github/workflows/all-checks.yml index ad1482950d..fdd6ecb453 100644 --- a/.github/workflows/kedro-tests.yml +++ b/.github/workflows/all-checks.yml @@ -27,8 +27,8 @@ jobs: strategy: matrix: os: [ ubuntu-latest ] - python-version: [ "3.8" ] - uses: ./.github/workflows/lint-tests.yml + python-version: [ "3.10" ] + uses: ./.github/workflows/lint.yml with: os: ${{ matrix.os }} python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/kedro-docs-only.yml b/.github/workflows/docs-only-checks.yml similarity index 82% rename from .github/workflows/kedro-docs-only.yml rename to .github/workflows/docs-only-checks.yml index dd608462e2..aa53fdd604 100644 --- a/.github/workflows/kedro-docs-only.yml +++ b/.github/workflows/docs-only-checks.yml @@ -1,4 +1,4 @@ -name: Run checks on Kedro Docs +name: Run linter on Kedro Docs on: push: @@ -18,7 +18,7 @@ jobs: matrix: os: [ ubuntu-latest ] python-version: [ "3.7", "3.8", "3.9", "3.10" ] - uses: ./.github/workflows/lint-tests.yml + uses: ./.github/workflows/lint.yml with: os: ${{ matrix.os }} python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/lint-tests.yml b/.github/workflows/lint.yml similarity index 100% rename from .github/workflows/lint-tests.yml rename to .github/workflows/lint.yml diff --git a/features/environment.py b/features/environment.py index 7892b6ba75..671bee0178 100644 --- a/features/environment.py +++ b/features/environment.py @@ -103,7 +103,9 @@ def _setup_minimal_env(context): "pip", "install", "-U", - "pip>=21.2, <23.2", + # pip==23.2 breaks pip-tools<7.0, and pip-tools>=7.0 does not support Python 3.7 + "pip>=21.2,<23.2; python_version < '3.8'", + "pip>=21.2; python_version >= '3.8'", "setuptools>=65.5.1", "wheel", ], diff --git a/pyproject.toml b/pyproject.toml index ae5fc96167..50bf4a8483 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ dependencies = [ "more_itertools~=9.0", "omegaconf~=2.3", "parse~=1.19.0", - "pip-tools~=6.5", + "pip-tools>=6.5,<8", "pluggy~=1.0", "PyYAML>=4.2, <7.0", "rich>=12.0, <14.0", From ad8b10376a186d159d8a9e83fe3bf2d39e9c3038 Mon Sep 17 00:00:00 2001 From: Ankita Katiyar Date: Wed, 26 Jul 2023 12:24:59 +0100 Subject: [PATCH 05/12] Suggestions from code review Signed-off-by: Ankita Katiyar --- .github/workflows/all-checks.yml | 4 ++-- .github/workflows/lint.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/all-checks.yml b/.github/workflows/all-checks.yml index fdd6ecb453..9f7abf3163 100644 --- a/.github/workflows/all-checks.yml +++ b/.github/workflows/all-checks.yml @@ -1,4 +1,4 @@ -name: Run checks on Kedro +name: Run all checks on Kedro on: push: @@ -23,7 +23,7 @@ jobs: os: ${{ matrix.os }} python-version: ${{ matrix.python-version }} - lint-tests: + lint: strategy: matrix: os: [ ubuntu-latest ] diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9246ba9898..81712415fd 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,7 +14,7 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v3 - - name: Set up Python 3.8 + - name: Set up Python ${{ inputs.python-version }} uses: actions/setup-python@v3 with: python-version: ${{ inputs.python-version }} From 28751129b30bd608bb9645515a2a398e9c8d52af Mon Sep 17 00:00:00 2001 From: Nok Lam Chan Date: Wed, 26 Jul 2023 15:20:21 +0100 Subject: [PATCH 06/12] Create merge-gatekeeper.yml --- .github/workflows/merge-gatekeeper.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/merge-gatekeeper.yml diff --git a/.github/workflows/merge-gatekeeper.yml b/.github/workflows/merge-gatekeeper.yml new file mode 100644 index 0000000000..ef6078841d --- /dev/null +++ b/.github/workflows/merge-gatekeeper.yml @@ -0,0 +1,26 @@ +name: Merge Gatekeeper + +on: + pull_request: + branches: + - main + - develop + +jobs: + merge-gatekeeper: + runs-on: ubuntu-latest + # Restrict permissions of the GITHUB_TOKEN. + # Docs: https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs + permissions: + checks: read + statuses: read + steps: + - name: Run Merge Gatekeeper + # NOTE: v1 is updated to reflect the latest v1.x.y. Please use any tag/branch that suits your needs: + # https://github.com/upsidr/merge-gatekeeper/tags + # https://github.com/upsidr/merge-gatekeeper/branches + uses: upsidr/merge-gatekeeper@v1 + with: + token: ${{ secrets.GITHUB_TOKEN }} + timeout: 1800 + interval: 30 From 368174edba6f752771acf4ad187f4ca0d847c29b Mon Sep 17 00:00:00 2001 From: Ankita Katiyar Date: Wed, 26 Jul 2023 15:20:33 +0100 Subject: [PATCH 07/12] Update release notes Signed-off-by: Ankita Katiyar --- RELEASE.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE.md b/RELEASE.md index 0c0c40fd5c..2fa06b789f 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -16,6 +16,7 @@ ## Bug fixes and other changes * Consolidated dependencies and optional dependencies in `pyproject.toml`. +* Pin `pip<23.2` for CI due to a breaking change. See https://github.com/kedro-org/kedro/pull/2813 ## Documentation changes From 2f330ad057e9229e985a031f6d92176cf335d147 Mon Sep 17 00:00:00 2001 From: Nok Lam Chan Date: Wed, 26 Jul 2023 16:05:36 +0100 Subject: [PATCH 08/12] Update merge-gatekeeper.yml --- .github/workflows/merge-gatekeeper.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/merge-gatekeeper.yml b/.github/workflows/merge-gatekeeper.yml index ef6078841d..17ff2a62d7 100644 --- a/.github/workflows/merge-gatekeeper.yml +++ b/.github/workflows/merge-gatekeeper.yml @@ -24,3 +24,4 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} timeout: 1800 interval: 30 + ignored: win_e2e_tests-3.7,win_pip_compile-3.9,win_e2e_tests-3.9,win_pip_compile-3.8,lint-3.7,win_pip_compile-3.7,pip_compile-3.7,e2e_tests-3.7,win_unit_tests-3.7,win_unit_tests-3.9,e2e_tests-3.8,win_unit_tests-3.10,win_pip_compile-3.10,win_unit_tests-3.8,e2e_tests-3.9,unit_tests-3.10,unit_tests-3.8,e2e_tests-3.10,lint-3.8,unit_tests-3.9,unit_tests-3.7,win_e2e_tests-3.10,pip_compile-3.8,pip_compile-3.10,win_e2e_tests-3.8,lint-3.9,pip_compile-3.9,lint-3.10,all_circleci_checks_succeeded From 6bd521942d26d4b3dba30a79f6ce09e3de1b5800 Mon Sep 17 00:00:00 2001 From: Nok Lam Chan Date: Wed, 26 Jul 2023 17:11:37 +0100 Subject: [PATCH 09/12] Update merge-gatekeeper.yml --- .github/workflows/merge-gatekeeper.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-gatekeeper.yml b/.github/workflows/merge-gatekeeper.yml index 17ff2a62d7..d179074f7c 100644 --- a/.github/workflows/merge-gatekeeper.yml +++ b/.github/workflows/merge-gatekeeper.yml @@ -24,4 +24,4 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} timeout: 1800 interval: 30 - ignored: win_e2e_tests-3.7,win_pip_compile-3.9,win_e2e_tests-3.9,win_pip_compile-3.8,lint-3.7,win_pip_compile-3.7,pip_compile-3.7,e2e_tests-3.7,win_unit_tests-3.7,win_unit_tests-3.9,e2e_tests-3.8,win_unit_tests-3.10,win_pip_compile-3.10,win_unit_tests-3.8,e2e_tests-3.9,unit_tests-3.10,unit_tests-3.8,e2e_tests-3.10,lint-3.8,unit_tests-3.9,unit_tests-3.7,win_e2e_tests-3.10,pip_compile-3.8,pip_compile-3.10,win_e2e_tests-3.8,lint-3.9,pip_compile-3.9,lint-3.10,all_circleci_checks_succeeded + ignored: 'win_e2e_tests-3.7,ci/circleci: win_pip_compile-3.9,ci/circleci: win_e2e_tests-3.9,ci/circleci: win_pip_compile-3.8,ci/circleci: lint-3.7,ci/circleci: win_pip_compile-3.7,ci/circleci: pip_compile-3.7,ci/circleci: e2e_tests-3.7,ci/circleci: win_unit_tests-3.7,ci/circleci: win_unit_tests-3.9,ci/circleci: e2e_tests-3.8,ci/circleci: win_unit_tests-3.10,ci/circleci: all_circleci_checks_succeeded' From dabe869d7a7c83b417f652a870010b3acf79481b Mon Sep 17 00:00:00 2001 From: Nok Lam Chan Date: Wed, 26 Jul 2023 17:18:01 +0100 Subject: [PATCH 10/12] Update merge-gatekeeper.yml --- .github/workflows/merge-gatekeeper.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-gatekeeper.yml b/.github/workflows/merge-gatekeeper.yml index d179074f7c..42bdfa4240 100644 --- a/.github/workflows/merge-gatekeeper.yml +++ b/.github/workflows/merge-gatekeeper.yml @@ -24,4 +24,4 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} timeout: 1800 interval: 30 - ignored: 'win_e2e_tests-3.7,ci/circleci: win_pip_compile-3.9,ci/circleci: win_e2e_tests-3.9,ci/circleci: win_pip_compile-3.8,ci/circleci: lint-3.7,ci/circleci: win_pip_compile-3.7,ci/circleci: pip_compile-3.7,ci/circleci: e2e_tests-3.7,ci/circleci: win_unit_tests-3.7,ci/circleci: win_unit_tests-3.9,ci/circleci: e2e_tests-3.8,ci/circleci: win_unit_tests-3.10,ci/circleci: all_circleci_checks_succeeded' + ignored: 'ci/circle: win_e2e_tests-3.7,ci/circle: win_pip_compile-3.9,ci/circle: win_e2e_tests-3.9,ci/circle: win_pip_compile-3.8,ci/circle: lint-3.7,ci/circle: win_pip_compile-3.7,ci/circle: pip_compile-3.7,ci/circle: e2e_tests-3.7,ci/circle: win_unit_tests-3.7,ci/circle: win_unit_tests-3.9,ci/circle: e2e_tests-3.8,ci/circle: win_unit_tests-3.10,ci/circle: win_pip_compile-3.10,ci/circle: win_unit_tests-3.8,ci/circle: e2e_tests-3.9,ci/circle: unit_tests-3.10,ci/circle: unit_tests-3.8,ci/circle: e2e_tests-3.10,ci/circle: lint-3.8,ci/circle: unit_tests-3.9,ci/circle: unit_tests-3.7,ci/circle: win_e2e_tests-3.10,ci/circle: pip_compile-3.8,ci/circle: pip_compile-3.10,ci/circle: win_e2e_tests-3.8,ci/circle: lint-3.9,ci/circle: pip_compile-3.9,ci/circle: lint-3.10,ci/circle: all_circleci_checks_succeeded' From 58eff03597582fdf85514492fb6ceb3ff153b9fa Mon Sep 17 00:00:00 2001 From: Nok Lam Chan Date: Wed, 26 Jul 2023 17:21:58 +0100 Subject: [PATCH 11/12] Update merge-gatekeeper.yml --- .github/workflows/merge-gatekeeper.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-gatekeeper.yml b/.github/workflows/merge-gatekeeper.yml index 42bdfa4240..0fd8e5c79c 100644 --- a/.github/workflows/merge-gatekeeper.yml +++ b/.github/workflows/merge-gatekeeper.yml @@ -24,4 +24,4 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} timeout: 1800 interval: 30 - ignored: 'ci/circle: win_e2e_tests-3.7,ci/circle: win_pip_compile-3.9,ci/circle: win_e2e_tests-3.9,ci/circle: win_pip_compile-3.8,ci/circle: lint-3.7,ci/circle: win_pip_compile-3.7,ci/circle: pip_compile-3.7,ci/circle: e2e_tests-3.7,ci/circle: win_unit_tests-3.7,ci/circle: win_unit_tests-3.9,ci/circle: e2e_tests-3.8,ci/circle: win_unit_tests-3.10,ci/circle: win_pip_compile-3.10,ci/circle: win_unit_tests-3.8,ci/circle: e2e_tests-3.9,ci/circle: unit_tests-3.10,ci/circle: unit_tests-3.8,ci/circle: e2e_tests-3.10,ci/circle: lint-3.8,ci/circle: unit_tests-3.9,ci/circle: unit_tests-3.7,ci/circle: win_e2e_tests-3.10,ci/circle: pip_compile-3.8,ci/circle: pip_compile-3.10,ci/circle: win_e2e_tests-3.8,ci/circle: lint-3.9,ci/circle: pip_compile-3.9,ci/circle: lint-3.10,ci/circle: all_circleci_checks_succeeded' + ignored: 'ci/circle: win_e2e_tests-3.7,ci/circle: win_pip_compile-3.9,ci/circle: win_e2e_tests-3.9,ci/circle: win_pip_compile-3.8,ci/circle: lint-3.7,ci/circle: win_pip_compile-3.7,ci/circle: pip_compile-3.7,ci/circle: e2e_tests-3.7,ci/circle: win_unit_tests-3.7,ci/circle: win_unit_tests-3.9,ci/circle: e2e_tests-3.8,ci/circle: win_unit_tests-3.10,ci/circle: win_pip_compile-3.10,ci/circle: win_unit_tests-3.8,ci/circle: e2e_tests-3.9,ci/circle: unit_tests-3.10,ci/circle: unit_tests-3.8,ci/circle: e2e_tests-3.10,ci/circle: lint-3.8,ci/circle: unit_tests-3.9,ci/circle: unit_tests-3.7,ci/circle: win_e2e_tests-3.10,ci/circle: pip_compile-3.8,ci/circle: pip_compile-3.10,ci/circle: win_e2e_tests-3.8,ci/circle: lint-3.9,ci/circle: pip_compile-3.9,ci/circle: lint-3.10,build_code,ci/circleci: check-updated-files,regular' From b3a91890df4d391e34724687c9c2b3b6dcf33502 Mon Sep 17 00:00:00 2001 From: Nok Lam Chan Date: Wed, 26 Jul 2023 17:25:52 +0100 Subject: [PATCH 12/12] Update merge-gatekeeper.yml --- .github/workflows/merge-gatekeeper.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-gatekeeper.yml b/.github/workflows/merge-gatekeeper.yml index 0fd8e5c79c..4f5393a1e6 100644 --- a/.github/workflows/merge-gatekeeper.yml +++ b/.github/workflows/merge-gatekeeper.yml @@ -24,4 +24,4 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} timeout: 1800 interval: 30 - ignored: 'ci/circle: win_e2e_tests-3.7,ci/circle: win_pip_compile-3.9,ci/circle: win_e2e_tests-3.9,ci/circle: win_pip_compile-3.8,ci/circle: lint-3.7,ci/circle: win_pip_compile-3.7,ci/circle: pip_compile-3.7,ci/circle: e2e_tests-3.7,ci/circle: win_unit_tests-3.7,ci/circle: win_unit_tests-3.9,ci/circle: e2e_tests-3.8,ci/circle: win_unit_tests-3.10,ci/circle: win_pip_compile-3.10,ci/circle: win_unit_tests-3.8,ci/circle: e2e_tests-3.9,ci/circle: unit_tests-3.10,ci/circle: unit_tests-3.8,ci/circle: e2e_tests-3.10,ci/circle: lint-3.8,ci/circle: unit_tests-3.9,ci/circle: unit_tests-3.7,ci/circle: win_e2e_tests-3.10,ci/circle: pip_compile-3.8,ci/circle: pip_compile-3.10,ci/circle: win_e2e_tests-3.8,ci/circle: lint-3.9,ci/circle: pip_compile-3.9,ci/circle: lint-3.10,build_code,ci/circleci: check-updated-files,regular' + ignored: 'ci/circleci: win_e2e_tests-3.7,ci/circleci: win_pip_compile-3.9,ci/circleci: win_e2e_tests-3.9,ci/circleci: win_pip_compile-3.8,ci/circleci: lint-3.7,ci/circleci: win_pip_compile-3.7,ci/circleci: pip_compile-3.7,ci/circleci: e2e_tests-3.7,ci/circleci: win_unit_tests-3.7,ci/circleci: win_unit_tests-3.9,ci/circleci: e2e_tests-3.8,ci/circleci: win_unit_tests-3.10,ci/circleci: win_pip_compile-3.10,ci/circleci: win_unit_tests-3.8,ci/circleci: e2e_tests-3.9,ci/circleci: unit_tests-3.10,ci/circleci: unit_tests-3.8,ci/circleci: e2e_tests-3.10,ci/circleci: lint-3.8,ci/circleci: unit_tests-3.9,ci/circleci: unit_tests-3.7,ci/circleci: win_e2e_tests-3.10,ci/circleci: pip_compile-3.8,ci/circleci: pip_compile-3.10,ci/circleci: win_e2e_tests-3.8,ci/circleci: lint-3.9,ci/circleci: pip_compile-3.9,ci/circleci: lint-3.10,build_code,ci/circlecici: check-updated-files,regular'