diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7cb8012e4..054170b97 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -137,7 +137,7 @@ jobs: - name: Set up Node uses: actions/setup-node@v4 with: - node-version: "18" + node-version: "20" - name: Install ImageMagick run: sudo apt-get install imagemagick - name: Setup application diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0c6bfbf1b..2a1f3d664 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,7 +35,11 @@ Example installation on macOS using Homebrew: brew install imagemagick # install google chrome with cask: brew install brew-cask -brew cask install google-chrome +brew install google-chrome --cask +# install mysql +brew install mysql +# install openssl +brew install openssl@3 ``` Example installation on Ubuntu: @@ -50,6 +54,10 @@ sudo apt update -y && wget https://dl.google.com/linux/direct/google-chrome-stab Then you need to do this one-time setup: ```bash +# On Mac, you may run into problems with the mysql2 gem that require flags to be set in bundle config +# See: https://github.com/brianmario/mysql2/issues/1345 +bundle config build.mysql2 '-- --with-cflags="-Wno-error=implicit-function-declaration" --with-ldflags=-L/opt/homebrew/opt/zstd/lib' + bundle install yarn install # install dependencies for each appraisal: diff --git a/lib/rails_admin/config/configurable.rb b/lib/rails_admin/config/configurable.rb index 382677f2e..b0faf69db 100644 --- a/lib/rails_admin/config/configurable.rb +++ b/lib/rails_admin/config/configurable.rb @@ -9,7 +9,7 @@ def self.included(base) base.send :extend, ClassMethods end - def has_option?(name) # rubocop:disable Naming/PredicateName + def has_option?(name) # rubocop:disable Naming/PredicatePrefix? options = self.class.instance_variable_get('@config_options') options&.key?(name) end