Skip to content

Commit

Permalink
merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Sascha Dobbelaere committed Nov 27, 2023
2 parents b6b059e + a144d38 commit 760db92
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 7 deletions.
25 changes: 21 additions & 4 deletions .github/workflows/codecov.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,21 @@
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
name: Run Tests

on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-latest
name: Test OneSilaHeadless
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v2
with:
python-version: '3.11'
- name: Install requirements
run: pip install -r requirements.txt
- name: Run tests and collect coverage
run: cd OneSila && coverage run --source='.' manage.py test
- name: Upload coverage reports to Codecov with GitHub Action
uses: codecov/codecov-action@v3
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
5 changes: 2 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ django-dirtyfields
django-cors-headers

# Using fork to ensure we have better authentication error support
git+ssh://git@github.com/sdobbelaere/strawberry-graphql-django.git@not_authenticated_bug

git+ssh://git@github.com/TweaveTech/django_get_absolute_url.git@v0.2
strawberry-graphql-django @ git+https://github.com/sdobbelaere/strawberry-graphql-django.git@not_authenticated_bug
django_get_absolute_url @ git+https://git@github.com/TweaveTech/django_get_absolute_url.git@v0.2


# Starlette is used for it CORSMiddleware as referenced
Expand Down

0 comments on commit 760db92

Please sign in to comment.