Merge pull request #49 from gayverjr/codeql

Add Codeql and test python 3.10
gayverjr · Apr 10, 2023 · 6802cc5 · 6802cc5
2 parents 0c38eb8 + 1faee62
commit 6802cc5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 26 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -29,10 +29,10 @@ jobs:
       - name: Install Packages
         run: |
           sudo apt-get update
-          sudo apt-get install --yes gcc-8 g++-8 libhdf5-dev libeigen3-dev python3.8-dev python3.8-venv
+          sudo apt-get install --yes gcc-11 g++-11 libhdf5-dev libeigen3-dev python3.10-dev python3.10-venv
 
       - name: Configure
-        run: mkdir /opt/src/opencap/build; cd /opt/src/opencap/build; CC=gcc-8 CXX=g++-8 cmake ../
+        run: mkdir -p $GITHUB_WORKSPACE/opencap/build; cd $GITHUB_WORKSPACE/opencap/; CC=gcc-11 CXX=g++-11 cmake -B./build
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
@@ -41,7 +41,7 @@ jobs:
           queries: +security-and-quality
 
       - name: Build cpp
-        run: cd /opt/src/opencap/build; make -j2
+        run: cd $GITHUB_WORKSPACE/opencap/build; make -j2
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2

diff --git a/.github/workflows/intel-mac.yml b/.github/workflows/intel-mac.yml
@@ -10,7 +10,7 @@ jobs:
         shell: bash -l {0}
     strategy:
       matrix:
-        python-version: [3.7,3.8,3.9]
+        python-version: [3.7,3.8,3.9,python3.10]
 
 
 
@@ -23,7 +23,7 @@ jobs:
         with:
             auto-activate-base: true
             activate-environment: true
-            python-version: ${{ matrix.python-version }}
+            python-version: ${{ if eq(matrix.python-version, 'python3.10') }}3.10{{ else }}${{ matrix.python-version }}{{ endif }}
 
 
       - name: Install system dependencies

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -10,7 +10,7 @@ jobs:
         shell: bash -l {0}
     strategy:
       matrix:
-        python-version: [3.8,3.9]
+        python-version: [3.8,3.9,python3.10]
 
 
 
@@ -23,7 +23,7 @@ jobs:
         with:
             auto-activate-base: true
             activate-environment: true
-            python-version: ${{ matrix.python-version }}
+            python-version: ${{ if eq(matrix.python-version, 'python3.10') }}3.10{{ else }}${{ matrix.python-version }}{{ endif }}
 
 
       - name: Install system dependencies

diff --git a/.lgtm.yml b/.lgtm.yml
diff --git a/README.md b/README.md
@@ -5,15 +5,15 @@
 # OpenCAP: An open-source program for studying resonances in molecules.                                                               
 | **Documentation** | [![][docs-img]][docs-url] [![][rtd-img]][rtd-url] |
 | :------ | :------- |
-| **Build Status**  | [![][gh-actions-img]][gh-actions-url] [![][cov-img]][cov-url] [![][lgtm-img]][lgtm-url] |
+| **Build Status**  | [![][gh-actions-img]][gh-actions-url] [![][cov-img]][cov-url] [![][codeql-img]][codeql-url] |
 | **Releases** | [![][pypi-img]][pypi-url] [![][ghrel-img]][ghrel-url] |
 
 [docs-img]: https://img.shields.io/badge/doc-latest-blue.svg
 [docs-url]: https://gayverjr.github.io/opencap/
 [gh-actions-img]: https://github.com/gayverjr/opencap/workflows/ubuntu/badge.svg
 [gh-actions-url]: https://github.com/gayverjr/opencap/actions
-[lgtm-img]: https://img.shields.io/lgtm/grade/cpp/g/gayverjr/opencap.svg?logo=lgtm&logoWidth=18
-[lgtm-url]: https://lgtm.com/projects/g/gayverjr/opencap/context:cpp
+[codeql-img]: https://github.com/gayverjr/opencap/actions/workflows/codeql.yml/badge.svg
+[codeql-url]: https://github.com/gayverjr/opencap/actions
 [rtd-img]: https://readthedocs.org/projects/gayverjropencap/badge/?version=latest
 [rtd-url]: https://gayverjropencap.readthedocs.io/en/latest/?badge=latest
 [cov-img]: https://codecov.io/gh/gayverjr/opencap/branch/main/graph/badge.svg?token=V9quaajaZ1