mirror of
				https://github.com/inventree/InvenTree.git
				synced 2025-11-04 07:05:41 +00:00 
			
		
		
		
	Replace mklint with djlint (#4746)
* remove markuplint * remove dedicated html step - will be done by pre-commit * add djlint for django template linting * Fix T003: Endblock should have name * Fix H013: Img tag should have an alt attribute * Fix H014: Found extra blank lines * Fix T003: Endblock should have name * Fix H013: Img tag should have an alt attribute * small fixes * Fix T001: Variables should be wrapped in a single whitespace * Fix T003: Endblock should have name * small fixes * fix form method * add entry to contributing * fix template changes * another fix * use current version
This commit is contained in:
		
							
								
								
									
										22
									
								
								.github/workflows/qc_checks.yaml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										22
									
								
								.github/workflows/qc_checks.yaml
									
									
									
									
										vendored
									
									
								
							@@ -76,22 +76,6 @@ jobs:
 | 
			
		||||
          python InvenTree/manage.py prerender
 | 
			
		||||
          npx eslint InvenTree/InvenTree/static_i18n/i18n/*.js
 | 
			
		||||
 | 
			
		||||
  html:
 | 
			
		||||
    name: Style [HTML]
 | 
			
		||||
    runs-on: ubuntu-20.04
 | 
			
		||||
 | 
			
		||||
    needs: pep_style
 | 
			
		||||
 | 
			
		||||
    steps:
 | 
			
		||||
      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin@v3.1.0
 | 
			
		||||
      - name: Enviroment Setup
 | 
			
		||||
        uses: ./.github/actions/setup
 | 
			
		||||
        with:
 | 
			
		||||
          npm: true
 | 
			
		||||
          install: true
 | 
			
		||||
      - name: Check HTML Files
 | 
			
		||||
        run: npx markuplint **/templates/*.html
 | 
			
		||||
 | 
			
		||||
  pre-commit:
 | 
			
		||||
    name: Style [pre-commit]
 | 
			
		||||
    runs-on: ubuntu-20.04
 | 
			
		||||
@@ -194,7 +178,7 @@ jobs:
 | 
			
		||||
    name: Tests - DB [SQLite] + Coverage
 | 
			
		||||
    runs-on: ubuntu-20.04
 | 
			
		||||
 | 
			
		||||
    needs: [ 'javascript', 'html', 'pre-commit' ]
 | 
			
		||||
    needs: [ 'javascript', 'pre-commit' ]
 | 
			
		||||
    continue-on-error: true # continue if a step fails so that coverage gets pushed
 | 
			
		||||
 | 
			
		||||
    env:
 | 
			
		||||
@@ -227,7 +211,7 @@ jobs:
 | 
			
		||||
  postgres:
 | 
			
		||||
    name: Tests - DB [PostgreSQL]
 | 
			
		||||
    runs-on: ubuntu-20.04
 | 
			
		||||
    needs: [ 'javascript', 'html', 'pre-commit' ]
 | 
			
		||||
    needs: [ 'javascript', 'pre-commit' ]
 | 
			
		||||
 | 
			
		||||
    env:
 | 
			
		||||
      INVENTREE_DB_ENGINE: django.db.backends.postgresql
 | 
			
		||||
@@ -271,7 +255,7 @@ jobs:
 | 
			
		||||
    name: Tests - DB [MySQL]
 | 
			
		||||
    runs-on: ubuntu-20.04
 | 
			
		||||
 | 
			
		||||
    needs: [ 'javascript', 'html', 'pre-commit' ]
 | 
			
		||||
    needs: [ 'javascript', 'pre-commit' ]
 | 
			
		||||
    if: github.event_name == 'push'
 | 
			
		||||
 | 
			
		||||
    env:
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user