Skip to content

Commit

Permalink
Changed some environmental things to make this build
Browse files Browse the repository at this point in the history
  • Loading branch information
ySteinhart1 committed Nov 29, 2022
1 parent 5ab8138 commit 8a02e77
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 41 deletions.
43 changes: 22 additions & 21 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Ruby

on:
push:
branches: [ main ]
branches: [main]
pull_request:
branches: [ main ]
branches: [main]

jobs:
test:
Expand All @@ -17,22 +17,23 @@ jobs:
ports:
- 5432:5432
steps:
- uses: actions/checkout@v2
- name: Install PostgreSQL client
run: sudo apt-get -yqq install libpq-dev
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
- name: Set up yarn
run: |
yarn install --pure-lockfile
- name: Prepare database
env:
PGHOST: localhost
RAILS_ENV: test
run: bin/rails db:setup
- name: Run tests
env:
PGHOST: localhost
run: bin/rails test
- uses: actions/checkout@v2
- name: Install PostgreSQL client
run: sudo apt-get -yqq install libpq-dev
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
ruby-version: "3.0.4"
- name: Set up yarn
run: |
yarn install --pure-lockfile
- name: Prepare database
env:
PGHOST: localhost
RAILS_ENV: test
run: bin/rails db:setup
- name: Run tests
env:
PGHOST: localhost
run: bin/rails test
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.0
FROM ruby:3.0.4

RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add \
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ]
gem "bootsnap", require: false

gem 'bootstrap-sass', '~> 3.4.1'
gem 'sassc-rails', '>= 2.1.0'
gem 'sassc-rails', '~> 2.1.0'
# Use Sass to process CSS
# gem "sassc-rails"

Expand Down
16 changes: 9 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ GEM
autoprefixer-rails (10.4.7.0)
execjs (~> 2)
bindex (0.8.1)
bootsnap (1.13.0)
bootsnap (1.15.0)
msgpack (~> 1.2)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
Expand All @@ -92,7 +92,7 @@ GEM
actionpack (>= 6.0.0)
railties (>= 6.0.0)
io-console (0.5.11)
irb (1.4.2)
irb (1.5.1)
reline (>= 0.3.0)
kaminari (1.2.2)
activesupport (>= 4.1.0)
Expand Down Expand Up @@ -122,7 +122,7 @@ GEM
net-protocol
net-protocol (0.1.3)
timeout
net-smtp (0.3.2)
net-smtp (0.3.3)
net-protocol
nio4r (2.5.8)
nokogiri (1.13.9-aarch64-linux)
Expand Down Expand Up @@ -165,7 +165,9 @@ GEM
rake (13.0.6)
reline (0.3.1)
io-console (~> 0.5)
sassc (2.4.0)
sassc (2.1.0)
ffi (~> 1.9)
sassc (2.1.0-x86_64-linux)
ffi (~> 1.9)
sassc-rails (2.1.2)
railties (>= 4.0.0)
Expand All @@ -180,7 +182,7 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
stimulus-rails (1.1.0)
stimulus-rails (1.2.0)
railties (>= 6.0.0)
thor (1.2.1)
tilt (2.0.11)
Expand All @@ -198,7 +200,7 @@ GEM
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.6.1)
zeitwerk (2.6.6)

PLATFORMS
aarch64-linux
Expand All @@ -214,7 +216,7 @@ DEPENDENCIES
pg (~> 1.1.0)
puma (~> 5.0)
rails (~> 7.0.4)
sassc-rails (>= 2.1.0)
sassc-rails (~> 2.1.0)
sprockets-rails
stimulus-rails
turbo-rails (~> 1.0.0)
Expand Down
7 changes: 0 additions & 7 deletions db/migrate/20221118213211_update_posts.rb

This file was deleted.

7 changes: 3 additions & 4 deletions db/schema.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8a02e77

Please sign in to comment.