lib/potassium/assets/.circleci/config.yml.erb in potassium-7.0.0 vs lib/potassium/assets/.circleci/config.yml.erb in potassium-7.1.0

- old
+ new

@@ -2,13 +2,11 @@ ruby-image: &ruby-image cimg/ruby:<%= ruby_version %> <%- if selected?(:database, :postgresql) -%> postgres-image: &postgres-image postgres:<%= Potassium::POSTGRES_VERSION %> <%- end -%> -<%- if selected?(:background_processor) -%> -redis-image: &redis-image redis -<%- end -%> +redis-image: &redis-image cimg/redis:6.2.12 env-vars: &env-vars BUNDLE_JOBS: 4 BUNDLE_PATH: vendor/bundle RAILS_ENV: test @@ -21,13 +19,11 @@ - image: *ruby-image environment: *env-vars <%- if selected?(:database, :postgresql) -%> - image: *postgres-image <%- end -%> - <%- if selected?(:background_processor) -%> - image: *redis-image - <%- end -%> lint-executor: docker: - image: *ruby-image environment: *env-vars @@ -92,15 +88,14 @@ steps: - setup - browser-tools/install-chrome - browser-tools/install-chromedriver - <%- if selected?(:background_processor) -%> - run: name: Wait for redis service command: dockerize -wait tcp://localhost:6379 -timeout 1m - <%- end -%> + <%- if selected?(:database, :postgresql) -%> - run: name: Wait for postgres service command: dockerize -wait tcp://localhost:5432 -timeout 1m @@ -120,11 +115,11 @@ name: Update repo analyzer gem command: bundle update --conservative repo_analyzer - run: name: POST extracted data to nest - command: bin/rake "repo_analyzer:analyze[platanus/<%= get(:app_name) %>]" + command: bin/rake "repo_analyzer:analyze[platanus/<%= get(:github_repo_name) || get(:dasherized_app_name) %>]" - run: name: Run simplecov shell: /bin/bash command: | @@ -135,23 +130,28 @@ command: | RSPEC_JUNIT_ARGS="-r rspec_junit_formatter -f RspecJunitFormatter -o test_results/rspec-system.xml" RSPEC_FORMAT_ARGS="--tag type:system -f progress --no-color -p 10" bundle exec rspec spec $RSPEC_FORMAT_ARGS $RSPEC_JUNIT_ARGS - - run: - name: Run vitest - command: | - yarn run test > coverage/input_vitest.txt - ./node_modules/.bin/format-coverage coverage/input_vitest.txt coverage/output_vitest.txt /home/circleci/project/app/frontend - cat coverage/output_vitest.txt | ./bin/reviewdog -reporter=github-pr-review -efm="%f:%l:%c: %m" + - run: + name: Run vitest + command: | + yarn run test - store_test_results: path: test_results lint: executor: lint-executor steps: - setup + + - run: + name: Run brakeman + shell: /bin/bash + command: | + bundle exec brakeman --quiet --format tabs --no-exit-on-warn --no-exit-on-error --output "tmp/brakeman_report"; \ + ./bin/reviewdog < "tmp/brakeman_report" -reporter=github-pr-review -f=brakeman -name="Brakeman" - run: name: Get files to lint command: git diff origin/master --name-only --diff-filter=d > tmp/files_to_lint