From 9d558631a0c3390be4cf932f88a97fa72f9dfdde Mon Sep 17 00:00:00 2001
From: Mauricio Villegas <5780272+mauvilsa@users.noreply.github.com>
Date: Fri, 20 Dec 2024 07:38:39 +0100
Subject: [PATCH] Some improvements and fixes in the workflows (#649)

---
 .github/workflows/codeql.yaml | 9 ++-------
 .github/workflows/tests.yaml  | 5 ++---
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
index 9b32542f..b63dd490 100644
--- a/.github/workflows/codeql.yaml
+++ b/.github/workflows/codeql.yaml
@@ -17,11 +17,6 @@ jobs:
       contents: read
       security-events: write
 
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [python]
-
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -29,7 +24,7 @@ jobs:
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3
         with:
-          languages: ${{ matrix.language }}
+          languages: python
           queries: +security-and-quality
           config-file: ./.github/codeql-config.yaml
 
@@ -39,4 +34,4 @@ jobs:
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v3
         with:
-          category: "/language:${{ matrix.language }}"
+          category: "/language:python"
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index d01e2d4e..c08e3f48 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -24,7 +24,6 @@ jobs:
       - name: without optional dependencies
         run: |
           pip install .[coverage]
-          pip uninstall -y argcomplete
           pytest --cov --cov-report=term --cov-report=xml --junit-xml=junit.xml
           mv coverage.xml coverage_py${{ matrix.python }}_bare.xml
           mv junit.xml junit_py${{ matrix.python }}_bare.xml
@@ -76,7 +75,7 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
           cache: pip
-      - run: pip install tox
+      - run: pip install --disable-pip-version-check tox
       - run: tox -e py-all-extras
 
   omegaconf:
@@ -246,7 +245,7 @@ jobs:
   pypi-publish:
     if: startsWith(github.ref, 'refs/tags/v')
     runs-on: ubuntu-latest
-    needs: [linux, windows, macos, omegaconf, pydantic-v1, installed-package, doctest]
+    needs: [linux, windows, macos, omegaconf, pydantic-v1, installed-package, doctest, mypy]
     environment:
       name: pypi
       url: https://pypi.org/p/jsonargparse