Skip to content

Commit 1308134

Browse files
authored
Merge pull request #293 from wordpress-mobile/disable-platform-specific-gems
2 parents 35cb317 + f2d8f5e commit 1308134

File tree

6 files changed

+12
-5
lines changed

6 files changed

+12
-5
lines changed

.bundle/config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
BUNDLE_SPECIFIC_PLATFORM: "false"
3+
BUNDLE_WITH: "test"

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ commands:
2828
brew update && xargs brew install --verbose < .circleci/.brewfile
2929
- run:
3030
name: Install Ruby dependencies, if neeeded
31-
command: bundle check --path vendor/bundle || bundle install --with screenshots
31+
command: bundle check --path vendor/bundle || bundle install
3232
- save_cache:
3333
name: Cache Homebrew + Ruby Dependencies
3434
key: *cache_key

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Install Gems
2525
run: |
2626
bundle config path vendor/bundle
27-
bundle install --jobs 4 --retry 3
27+
BUNDLE_WITHOUT=test bundle install --jobs 4 --retry 3
2828
2929
- name: Run Danger
3030
run: bundle exec danger

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
.idea
66

77
# Ruby / Bundler
8-
.bundle/
98
vendor/bundle
109

1110
# Fastlane

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ _None_
3939
* Fix the way versioning is handled for alphas – i.e. `version.properties` is indexed by flavor name, defaulting to `zalpha` for alphas. [#283]
4040
* Fixed an issue in `check_translation_progress` where a wrong evaluation of the progress is possible when there are Waiting string in GlotPress.
4141

42+
### Internal Changes
43+
44+
* Opt-out from installing platform-specific gems with Bundler [#293]
4245

4346
## 1.3.0
4447

Gemfile.lock

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ GEM
260260
method_source (0.9.2)
261261
mini_magick (4.11.0)
262262
mini_mime (1.1.0)
263+
mini_portile2 (2.5.3)
263264
minitest (5.14.4)
264265
molinillo (0.6.6)
265266
multi_json (1.15.0)
@@ -269,7 +270,8 @@ GEM
269270
naturally (2.2.1)
270271
netrc (0.11.0)
271272
no_proxy_fix (0.1.2)
272-
nokogiri (1.11.7-x86_64-darwin)
273+
nokogiri (1.11.7)
274+
mini_portile2 (~> 2.5.0)
273275
racc (~> 1.4)
274276
octokit (4.21.0)
275277
faraday (>= 0.9)
@@ -415,4 +417,4 @@ DEPENDENCIES
415417
yard
416418

417419
BUNDLED WITH
418-
2.2.24
420+
2.2.25

0 commit comments

Comments
 (0)