Merge branch 'main' into criemen/lua-tracer-ff-2

github · Jun 24, 2022 · 11b7154 · 11b7154
2 parents 0b24423 + 7c4d0e0
commit 11b7154
Show file tree

Hide file tree

Showing 4 changed files with 2,964 additions and 160 deletions.
diff --git a/.github/workflows/python-deps.yml b/.github/workflows/python-deps.yml
@@ -18,6 +18,11 @@ jobs:
           os: [ubuntu-latest, macos-latest]
           python_deps_type: [pipenv, poetry, requirements, setup_py]
           python_version: [2, 3]
+          exclude:
+            # Python2 and poetry are not supported. See https://github.com/actions/setup-python/issues/374
+            - python_version: 2
+              python_deps_type: poetry
+
 
     env:
       PYTHON_DEPS_TYPE: ${{ matrix.python_deps_type }}
@@ -115,6 +120,10 @@ jobs:
         matrix:
           python_deps_type: [pipenv, poetry, requirements, setup_py]
           python_version: [2, 3]
+          exclude:
+            # Python2 and poetry are not supported. See https://github.com/actions/setup-python/issues/374
+            - python_version: 2
+              python_deps_type: poetry
 
     env:
       PYTHON_DEPS_TYPE: ${{ matrix.python_deps_type }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## [UNRELEASED]
 
-No user facing changes.
+- The combination of python2 and poetry is no longer supported. See https://github.com/actions/setup-python/issues/374 for more details. [#1124](https://github.com/github/codeql-action/pull/1124)
 
 ## 2.1.14 - 22 Jun 2022