diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2afb61a..bc50187 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,93 +1,34 @@ -name: CI -on: [push, pull_request] -env: - RAILS_ENV: test - DATABASE_URL: postgresql://postgres:@localhost/test - DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL: true +name: Ruby test + +on: + pull_request: + push: + branches: + - master + +concurrency: + group: ${{ github.ref_name }}-${{ github.workflow }} + cancel-in-progress: true + jobs: rubocop: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Setup Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: 2.4 - - name: Setup - run: | - gem install bundler - bundle install --jobs=3 --retry=3 - - name: Run rubocop - run: bundle exec rubocop + uses: theforeman/actions/.github/workflows/rubocop.yml@v0 + with: + command: bundle exec rubocop --parallel --format github + test: - runs-on: ubuntu-latest + name: Ruby needs: rubocop - services: - postgres: - image: postgres:12.1 - ports: ['5432:5432'] - options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 strategy: fail-fast: false matrix: - foreman-core-branch: [1.21-stable, 1.22-stable, 1.23-stable, 1.24-stable, 2.0-stable, 2.1-stable, 2.2-stable, develop] - ruby-version: [2.4, 2.5, 2.6] - node-version: [10] - exclude: - - foreman-core-branch: 2.0-stable - ruby-version: 2.4 - - foreman-core-branch: 2.1-stable - ruby-version: 2.4 - - foreman-core-branch: 2.2-stable - ruby-version: 2.4 - - foreman-core-branch: develop - ruby-version: 2.4 - steps: - - name: Install dependencies - run: | - sudo apt-get update - sudo apt-get install build-essential libcurl4-openssl-dev libvirt-dev ruby-libvirt zlib1g-dev libpq-dev - - uses: actions/checkout@v2 - with: - repository: theforeman/foreman - ref: ${{ matrix.foreman-core-branch }} - - uses: actions/checkout@v2 - with: - path: foreman_rescue - - name: Setup Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby-version }} - - name: Setup Node - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - name: Setup Bundler - run: | - echo "gem 'foreman_rescue', path: './foreman_rescue'" > bundler.d/foreman_rescue.local.rb - gem install bundler - bundle config path vendor/bundle - bundle config set without journald development console mysql2 sqlite - bundle lock --update - - name: Cache gems - uses: actions/cache@v2 - with: - path: vendor/bundle - key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }} - restore-keys: | - ${{ runner.os }}-gems- - - name: Setup Plugin - run: | - bundle install --jobs=3 --retry=3 - bundle exec rake db:create - bundle exec rake db:migrate - npm install - bundle exec rake webpack:compile - - name: Run plugin tests - run: | - bundle exec rake test:foreman_rescue - bundle exec rake test TEST="test/unit/foreman/access_permissions_test.rb" - - name: Precompile plugin assets - run: bundle exec rake 'plugin:assets:precompile[foreman_rescue]' - env: - RAILS_ENV: production + foreman: + - "develop" + - "3.10-stable" + - "3.9-stable" + uses: theforeman/actions/.github/workflows/foreman_plugin.yml@v0 + with: + plugin: foreman_rescue + foreman_version: ${{ matrix.foreman }} + environment_variables: | + FOREMAN_VERSION=${{ matrix.foreman }} diff --git a/.rubocop.yml b/.rubocop.yml index f5ebb93..f2e2c22 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -8,9 +8,6 @@ AllCops: Rails: Enabled: true -Rails/ActionFilter: - EnforcedStyle: action - # Don't enforce documentation Style/Documentation: Enabled: false @@ -22,10 +19,6 @@ Metrics/ClassLength: Exclude: - 'test/**/*' -Performance/FixedSize: - Exclude: - - 'test/**/*' - Metrics/BlockLength: Exclude: - 'test/**/*' @@ -47,7 +40,7 @@ Style/HashSyntax: - ruby19 - hash_rockets -Metrics/LineLength: +Layout/LineLength: Max: 190 Style/SymbolArray: diff --git a/foreman_rescue.gemspec b/foreman_rescue.gemspec index c6d15b6..4cd173f 100644 --- a/foreman_rescue.gemspec +++ b/foreman_rescue.gemspec @@ -15,5 +15,5 @@ Gem::Specification.new do |s| s.test_files = Dir['test/**/*'] s.add_development_dependency 'rdoc' - s.add_development_dependency 'rubocop', '0.52.0' + s.add_development_dependency 'theforeman-rubocop', '~> 0.1.2' end diff --git a/lib/foreman_rescue/engine.rb b/lib/foreman_rescue/engine.rb index 096714b..ad1db10 100644 --- a/lib/foreman_rescue/engine.rb +++ b/lib/foreman_rescue/engine.rb @@ -25,7 +25,7 @@ class Engine < ::Rails::Engine initializer 'foreman_rescue.register_plugin', :before => :finisher_hook do |_app| Foreman::Plugin.register :foreman_rescue do - requires_foreman '>= 1.21' + requires_foreman '>= 3.9' # Add permissions security_block :foreman_rescue do