From cd6f0a0388b2d42ae980c5bcd25b8f81c02d825f Mon Sep 17 00:00:00 2001 From: Grzegorz Jakubiak Date: Sun, 4 Jul 2021 18:52:18 +0200 Subject: [PATCH 1/5] Remove Travis CI --- .travis.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b54fd58..0000000 --- a/.travis.yml +++ /dev/null @@ -1,18 +0,0 @@ -language: ruby -rvm: - - 2.4 - - 2.5 - - 2.6 - - 2.7 -services: - - mongodb -before_install: - - gem update --system - - gem install bundler - - bundle update --bundler -jobs: - include: - - stage: test - script: bundle exec rake - - stage: codecheck - script: bundle exec rubocop \ No newline at end of file From ee956039adaa63f2b9e3912710253477803fac6b Mon Sep 17 00:00:00 2001 From: Grzegorz Jakubiak Date: Sun, 4 Jul 2021 18:52:32 +0200 Subject: [PATCH 2/5] Use Github actions to run CI --- .github/workflows/codecheck.yml | 12 ++++++++++++ .github/workflows/tests.yml | 17 +++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 .github/workflows/codecheck.yml create mode 100644 .github/workflows/tests.yml diff --git a/.github/workflows/codecheck.yml b/.github/workflows/codecheck.yml new file mode 100644 index 0000000..2922c60 --- /dev/null +++ b/.github/workflows/codecheck.yml @@ -0,0 +1,12 @@ +name: Codecheck +on: push +jobs: + codecheck: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: ruby/setup-ruby@v1 + with: + ruby-version: 2.7 + bundler-cache: true + - run: bundle exec rubocop \ No newline at end of file diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 0000000..2307602 --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,17 @@ +name: Tests +on: push +jobs: + test: + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest] + ruby: [2.5, 2.6, 2.7] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v2 + - uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby }} + bundler-cache: true + - run: bundle exec rake From 73e6bb3ab6b081de9d63aea03a5639cd9d506a53 Mon Sep 17 00:00:00 2001 From: Grzegorz Jakubiak Date: Sun, 4 Jul 2021 18:39:35 +0200 Subject: [PATCH 3/5] Run rubocop --- .github/workflows/tests.yml | 7 +++++++ lib/activeadmin-mongoid.rb | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2307602..c47b069 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,6 +8,13 @@ jobs: os: [ubuntu-latest] ruby: [2.5, 2.6, 2.7] runs-on: ${{ matrix.os }} + + services: + mongodb: + image: mongo + ports: + - 27017:27017 + steps: - uses: actions/checkout@v2 - uses: ruby/setup-ruby@v1 diff --git a/lib/activeadmin-mongoid.rb b/lib/activeadmin-mongoid.rb index 57ddd40..36bf582 100644 --- a/lib/activeadmin-mongoid.rb +++ b/lib/activeadmin-mongoid.rb @@ -9,7 +9,6 @@ # and thereby pushing ActiveAdmin::Generators::InstallGenerator to use our empty create_migrations method. Rails::Generators::NamedBase.class_eval do - def create_migrations end @@ -17,7 +16,7 @@ def self.inherited(klass) super if klass.name == "ActiveAdmin::Generators::InstallGenerator" - klass.class_eval do + klass.class_eval do def self.method_added(method_name) super remove_method method_name if method_name == :create_migrations @@ -26,4 +25,3 @@ def self.method_added(method_name) end end end - From 3ab0399fcbff38b2b32993466dd403272cd80755 Mon Sep 17 00:00:00 2001 From: Grzegorz Jakubiak Date: Sun, 4 Jul 2021 22:34:18 +0200 Subject: [PATCH 4/5] Run workflows on push and pull requests to master --- .github/workflows/codecheck.yml | 8 +++++++- .github/workflows/tests.yml | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codecheck.yml b/.github/workflows/codecheck.yml index 2922c60..74e9f03 100644 --- a/.github/workflows/codecheck.yml +++ b/.github/workflows/codecheck.yml @@ -1,5 +1,11 @@ name: Codecheck -on: push +on: + push: + branches: + - master + pull_request: + branches: + - master jobs: codecheck: runs-on: ubuntu-latest diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c47b069..bb6a602 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,5 +1,11 @@ name: Tests -on: push +on: + push: + branches: + - master + pull_request: + branches: + - master jobs: test: strategy: From 5467d079df2e0d2f16eb3655f177e3f445306d8e Mon Sep 17 00:00:00 2001 From: Grzegorz Jakubiak Date: Sat, 10 Jul 2021 21:55:58 +0200 Subject: [PATCH 5/5] Replace travis badge with Github actions --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6097810..60feb35 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # ActiveAdmin-Mongoid [![Version ][rubygems_badge]][rubygems] -[![Build Status](https://travis-ci.org/activeadmin/activeadmin-mongoid.svg?branch=master)](https://travis-ci.org/activeadmin/activeadmin-mongoid) +![Tests](https://github.com/activeadmin/activeadmin-mongoid/actions/workflows/tests.yml/badge.svg) +![Codecheck](https://github.com/activeadmin/activeadmin-mongoid/actions/workflows/codecheck.yml/badge.svg) ## Updates