From fd0896e18d11597d878ffe4d0e54f38105ec1f2d Mon Sep 17 00:00:00 2001 From: Aidan Cornelius-Bell Date: Wed, 1 Jan 2025 07:26:40 +1030 Subject: [PATCH] Even more CI tweaks --- .github/workflows/ci.yml | 16 ++++++++++++---- .rubocop.yml | 13 +++++++++---- config/credentials/test.yml.enc | 2 +- config/database.yml | 7 +++---- config/environments/test.rb | 4 ---- 5 files changed, 25 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1d6393f..4cc23ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,11 +59,19 @@ jobs: - name: Setup test database and run tests env: RAILS_ENV: test - DATABASE_URL: mysql2://root@127.0.0.1:3306/arelpe_test MYSQL_ALLOW_EMPTY_PASSWORD: true - ENCRYPTION_PRIMARY_KEY: ${{ secrets.ENCRYPTION_PRIMARY_KEY || 'test_primary_key_1234567890' }} - ENCRYPTION_DETERMINISTIC_KEY: ${{ secrets.ENCRYPTION_DETERMINISTIC_KEY || 'test_deterministic_key_1234567890' }} - ENCRYPTION_KEY_DERIVATION_SALT: ${{ secrets.ENCRYPTION_KEY_DERIVATION_SALT || 'test_derivation_salt_1234567890' }} + RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }} + ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY: ${{ secrets.ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY || 'x'*32 }} + ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY: ${{ secrets.ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY || 'y'*32 }} + ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT: ${{ secrets.ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT || 'z'*32 }} + # Add your .env variables here with GitHub secrets or default values + ADMIN_EMAIL: ${{ secrets.ADMIN_EMAIL || 'test@example.com' }} + BUTTONDOWN_API_KEY: ${{ secrets.BUTTONDOWN_API_KEY || 'test_key' }} + STRIPE_SECRET_KEY: ${{ secrets.STRIPE_SECRET_KEY || 'sk_test_dummy' }} + STRIPE_PUBLISHABLE_KEY: ${{ secrets.STRIPE_PUBLISHABLE_KEY || 'pk_test_dummy' }} + STRIPE_WEBHOOK_SECRET: ${{ secrets.STRIPE_WEBHOOK_SECRET || 'whsec_dummy' }} + HCAPTCHA_SITE_KEY: ${{ secrets.HCAPTCHA_SITE_KEY || '10000000-ffff-ffff-ffff-000000000001' }} + HCAPTCHA_SECRET_KEY: ${{ secrets.HCAPTCHA_SECRET_KEY || '0x0000000000000000000000000000000000000000' }} run: | bin/rails db:test:prepare bin/rails test test:system diff --git a/.rubocop.yml b/.rubocop.yml index f25c8c2..3bf8c56 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -11,19 +11,24 @@ AllCops: NewCops: enable TargetRubyVersion: 3.2 -# Disable checks for trailing empty lines +Layout/SpaceInsideArrayLiteralBrackets: + Enabled: false + +Layout/TrailingWhitespace: + Enabled: false + +Style/StringLiterals: + Enabled: false + Layout/TrailingEmptyLines: Enabled: false -# Disable checks for comment spacing Layout/LeadingCommentSpace: Enabled: false -# Allow both tabs and spaces Layout/IndentationStyle: Enabled: false -# You might want to disable more rules that you don't care about Style/Documentation: Enabled: false diff --git a/config/credentials/test.yml.enc b/config/credentials/test.yml.enc index b64fd13..eb49e3d 100644 --- a/config/credentials/test.yml.enc +++ b/config/credentials/test.yml.enc @@ -1 +1 @@ -Nf8qnLmxZNpwpE2SpsKIvVPcc5Xgefgejov6iuF5+2AGUxNPu8ZirAaQddphdxoxC2PEkETv1tcFWANDMX5o6Pc3YjEDU8rSbRkuCVuuYS6AkYgDN9Iw12ix6g5t6+e/dkuQHiqdkHGN/vvofCZ0sRPbHujDb3ImaWx4Bs72og2kVFJkIfMZK5PEB2ihmwwVfzAiEFV8+hh1ZVLzxMSFMDvm/oKV8H6vE5EC70ZW9IzHPjHo9PPw3iDHvPKLviN3m5IB9y4MaCgUo7eATxa9W09ZHoRuh8cMCgRXyO3uf6zvErImEpAda0tPTaM9PJoXmTM/rmGYBWjt/cH4baNWBNBoNFmXrJTqEir+uwUMFrEPhoQLFD6qjbVAOdMfQNFOExnJ1Cbqad3JJLhcwXmj6czwhcxah8jPZdlDei2ywXaQjCTM/dAUC1twBEQWniOygQKdbHN17OZmrps9v09xPY1cjHYwdcy/7pe1H9AXxW14Ob9StIiRnEh5eqQyQ+8tg2ZioY+jPPzufFnbhEZ6IrArVgpFDYTU1kNINRNJXAztNuU=--+lV4znQQFC0LuJsa--6BoUpOAGHCy5MQC98vXCFA== \ No newline at end of file +7/2/jeoetLv/a/g2FzgWyI46mBeJk+5BjIjNOEFkTDEjCC508UzoNnIpFLZVWIvPMoXrwkRLV5a71f/Cc/vmdBhrB/8UnzBD5t83Z9yHh5r5w/q7OHDrtwGfGWgznQhnoPuxvT3RlP7YN1mI3fYZ2K1P+jZndDAynaVIGYrTidS8SfL4sIcqU7Wje5rPMwjJEsmhRlGSXGlm+4JeEbo2HWPqhxwjTlECwR5lA2SAjw5X9mVCHnWQug2yCVyC3U34ePonb7cxumNiUv+J1alAelOCC/Fi13hEbBg7pgBh8vTx17kojf8lT2m9v1q/1fvJ3KzN5S7Af4btOfk80BtRKVtQj98eNLS5UcIghP3en7hCk7kAV9J+0yhsKnMNysrzfTlzzfVBGFEzyptKN6wuHNIiM1huI7FKRxEnJOA4NkBhEuojk2UqL1h4IoB8xSJCnO+qnxzl3VMLzvBPwWaI+GjyJjWLtUEUNoTZlRvUHoxf5FrwA2nxEsg1Ltjix1VZ7/qNUT0FsADM+IlSIW7AoDfply+Lx8/OGtX6+mM9/WRwGaTXtQPWLGamp41SlLJRwKL4xPaVkVLuC6qqAxUcs9jwmK/8HuICwiMOoMuUCs3qTdOK9DbQy8GHLuraAu842/HJ7aoDxnPc+nKPrBqV9vW1tFOioUBhkZBXVoATYrXm/E3Mrupytja4UUOeok6PTw==--OZLAPnTgr9v7ohTb--GjdpseEfbaVZrLbbGW11Og== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml index bc06414..94287d2 100644 --- a/config/database.yml +++ b/config/database.yml @@ -26,10 +26,9 @@ test: encoding: utf8mb4 collation: utf8mb4_0900_ai_ci pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> - url: <%= ENV['DATABASE_URL'] %> - database: <%= ENV.fetch('MYSQL_DATABASE') { 'arelpe_test' } %> - username: <%= ENV.fetch('MYSQL_USERNAME') { 'root' } %> - password: <%= ENV.fetch('MYSQL_PASSWORD') { nil } %> + database: arelpe_test + username: root + password: host: <%= ENV.fetch('MYSQL_HOST') { '127.0.0.1' } %> port: <%= ENV.fetch('MYSQL_PORT') { 3306 } %> diff --git a/config/environments/test.rb b/config/environments/test.rb index 8545c39..a1589e5 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -8,10 +8,6 @@ require "active_support/core_ext/integer/time" Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb. - config.active_record.encryption.primary_key = ENV.fetch('ENCRYPTION_PRIMARY_KEY') { 'test' * 8 } - config.active_record.encryption.deterministic_key = ENV.fetch('ENCRYPTION_DETERMINISTIC_KEY') { 'test' * 8 } - config.active_record.encryption.key_derivation_salt = ENV.fetch('ENCRYPTION_KEY_DERIVATION_SALT') { 'test' * 8 } - # While tests run files are not watched, reloading is not necessary. config.enable_reloading = false -- 2.39.5