Skip to content

Commit

Permalink
Merge pull request #627 from DH-IT-Portal-Development/acceptation
Browse files Browse the repository at this point in the history
Merge acc into master for deployment
  • Loading branch information
EdoStorm96 authored Mar 20, 2024
2 parents 9c71bf6 + 36bae26 commit ac8743a
Show file tree
Hide file tree
Showing 401 changed files with 14,110 additions and 12,989 deletions.
5 changes: 5 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Black reformat
135eb9119066aedf946aaf3d22cbb839d59fc038

# DJLint reformat
664077453c8fe393cdd8db692a33d515e5db6f69
24 changes: 0 additions & 24 deletions .github/workflows/check-missing-migrations.yml

This file was deleted.

55 changes: 55 additions & 0 deletions .github/workflows/pr-checks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: PR checks

on:
pull_request:
jobs:
check-migrations:
name: Check if there are any missing migrations
runs-on: ubuntu-latest
steps:
- name: Install OS dependencies
run: |
sudo apt-get update
sudo apt-get install libldap2-dev libsasl2-dev libssl-dev gettext poppler-utils poppler-data libpoppler-cpp-dev
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.9
- name: Install Dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Check for missing migrations
run: |
python manage.py makemigrations --check --dry-run
check-djlint:
name: Check if DJLint thinks everything is correctly formatted
runs-on: ubuntu-latest
steps:
- name: Install OS dependencies
run: |
sudo apt-get update
sudo apt-get install libldap2-dev libsasl2-dev libssl-dev gettext poppler-utils poppler-data libpoppler-cpp-dev
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.9
- name: Install Dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Run DJLint
# This exclude flag is needed because Github downloads dependencies there, which causes djlint to judge those
run: |
djlint . --check --exclude src
black-check: # Rhymes with blackjack :D
name: Check if Black thinks everything is correctly formatted
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: psf/black@stable
with:
src: .

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*.pyc
__pycache__/
.env*

*.mo

### Project-specific ###
media/
Expand Down
Loading

0 comments on commit ac8743a

Please sign in to comment.