From 4c07936a5bf77393f37a0542f2541ea04b3f884b Mon Sep 17 00:00:00 2001 From: the38th Date: Fri, 11 Jun 2021 04:49:11 -0700 Subject: [PATCH 1/5] created workflow main --- .github/workflows/main.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..a2b2777 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,20 @@ +name: Main + +on: + pull_request: + branches: + - 'develop' + push: + branches: + - 'develop' + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Run tests + env: + COVERAGE: true + RAILS_ENV: test + run: docker-compose --file docker-compose.ci.yml run ci \ No newline at end of file From 852b0753f5805bd65bcec4c4d6567bbb7e1d9fa2 Mon Sep 17 00:00:00 2001 From: the38th Date: Fri, 11 Jun 2021 04:49:32 -0700 Subject: [PATCH 2/5] created docker-compose.ci.yml --- docker-compose.ci.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 docker-compose.ci.yml diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml new file mode 100644 index 0000000..d7f3617 --- /dev/null +++ b/docker-compose.ci.yml @@ -0,0 +1,15 @@ +version: '2' + +services: + db: + image: postgres:10.3-alpine + ci: + build: . + depends_on: + - db + environment: + - COVERAGE + - RAILS_ENV + - DATABASE_HOST=db + - DATABASE_USERNAME=postgres + command: sh -c "bundle exec rails webpacker:install && bundle exec rails db:create db:migrate && bundle exec rake test" \ No newline at end of file From 4509711e07f4f43998ee5f2b0bd8b04708dae2f1 Mon Sep 17 00:00:00 2001 From: the38th Date: Fri, 11 Jun 2021 04:49:55 -0700 Subject: [PATCH 3/5] added GitHubActions badge to readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 7db80e4..5aad329 100644 --- a/README.md +++ b/README.md @@ -22,3 +22,5 @@ Things you may want to cover: * Deployment instructions * ... + +Build Status \ No newline at end of file From 03fb23420f6339e687b60db01cadaf75bde3a79e Mon Sep 17 00:00:00 2001 From: the38th Date: Fri, 11 Jun 2021 04:52:07 -0700 Subject: [PATCH 4/5] removed GitHubActions badge to readme --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 5aad329..7db80e4 100644 --- a/README.md +++ b/README.md @@ -22,5 +22,3 @@ Things you may want to cover: * Deployment instructions * ... - -Build Status \ No newline at end of file From d3fdd6538564014bdc070d0ff084f5eef61f1de1 Mon Sep 17 00:00:00 2001 From: the38th Date: Sun, 27 Jun 2021 22:53:49 -0700 Subject: [PATCH 5/5] updated rails to resolve mimemagic error --- Gemfile | 2 +- Gemfile.lock | 140 +++++++++++++++++++++++++-------------------------- 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/Gemfile b/Gemfile index f7765a9..2a5792f 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby '2.7.1' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 6.0.3', '>= 6.0.3.4' +gem 'rails', '~> 6.0.3', '>= 6.0.3.6' # Use postgresql as the database for Active Record gem 'pg', '>= 0.18', '< 2.0' # Use Puma as the app server diff --git a/Gemfile.lock b/Gemfile.lock index 4592583..06f987d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,38 +10,38 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (6.0.3.4) - actionpack (= 6.0.3.4) + actioncable (6.0.4) + actionpack (= 6.0.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.4) - actionpack (= 6.0.3.4) - activejob (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + actionmailbox (6.0.4) + actionpack (= 6.0.4) + activejob (= 6.0.4) + activerecord (= 6.0.4) + activestorage (= 6.0.4) + activesupport (= 6.0.4) mail (>= 2.7.1) - actionmailer (6.0.3.4) - actionpack (= 6.0.3.4) - actionview (= 6.0.3.4) - activejob (= 6.0.3.4) + actionmailer (6.0.4) + actionpack (= 6.0.4) + actionview (= 6.0.4) + activejob (= 6.0.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.4) - actionview (= 6.0.3.4) - activesupport (= 6.0.3.4) + actionpack (6.0.4) + actionview (= 6.0.4) + activesupport (= 6.0.4) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3.4) - actionpack (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + actiontext (6.0.4) + actionpack (= 6.0.4) + activerecord (= 6.0.4) + activestorage (= 6.0.4) + activesupport (= 6.0.4) nokogiri (>= 1.8.5) - actionview (6.0.3.4) - activesupport (= 6.0.3.4) + actionview (6.0.4) + activesupport (= 6.0.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -51,20 +51,20 @@ GEM activemodel (>= 4.1, < 6.2) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (6.0.3.4) - activesupport (= 6.0.3.4) + activejob (6.0.4) + activesupport (= 6.0.4) globalid (>= 0.3.6) - activemodel (6.0.3.4) - activesupport (= 6.0.3.4) - activerecord (6.0.3.4) - activemodel (= 6.0.3.4) - activesupport (= 6.0.3.4) - activestorage (6.0.3.4) - actionpack (= 6.0.3.4) - activejob (= 6.0.3.4) - activerecord (= 6.0.3.4) - marcel (~> 0.3.1) - activesupport (6.0.3.4) + activemodel (6.0.4) + activesupport (= 6.0.4) + activerecord (6.0.4) + activemodel (= 6.0.4) + activesupport (= 6.0.4) + activestorage (6.0.4) + actionpack (= 6.0.4) + activejob (= 6.0.4) + activerecord (= 6.0.4) + marcel (~> 1.0.0) + activesupport (6.0.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -90,9 +90,9 @@ GEM case_transform (0.2) activesupport childprocess (3.0.0) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.9) crass (1.0.6) - erubi (1.9.0) + erubi (1.10.0) factory_bot (6.1.0) activesupport (>= 5.0.0) factory_bot_rails (6.1.0) @@ -101,7 +101,7 @@ GEM ffi (1.13.1) globalid (0.4.2) activesupport (>= 4.2.0) - i18n (1.8.5) + i18n (1.8.10) concurrent-ruby (~> 1.0) jbuilder (2.10.1) activesupport (>= 5.0.0) @@ -123,22 +123,21 @@ GEM listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.7.0) + loofah (2.10.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) + marcel (1.0.1) method_source (1.0.0) - mimemagic (0.3.5) - mini_mime (1.0.2) - mini_portile2 (2.4.0) - minitest (5.14.2) + mini_mime (1.1.0) + mini_portile2 (2.5.3) + minitest (5.14.4) msgpack (1.3.3) - nio4r (2.5.4) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + nio4r (2.5.7) + nokogiri (1.11.7) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) parallel (1.20.1) parser (3.0.1.0) ast (~> 2.4.1) @@ -146,39 +145,40 @@ GEM public_suffix (4.0.6) puma (4.3.6) nio4r (~> 2.0) + racc (1.5.2) rack (2.2.3) rack-proxy (0.6.5) rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.0.3.4) - actioncable (= 6.0.3.4) - actionmailbox (= 6.0.3.4) - actionmailer (= 6.0.3.4) - actionpack (= 6.0.3.4) - actiontext (= 6.0.3.4) - actionview (= 6.0.3.4) - activejob (= 6.0.3.4) - activemodel (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + rails (6.0.4) + actioncable (= 6.0.4) + actionmailbox (= 6.0.4) + actionmailer (= 6.0.4) + actionpack (= 6.0.4) + actiontext (= 6.0.4) + actionview (= 6.0.4) + activejob (= 6.0.4) + activemodel (= 6.0.4) + activerecord (= 6.0.4) + activestorage (= 6.0.4) + activesupport (= 6.0.4) bundler (>= 1.3.0) - railties (= 6.0.3.4) + railties (= 6.0.4) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (6.0.3.4) - actionpack (= 6.0.3.4) - activesupport (= 6.0.3.4) + railties (6.0.4) + actionpack (= 6.0.4) + activesupport (= 6.0.4) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rainbow (3.0.0) - rake (13.0.1) + rake (13.0.3) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -238,10 +238,10 @@ GEM activerecord (>= 5.1) state_machines-activemodel (>= 0.8.0) temple (0.8.2) - thor (1.0.1) + thor (1.1.0) thread_safe (0.3.6) tilt (2.0.10) - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) unicode-display_width (2.0.0) web-console (4.0.4) @@ -259,12 +259,12 @@ GEM railties (>= 4.2) webpacker-react (0.3.2) webpacker - websocket-driver (0.7.3) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.4.0) + zeitwerk (2.4.2) PLATFORMS ruby @@ -282,7 +282,7 @@ DEPENDENCIES listen (~> 3.2) pg (>= 0.18, < 2.0) puma (~> 4.1) - rails (~> 6.0.3, >= 6.0.3.4) + rails (~> 6.0.3, >= 6.0.3.6) ransack! responders rubocop