Merge pull request #153 from thoughtbot/main

Merge upstream

.github/dependabot.yml

@@ -1,8 +1,16 @@
+---
 version: 2
 
 updates:
-- package-ecosystem: bundler
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
+  - package-ecosystem: bundler
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: weekly
+      time: '02:00'
+      timezone: 'Etc/UTC'

.github/workflows/bundle-audit.yml

@@ -1,13 +1,18 @@
 ---
 name: Bundler Audit
-on: [push]
+on:
+  push:
+    branches:
+      - 'main'
+  pull_request:
+    types: [opened, synchronize, reopened]
 
 jobs:
   audit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: 'Bundler Audit'
-        uses: andrewmcodes/bundler-audit-action@main
+        uses: thoughtbot/bundler-audit-action@main
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/codeql-analysis.yml

@@ -1,8 +1,11 @@
 ---
-name: "CodeQL"
-
+name: CodeQL
 on:
   push:
+    branches:
+      - 'main'
+  pull_request:
+    types: [opened, synchronize, reopened]
   schedule:
     - cron: '44 6 * * 4'
 
@@ -22,15 +25,15 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
+        uses: github/codeql-action/autobuild@v3
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v3

.github/workflows/lint.yml

@@ -0,0 +1,34 @@
+---
+name: Lint
+on:
+  push:
+    branches:
+      - 'main'
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  standardrb:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      checks: write
+    steps:
+      - uses: actions/checkout@v4
+      - name: StandardRB Linter
+        uses: testdouble/standard-ruby-action@main
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  stylelint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JS
+        uses: actions/setup-node@v4
+        with:
+          cache: yarn
+      - name: Install JS dependencies
+        run: yarn install
+      - name: Run Stylelint
+        run: yarn run lint:css

.github/workflows/main.yml

@@ -0,0 +1,67 @@
+---
+name: Tests
+on:
+  push:
+    branches:
+      - 'main'
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['3.0', 3.1, 3.2, 3.3]
+    env:
+      PGHOST: localhost
+      PGUSER: administrate
+      PGPASSWORD: administrate
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: administrate
+          POSTGRES_DB: administrate_test
+          POSTGRES_PASSWORD: administrate
+        ports:
+           - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Set up JS
+        uses: actions/setup-node@v4
+        with:
+          cache: yarn
+      - name: Install Ruby dependencies
+        run: bundle install
+      - name: Install Appraisal dependencies
+        run: bundle exec appraisal install
+      - name: Install JS dependencies
+        run: yarn install
+      - name: Setup the environment
+        run: cp .sample.env .env
+      - run: cp spec/example_app/config/database.yml.sample spec/example_app/config/database.yml
+      - name: Setup the database
+        run: bundle exec rake db:setup
+      - name: Build assets
+        run: yarn run build && yarn run build:css
+      - name: Run tests
+        run: bundle exec rspec
+      - name: Appraise Rails 6.0
+        run: bundle exec appraisal rails60 rspec
+        if: ${{ matrix.ruby <= '3.0' }}
+      - name: Appraise Rails 6.1
+        run: bundle exec appraisal rails61 rspec
+      - name: Appraisal Rails 7.0
+        run: bundle exec appraisal rails70 rspec

.gitignore

@@ -7,17 +7,28 @@
 /.foreman
 /coverage/*
 /db/*.sqlite3
+
 /log/*
 /tmp/*
 !/log/.keep
 !/tmp/.keep
+
 /spec/example_app/log/*
 /spec/example_app/tmp/*
 !/spec/example_app/log/.keep
 !/spec/example_app/tmp/.keep
 /spec/example_app/public/system
 /spec/example_app/public/assets
+
+/spec/example_app/app/assets/builds/*
+!/spec/example_app/app/assets/builds/.keep
+
+/spec/example_app/node_modules
 /spec/example_app/config/database.yml
+
+/node_modules
+/public
+
 /tags
 pkg
 *.ipr
@@ -28,3 +39,4 @@ pkg
 gemfiles/.bundle/
 .yardoc
 /doc
+*.gem

.hound.yml

@@ -1,7 +1,3 @@
+---
 ruby:
   config_file: .rubocop.yml
-scss:
-  enabled: true
-  config_file: .scss-lint.yml
-stylelint:
-  config_file: .stylelintrc.json

.node-version

@@ -0,0 +1 @@
+20.11.0

.sample.env

@@ -1,3 +1,4 @@
 # http://ddollar.github.com/foreman/
 RACK_ENV=development
 SECRET_KEY_BASE=development_secret
+PORT=3000