From 448d33dcb6ec07dc41198962bff9c07b9c552310 Mon Sep 17 00:00:00 2001 From: Andrew Senetar Date: Mon, 21 Mar 2022 22:18:22 -0500 Subject: [PATCH] Add workflow yml validation settings - Add yml validation to project for vscode - Allow .vscode/settings.json - Apply formatting to workflow files --- .github/workflows/codeql-analysis.yml | 54 +++++++-------- .github/workflows/default.yml | 96 +++++++++++++-------------- .gitignore | 2 +- .vscode/settings.json | 12 ++++ 4 files changed, 88 insertions(+), 76 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 92775f89..b7fb044a 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -2,12 +2,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: '24 20 * * 2' + - cron: "24 20 * * 2" jobs: analyze: @@ -21,30 +21,30 @@ jobs: strategy: fail-fast: false matrix: - language: [ 'cpp', 'python' ] + language: ["cpp", "python"] steps: - - name: Checkout repository - uses: actions/checkout@v2 + - name: Checkout repository + uses: actions/checkout@v2 - # 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 - - if: matrix.language == 'cpp' - name: Build Cpp - run: | - sudo apt-get update - sudo apt-get install python3-pyqt5 - make modules - - if: matrix.language == 'python' - name: Autobuild - uses: github/codeql-action/autobuild@v1 - # Analysis - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + # 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 + - if: matrix.language == 'cpp' + name: Build Cpp + run: | + sudo apt-get update + sudo apt-get install python3-pyqt5 + make modules + - if: matrix.language == 'python' + name: Autobuild + uses: github/codeql-action/autobuild@v1 + # Analysis + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v1 diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 9c1bca1b..413060a7 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -4,48 +4,48 @@ 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.10 - uses: actions/setup-python@v2 - with: - python-version: '3.10' - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install -r requirements.txt -r requirements-extra.txt - - name: Lint with flake8 - run: | - flake8 . + - uses: actions/checkout@v2 + - name: Set up Python 3.10 + uses: actions/setup-python@v2 + with: + python-version: "3.10" + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt -r requirements-extra.txt + - name: Lint with flake8 + run: | + flake8 . format: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up Python 3.10 - uses: actions/setup-python@v2 - with: - python-version: '3.10' - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install -r requirements.txt -r requirements-extra.txt - - name: Check format with black - run: | - black . + - uses: actions/checkout@v2 + - name: Set up Python 3.10 + uses: actions/setup-python@v2 + with: + python-version: "3.10" + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt -r requirements-extra.txt + - name: Check format with black + run: | + black . test: needs: [lint, format] runs-on: ${{ matrix.os }} strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: [3.7, 3.8, 3.9, '3.10'] + python-version: [3.7, 3.8, 3.9, "3.10"] exclude: - os: macos-latest python-version: 3.7 @@ -61,24 +61,24 @@ jobs: python-version: 3.9 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 -r requirements.txt -r requirements-extra.txt - - name: Build python modules - run: | - python build.py --modules - - name: Run tests - run: | - pytest core hscommon - - name: Upload Artifacts - if: matrix.os == 'ubuntu-latest' - uses: actions/upload-artifact@v3 - with: - name: modules ${{ matrix.python-version }} - path: ${{ github.workspace }}/**/*.so + - 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 -r requirements.txt -r requirements-extra.txt + - name: Build python modules + run: | + python build.py --modules + - name: Run tests + run: | + pytest core hscommon + - name: Upload Artifacts + if: matrix.os == 'ubuntu-latest' + uses: actions/upload-artifact@v3 + with: + name: modules ${{ matrix.python-version }} + path: ${{ github.workspace }}/**/*.so diff --git a/.gitignore b/.gitignore index 94173a08..17672ef5 100644 --- a/.gitignore +++ b/.gitignore @@ -86,7 +86,7 @@ cython_debug/ # Visual Studio Code .vscode/* -#!.vscode/settings.json +!.vscode/settings.json #!.vscode/tasks.json #!.vscode/launch.json #!.vscode/extensions.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..8bcde0b9 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,12 @@ +{ + "python.formatting.provider": "black", + "cSpell.words": [ + "Dupras", + "hscommon" + ], + "python.languageServer": "Pylance", + "yaml.schemaStore.enable": true, + "yaml.schemas": { + "https://json.schemastore.org/github-workflow.json": ".github/workflows/*.yml" + } +} \ No newline at end of file