From 6b46271ca9b26e2be9663192d02082071216f3e6 Mon Sep 17 00:00:00 2001 From: Leos Stejskal Date: Thu, 6 Oct 2022 10:14:35 +0200 Subject: [PATCH] Update foreman dependencies & CI actions (#53) * Update foreman dependencies * Cleanup github actions * Bump version to 0.0.2 --- .github/workflows/{js_ci.yml => js_ci.yml.BAK} | 0 .github/workflows/ruby.yml | 7 ++++--- lib/foreman_google/engine.rb | 2 +- lib/foreman_google/version.rb | 2 +- package.json | 14 +++++++------- 5 files changed, 13 insertions(+), 12 deletions(-) rename .github/workflows/{js_ci.yml => js_ci.yml.BAK} (100%) diff --git a/.github/workflows/js_ci.yml b/.github/workflows/js_ci.yml.BAK similarity index 100% rename from .github/workflows/js_ci.yml rename to .github/workflows/js_ci.yml.BAK diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 3ce7c61..d4fed10 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -21,7 +21,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 2.5 + ruby-version: 2.7 bundler-cache: true - name: Run rubocop if: github.event_name != 'push' @@ -42,7 +42,7 @@ jobs: fail-fast: false matrix: foreman-core-branch: [develop] - ruby-version: [2.5, 2.7] + ruby-version: [2.7] node-version: [12] steps: - run: sudo apt-get update @@ -76,4 +76,5 @@ jobs: - name: Run plugin tests if: github.event_name != 'push' run: | - bundle exec rake test:foreman_google + bundle exec rake test:foreman_google -v --trace + bundle exec rake test TEST="test/unit/foreman/access_permissions_test.rb" -v --trace diff --git a/lib/foreman_google/engine.rb b/lib/foreman_google/engine.rb index d86bc0a..e04ba32 100644 --- a/lib/foreman_google/engine.rb +++ b/lib/foreman_google/engine.rb @@ -12,7 +12,7 @@ class Engine < ::Rails::Engine initializer 'foreman_google.register_plugin', before: :finisher_hook do |_app| Foreman::Plugin.register :foreman_google do - requires_foreman '>= 2.4.0' + requires_foreman '>= 3.5.0' register_global_js_file 'global' in_to_prepare do diff --git a/lib/foreman_google/version.rb b/lib/foreman_google/version.rb index 1264ffd..c679416 100644 --- a/lib/foreman_google/version.rb +++ b/lib/foreman_google/version.rb @@ -1,3 +1,3 @@ module ForemanGoogle - VERSION = '0.0.1'.freeze + VERSION = '0.0.2'.freeze end diff --git a/package.json b/package.json index beb71b0..9ab1dcb 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "url": "http://projects.theforeman.org/projects/foreman_google/issues" }, "peerDependencies": { - "@theforeman/vendor": ">= 6.0.0" + "@theforeman/vendor": ">= 8.16.0" }, "dependencies": { "react-intl": "^2.8.0" @@ -29,12 +29,12 @@ "devDependencies": { "@babel/core": "^7.7.0", "@sheerun/mutationobserver-shim": "^0.3.3", - "@theforeman/builder": "^6.0.0", - "@theforeman/eslint-plugin-foreman": "6.0.0", - "@theforeman/find-foreman": "^4.8.0", - "@theforeman/stories": "^7.0.0", - "@theforeman/test": "^8.0.0", - "@theforeman/vendor-dev": "^6.0.0", + "@theforeman/builder": "^10.0", + "@theforeman/eslint-plugin-foreman": "^10.0", + "@theforeman/find-foreman": "^10.0", + "@theforeman/stories": "^10.0", + "@theforeman/test": "^10.0", + "@theforeman/vendor-dev": "^10.0", "babel-eslint": "^10.0.3", "eslint": "^6.7.2", "prettier": "^1.19.1",