From bfd3e086616ca6d67de3ca72878ec4de6592ca44 Mon Sep 17 00:00:00 2001 From: Andrew Senetar Date: Wed, 26 Apr 2023 23:47:03 -0500 Subject: [PATCH] fix(ci): Update to latest actions, fix python versions - Update to latest actions - Change OS for older python 3.6, 3.5 to run --- .github/workflows/codeql-analysis.yml | 58 +++++++++---------- .github/workflows/default.yml | 80 ++++++++++++++------------- 2 files changed, 70 insertions(+), 68 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a8a4f5b..8cbcc5f 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,12 +13,12 @@ name: "CodeQL" on: push: - branches: [ master ] + branches: [master] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [master] schedule: - - cron: '25 5 * * 4' + - cron: "25 5 * * 4" jobs: analyze: @@ -32,40 +32,40 @@ jobs: strategy: fail-fast: false matrix: - language: [ 'python' ] + language: ["python"] # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] # Learn more: # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed steps: - - name: Checkout repository - uses: actions/checkout@v2 + - name: Checkout repository + uses: actions/checkout@v3 - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v1 + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v2 - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl - # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language + # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language - #- run: | - # make bootstrap - # make release + #- run: | + # make bootstrap + # make release - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 3731291..a65bb09 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -4,26 +4,26 @@ name: Default CI/CD on: push: - branches: [ master ] + branches: [master] pull_request: - branches: [ master ] + branches: [master] jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up Python 3.x - uses: actions/setup-python@v2 - with: - python-version: 3.x - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install flake8 - - name: Lint with flake8 - run: | - flake8 . + - uses: actions/checkout@v3 + - name: Set up Python 3.x + uses: actions/setup-python@v3 + with: + python-version: 3.x + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install flake8 + - name: Lint with flake8 + run: | + flake8 . test: needs: lint runs-on: ${{ matrix.os }} @@ -31,50 +31,52 @@ jobs: matrix: include: - os: ubuntu-latest - python-version: 3.10.0-alpha - 3.10.0 + python-version: 3.11 + - os: ubuntu-latest + python-version: "3.10" - os: ubuntu-latest python-version: 3.9 - os: ubuntu-latest python-version: 3.8 - os: ubuntu-latest python-version: 3.7 - - os: ubuntu-latest + - os: ubuntu-20.04 python-version: 3.6 - - os: ubuntu-latest + - os: ubuntu-20.04 python-version: 3.5 - os: ubuntu-latest python-version: 2.7 # - os: macos-latest - # python-version: 3.9 + # python-version: 3.11 # - os: macos-latest # python-version: 3.8 # - os: macos-latest # python-version: 2.7 - os: windows-latest - python-version: 3.9 + python-version: 3.11 - os: windows-latest python-version: 3.8 - os: windows-latest python-version: 2.7 steps: - - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install pytest - - name: Install windows dependencies - if: ${{ matrix.os == 'windows-latest' }} - run: | - pip install pywin32 - - name: Install macOS dependencies - if: ${{ matrix.os == 'macos-latest' }} - run: | - pip install pyobjc-framework-Cocoa - - name: Run tests - run: | - pytest + - uses: actions/checkout@v3 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v3 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install pytest + - name: Install windows dependencies + if: ${{ matrix.os == 'windows-latest' }} + run: | + pip install pywin32 + - name: Install macOS dependencies + if: ${{ matrix.os == 'macos-latest' }} + run: | + pip install pyobjc-framework-Cocoa + - name: Run tests + run: | + pytest