Skip to content

Commit

Permalink
fix: Attempt to remove platform specific lock on google-protobuf (#171)
Browse files Browse the repository at this point in the history
* fix: Set gem back to non platform specific version, bust cache

* Reduce concurrency in bundling. Let's get it working right first.

* Bust it one more time to test the concurrency fix
  • Loading branch information
daemonsy authored Feb 2, 2022
1 parent e75ac4b commit 7898c28
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
20 changes: 10 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ commands:
- restore_cache:
name: Restore Ruby Package Cache
keys:
- v3-gem-cache-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
- v3-gem-cache-{{ arch }}-{{ .Branch }}-
- v3-gem-cache-{{ arch }}-
- v5-gem-cache-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
- v5-gem-cache-{{ arch }}-{{ .Branch }}-
- v5-gem-cache-{{ arch }}-
- run:
name: Install base Ruby dependencies
command: |
bundle install --jobs=4 --retry=3 --path=vendor/bundle
bundle install --jobs=1 --retry=3 --path=vendor/bundle
- save_cache:
name: Save Ruby Package Cache
key: v3-gem-cache-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
key: v5-gem-cache-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
paths:
- ./vendor/bundle
appraisal-install:
Expand All @@ -39,16 +39,16 @@ commands:
- restore_cache:
name: Restore Appraisal package cache
keys:
- v3-gem-cache-{{ arch }}-{{ .Branch }}-{{ checksum "current_appraisal.gemfile.lock" }}
- v3-gem-cache-{{ arch }}-{{ .Branch }}-
- v3-gem-cache-{{ arch }}-
- v5-gem-cache-{{ arch }}-{{ .Branch }}-{{ checksum "current_appraisal.gemfile.lock" }}
- v5-gem-cache-{{ arch }}-{{ .Branch }}-
- v5-gem-cache-{{ arch }}-
- run:
name: Install appraisal dependencies
command: |
bundle exec appraisal << parameters.appraisal >> bundle install --jobs=4 --retry=3 --path=../vendor/bundle
bundle exec appraisal << parameters.appraisal >> bundle install --jobs=1 --retry=3 --path=../vendor/bundle
- save_cache:
name: Save Appraisal package cache
key: v3-gem-cache-{{ arch }}-{{ .Branch }}-{{ checksum "current_appraisal.gemfile.lock" }}
key: v5-gem-cache-{{ arch }}-{{ .Branch }}-{{ checksum "current_appraisal.gemfile.lock" }}
paths:
- ./vendor/bundle

Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ GEM
debase-ruby_core_source (0.10.9)
diff-lcs (1.3)
erubi (1.9.0)
google-protobuf (3.19.3-x86_64-linux)
google-protobuf (3.19.4)
graphql (1.10.14)
i18n (1.8.5)
concurrent-ruby (~> 1.0)
Expand Down

0 comments on commit 7898c28

Please sign in to comment.