Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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