Merge pull request #610 from jhdark/conda_fix

Fix conda workflow, new badges

.github/workflows/ci_conda.yml

@@ -0,0 +1,39 @@
+name: Conda CI
+on: [pull_request, push]
+
+jobs:
+  run-tests:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Set up Conda
+      uses: conda-incubator/setup-miniconda@v2
+      with:
+        activate-environment: myenv
+        miniforge-version: latest
+        use-mamba: true
+        channels: conda-forge
+
+    - name: Create Conda environment
+      shell: bash -l {0}
+      run: |
+        mamba install -c conda-forge fenics-dolfinx
+
+    - name: Install local package and dependencies
+      shell: bash -l {0}
+      run: |
+        pip install .[test]
+
+    - name: Run tests
+      shell: bash -l {0}
+      run: |
+        pytest test/ --cov festim --cov-report xml --cov-report term
+    
+    - name: Upload to codecov
+      uses: codecov/codecov-action@v3
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        files: ./coverage.xml

.github/workflows/ci_docker.yml

@@ -0,0 +1,24 @@
+name: Docker CI
+on: [pull_request, push]
+
+jobs:
+  run-tests:
+      runs-on: ubuntu-latest
+      container: dolfinx/dolfinx:stable
+      steps:
+        - name: Checkout code
+          uses: actions/checkout@v2
+
+        - name: Install local package and dependencies
+          run: |
+            pip install .[test]
+
+        - name: Run tests
+          run: |
+            python3 -m pytest test/ --cov festim --cov-report xml --cov-report term
+
+        - name: Upload to codecov
+          uses: codecov/codecov-action@v3
+          with:
+            token: ${{ secrets.CODECOV_TOKEN }}
+            files: ./coverage.xml

README.md

@@ -1,6 +1,6 @@
 # FESTIM
-
-[![CircleCI](https://dl.circleci.com/status-badge/img/gh/RemDelaporteMathurin/FESTIM/tree/main.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/RemDelaporteMathurin/FESTIM/tree/main)
+[![Conda CI](https://github.com/RemDelaporteMathurin/FESTIM/actions/workflows/ci_conda.yml/badge.svg?branch=fenicsx)](https://github.com/RemDelaporteMathurin/FESTIM/actions/workflows/ci_conda.yml)
+[![Docker CI](https://github.com/RemDelaporteMathurin/FESTIM/actions/workflows/ci_docker.yml/badge.svg?branch=fenicsx)](https://github.com/RemDelaporteMathurin/FESTIM/actions/workflows/ci_docker.yml)
 [![codecov](https://codecov.io/gh/RemDelaporteMathurin/FESTIM/branch/master/graph/badge.svg?token=AK3A9CV2D3)](https://codecov.io/gh/RemDelaporteMathurin/FESTIM)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg?style=flat-square)](https://github.com/psf/black)
 ![GitHub stars](https://img.shields.io/github/stars/RemDelaporteMathurin/FESTIM.svg?logo=github&label=Stars&logoColor=white)