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
14 changes: 14 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,8 @@ js_tests:
- yarn test

pinpoint-check:
needs:
- job: install
stage: test
cache:
- <<: *ruby_cache
Expand All @@ -328,6 +330,18 @@ pinpoint-check:
- *yarn_install
- make lint_country_dialing_codes

audit_packages:
Comment thread
zachmargolis marked this conversation as resolved.
needs:
- job: install
stage: test
cache:
- <<: *ruby_cache
- <<: *yarn_cache
script:
- *bundle_install
- *yarn_install
- make audit

prepare_deploy:
# Runs in parallel with tests so we can deploy more quickly after passing
stage: test
Expand Down
11 changes: 7 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ ARTIFACT_DESTINATION_FILE ?= ./tmp/idp.tar.gz

.PHONY: \
analytics_events \
audit \
brakeman \
build_artifact \
check \
Expand Down Expand Up @@ -74,11 +75,7 @@ endif
make lint_analytics_events_sorted
@echo "--- brakeman ---"
make brakeman
@echo "--- bundler-audit ---"
bundle exec bundler-audit check --update
# JavaScript
@echo "--- yarn audit ---"
yarn audit --groups dependencies; test $$? -le 7
@echo "--- eslint ---"
yarn run lint
@echo "--- typescript ---"
Expand All @@ -105,6 +102,12 @@ endif
@echo "--- lint migrations ---"
make lint_migrations

audit: ## Checks packages for vulnerabilities
@echo "--- bundler-audit ---"
bundle exec bundler-audit check --update
@echo "--- yarn audit ---"
yarn audit --groups dependencies; test $$? -le 7

lint_erb: ## Lints ERB files
bundle exec erblint app/views app/components

Expand Down