diff --git a/.circleci/config.yml b/.circleci/config.yml index b4b3878..c7b30ce 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -36,14 +36,33 @@ workflows: context: silta_dev codebase-build: - silta/npm-install-build + filters: + branches: + only: + - main + + - approval: + type: approval + name: "Deployment approval" + filters: + branches: + ignore: + - production + - main + - /dependabot\/.*/ + + - silta/frontend-build-deploy: + <<: *build-deploy + requires: + - "Deployment approval" filters: branches: ignore: - production + - main - /dependabot\/.*/ - silta/frontend-build-deploy: - # Extend the build-deploy configuration for the production environment. <<: *build-deploy name: Silta build & deploy production context: silta_finland diff --git a/README.md b/README.md index 1ff9495..8937502 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ nvm use $($Get-Content .nvmrc) ### On Windows -- Linting probably wont work directly with command `npm run lint` do it via lint-staged with command `npx lint-staged`. - Dont worry per-commit hooks will work fine. +- Linting probably won't work directly with command `npm run lint` do it via lint-staged with command `npx lint-staged`. + Don't worry per-commit hooks will work fine. - In your code editor use LF all the time, otherwise there will be prettier errors when linting. - If having LF in your editor is not enough, try this command "git config --global core.autocrlf false".More info here https://stackoverflow.com/questions/25724969/sourcetree-line-ending-issue