diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml deleted file mode 100644 index 07c639f..0000000 --- a/.github/workflows/rubocop.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Rubocop -on: - pull_request: - push: - branches: - - master -jobs: - rubocop: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Setup Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: 2.7 - bundler-cache: true - - name: Setup rubocop - run: | - gem install bundler - - name: Execute rubocop - run: | - bundle exec rubocop diff --git a/.github/workflows/ruby_tests.yml b/.github/workflows/ruby_tests.yml new file mode 100644 index 0000000..a85d2e2 --- /dev/null +++ b/.github/workflows/ruby_tests.yml @@ -0,0 +1,24 @@ +name: Ruby Testing +on: + pull_request: + push: + branches: + - master + +concurrency: + group: ${{ github.ref_name }} + cancel-in-progress: true + +jobs: + rubocop: + name: Rubocop + uses: theforeman/actions/.github/workflows/rubocop.yml@v0 + with: + command: bundle exec rubocop + + test: + name: Ruby + needs: rubocop + uses: theforeman/actions/.github/workflows/foreman_plugin.yml@v0 + with: + plugin: foreman_salt diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml deleted file mode 100644 index 05a6a2d..0000000 --- a/.github/workflows/unit_tests.yml +++ /dev/null @@ -1,74 +0,0 @@ -name: Unit and functional tests -on: - pull_request: - push: - branches: - - master - -env: - RAILS_ENV: test - DATABASE_URL: postgresql://postgres:@localhost/test - DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL: true - -jobs: - test_ruby: - runs-on: ubuntu-latest - env: - BUNDLE_WITHOUT: journald:development:console:libvirt - 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: true - matrix: - foreman-repo: [theforeman/foreman] - foreman-core-branch: [develop] - ruby-version: [2.7] - node-version: [14] - steps: - - name: Install build dependencies - run: | - sudo apt-get update - sudo apt-get install build-essential libcurl4-openssl-dev zlib1g-dev libpq-dev - - uses: actions/checkout@v2 - with: - repository: ${{ matrix.foreman-repo }} - ref: ${{ matrix.foreman-core-branch }} - - uses: actions/checkout@v2 - with: - path: foreman_salt - - name: Setup Bundler - run: | - echo "gem 'foreman_salt', path: './foreman_salt'" > bundler.d/foreman_salt.local.rb - - name: Setup Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby-version }} - bundler-cache: true - - name: Setup Node - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node-version }} - - name: Prepare test DB - run: | - bundle exec rake db:create - bundle exec rake db:migrate - bundle exec rake db:test:prepare - - name: Prepare webpack - run: | - npm install - bundle exec rake webpack:compile - - name: Run plugin tests - run: | - bundle exec rake test:foreman_salt - - name: Run access permission test - run: | - bundle exec rake test TEST="test/unit/foreman/access_permissions_test.rb" - - name: Upload test.log - uses: actions/upload-artifact@v2 - if: failure() - with: - name: log - path: log/test.log