Skip to content

Commit

Permalink
Update os, libs, ci
Browse files Browse the repository at this point in the history
  • Loading branch information
joshfng committed Sep 11, 2024
1 parent fe633f3 commit 3aeadac
Show file tree
Hide file tree
Showing 6 changed files with 169 additions and 145 deletions.
82 changes: 41 additions & 41 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,53 +43,53 @@ jobs:
yarn prettier --check .
yarn run eslint
# security:
# name: Security
# runs-on: ubuntu-24.04
# steps:
# - name: Checkout code
# uses: actions/checkout@v4

# - name: Setup Ruby
# uses: ruby/setup-ruby@v1
# with:
# bundler-cache: true

# - name: Setup Node
# uses: actions/setup-node@v4
# with:
# node-version: 'lts/*'

# - name: Find yarn cache location
# id: yarn-cache
# run: echo "::set-output name=dir::$(yarn cache dir)"

# - name: JS package cache
# uses: actions/cache@v4
# with:
# path: ${{ steps.yarn-cache.outputs.dir }}
# key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
# restore-keys: |
# ${{ runner.os }}-yarn-

# - name: Install yarn packages
# run: |
# yarn install --pure-lockfile

# - name: Run security checks
# env:
# RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
# LOCKBOX_MASTER_KEY: ${{ secrets.LOCKBOX_MASTER_KEY }}
# run: |
# bin/bundler-audit --update
# bin/brakeman -q -w2
security:
name: Security
runs-on: ubuntu-24.04
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
bundler-cache: true

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 'lts/*'

- name: Find yarn cache location
id: yarn-cache
run: echo "::set-output name=dir::$(yarn cache dir)"

- name: JS package cache
uses: actions/cache@v4
with:
path: ${{ steps.yarn-cache.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: Install yarn packages
run: |
yarn install --pure-lockfile
- name: Run security checks
env:
RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
LOCKBOX_MASTER_KEY: ${{ secrets.LOCKBOX_MASTER_KEY }}
run: |
bin/bundler-audit --update
bin/brakeman -q -w2
tests:
name: Tests
runs-on: ubuntu-24.04
services:
postgres:
image: postgres:12-alpine
image: postgres:16-alpine
env:
POSTGRES_USER: detonate
POSTGRES_DB: detonate_test
Expand Down
2 changes: 0 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ gem 'sass-rails'
gem 'turbolinks'
gem 'webpacker'

# gem 'prerender_chrome', path: '/Users/josh/code/joshfng/prerender_chrome'

# Authentication
gem 'devise'

Expand Down
Loading

0 comments on commit 3aeadac

Please sign in to comment.