Skip to content

Commit ae26d43

Browse files
fix: update CONTRIBUTING.md documentation for mac setup, bump node version, fix rubocop error (#3725)
* fix: update CONTRIBUTING.md documentation for mac setup * fix: update rubocop rule name to conform with rubocop v1.77+ * fix: bump node version to v20
1 parent 1b2a8ba commit ae26d43

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jobs:
137137
- name: Set up Node
138138
uses: actions/setup-node@v4
139139
with:
140-
node-version: "18"
140+
node-version: "20"
141141
- name: Install ImageMagick
142142
run: sudo apt-get install imagemagick
143143
- name: Setup application

CONTRIBUTING.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ Example installation on macOS using Homebrew:
3535
brew install imagemagick
3636
# install google chrome with cask:
3737
brew install brew-cask
38-
brew cask install google-chrome
38+
brew install google-chrome --cask
39+
# install mysql
40+
brew install mysql
41+
# install openssl
42+
brew install openssl@3
3943
```
4044

4145
Example installation on Ubuntu:
@@ -50,6 +54,10 @@ sudo apt update -y && wget https://dl.google.com/linux/direct/google-chrome-stab
5054
Then you need to do this one-time setup:
5155

5256
```bash
57+
# On Mac, you may run into problems with the mysql2 gem that require flags to be set in bundle config
58+
# See: https://github.com/brianmario/mysql2/issues/1345
59+
bundle config build.mysql2 '-- --with-cflags="-Wno-error=implicit-function-declaration" --with-ldflags=-L/opt/homebrew/opt/zstd/lib'
60+
5361
bundle install
5462
yarn install
5563
# install dependencies for each appraisal:

lib/rails_admin/config/configurable.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def self.included(base)
99
base.send :extend, ClassMethods
1010
end
1111

12-
def has_option?(name) # rubocop:disable Naming/PredicateName
12+
def has_option?(name) # rubocop:disable Naming/PredicatePrefix?
1313
options = self.class.instance_variable_get('@config_options')
1414
options&.key?(name)
1515
end

0 commit comments

Comments
 (0)