Skip to content

Commit

Permalink
Enforced LF line endings (#745)
Browse files Browse the repository at this point in the history
* Enforced LF line endings

* reverted name
  • Loading branch information
ross-p-smith authored Apr 23, 2024
1 parent d2cbb6d commit f964e72
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
3 changes: 2 additions & 1 deletion .flake8
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[flake8]
max-line-length = 88
extend-ignore = E203, E501
extend-ignore = E203, E501
exclude = .venv
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
* text=auto eol=lf
*.{cmd,[cC][mM][dD]} text eol=crlf
*.{bat,[bB][aA][tT]} text eol=crlf
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,24 @@ include $(AZURE_ENV_FILE)
help: ## 💬 This help message :)
@grep -E '[a-zA-Z_-]+:.*?## .*$$' $(firstword $(MAKEFILE_LIST)) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-23s\033[0m %s\n", $$1, $$2}'

ci: lint unittest functionaltest build-frontend unittest-frontend ## 🚀 Continuous Integration (called by Github Actions)
ci: lint unittest unittest-frontend functionaltest ## 🚀 Continuous Integration (called by Github Actions)

lint: ## 🧹 Lint the code
@echo -e "\e[34m$@\e[0m" || true
@poetry run flake8 code

build-frontend: ## 🏗️ Build the Frontend webapp
@echo -e "\e[34m$@\e[0m" || true
@cd code/frontend && npm install && npm run build

unittest: ## 🧪 Run the unit tests
@echo -e "\e[34m$@\e[0m" || true
@poetry run pytest -m "not azure and not functional" $(optional_args)

unittest-frontend: build-frontend ## 🧪 Unit test the Frontend webapp
@echo -e "\e[34m$@\e[0m" || true
@cd code/frontend && npm run test

functionaltest: ## 🧪 Run the functional tests
@echo -e "\e[34m$@\e[0m" || true
@ poetry run pytest -m "functional"
Expand All @@ -38,14 +46,6 @@ uitest: ## 🧪 Run the ui tests in headless mode
@echo -e "\e[34m$@\e[0m" || true
@cd tests/integration/ui && npm install && npx cypress run --env ADMIN_WEBSITE_NAME=$(ADMIN_WEBSITE_NAME),FRONTEND_WEBSITE_NAME=$(FRONTEND_WEBSITE_NAME)

build-frontend: ## 🏗️ Build the Frontend webapp
@echo -e "\e[34m$@\e[0m" || true
@cd code/frontend && npm install && npm run build

unittest-frontend: build-frontend ## 🏗️ Unit test the Frontend webapp
@echo -e "\e[34m$@\e[0m" || true
@cd code/frontend && npm run test

docker-compose-up: ## 🐳 Run the docker-compose file
@cd docker && AZD_ENV_FILE=$(AZURE_ENV_FILE) docker-compose up

Expand Down

0 comments on commit f964e72

Please sign in to comment.