new commit

dehe1011 · Jul 26, 2024 · 61a19b6 · 61a19b6
1 parent 6db492e
commit 61a19b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -19,12 +19,11 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -r configs/requirements.txt
+        pip install coverage pytest
 
     - name: Run tests with coverage
       run: |
-        python -m pip install coverage
         coverage run -m pytest
-        coverage xml
 
     - name: Upload coverage to Coveralls
       env:

diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml
@@ -48,8 +48,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-<<<<<<< HEAD
-        uses: actions/deploy-pages@v4
-=======
-        uses: actions/deploy-pages@v4
->>>>>>> 1353725c09ddfdec82ffd26d7c7c3c6ff81335e4
+