-
Notifications
You must be signed in to change notification settings - Fork 206
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ruby 3.2.6, bundler 2.6.2, add checksums to lockfile, ci simplification #3544
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
17fc703
Update bundler to 2.6.2 and add checksums
tiegz 1e64023
Include rubocop in test env, for linting
tiegz 155f0f3
Debug bundler version
tiegz f26d100
Update bundler in CI
tiegz 81a0042
Test a config option
tiegz 7fad1b9
2.6.2
tiegz 530bd11
Update ruby orb and rely more on that
tiegz 4b1f946
Expire cache to fix CI permission error
tiegz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,14 @@ | ||
version: 2.1 | ||
orbs: | ||
ruby: circleci/ruby@2.1.0 | ||
ruby: circleci/ruby@2.3.1 | ||
|
||
executors: | ||
# TODO: we don't need ES/PG/Redis for "lint" job, so we could create another | ||
# stripped-down executor if we want? | ||
libraries: | ||
working_directory: ~/libraries | ||
docker: | ||
- image: ruby:3.2.5-slim-bullseye | ||
- image: cimg/ruby:3.2-node | ||
environment: | ||
PGHOST: 127.0.0.1 | ||
PGUSER: postgres | ||
|
@@ -23,34 +23,17 @@ executors: | |
- cluster.name: elasticsearch | ||
- action.auto_create_index: true | ||
|
||
commands: | ||
setup-ruby-env: | ||
description: "Required steps to setup environmnt for doing ruby stuff" | ||
steps: | ||
- run: | ||
name: Update system libraries | ||
command: | | ||
apt-get -y -qq update | ||
apt-get -y --no-install-recommends install cmake libpq-dev git-core build-essential libicu-dev pkg-config nodejs curl | ||
|
||
jobs: | ||
install: | ||
executor: libraries | ||
steps: | ||
- setup-ruby-env | ||
|
||
- checkout: | ||
path: ~/libraries | ||
|
||
- run: | ||
name: Prep ruby | ||
command: | | ||
gem -v | ||
bundle -v | ||
bundle config path vendor/bundle | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this is already set by |
||
|
||
- ruby/install-deps # NB this command does save and restore of caching by default ("with-cache: false" to disable) | ||
|
||
- checkout | ||
# This CI config relies heavily on the ruby orb/image setting most of the | ||
# default config. e.g. install_deps does save/restore of caching by | ||
# default ("with-cache: false" will disable). See docs for customization: | ||
# https://circleci.com/developer/orbs/orb/circleci/ruby | ||
- ruby/install-deps: | ||
key: gems-v2 # bump this when you need to expire gem cache | ||
- persist_to_workspace: | ||
root: ~/ | ||
paths: | ||
|
@@ -61,17 +44,14 @@ jobs: | |
parallelism: 4 | ||
executor: libraries | ||
steps: | ||
- setup-ruby-env | ||
- attach_workspace: | ||
at: ~/ | ||
- ruby/rspec-test | ||
|
||
lint: | ||
parallelism: 1 | ||
executor: libraries | ||
working_directory: ~/libraries | ||
steps: | ||
- setup-ruby-env | ||
- attach_workspace: | ||
at: ~/ | ||
- run: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
3.2.5 | ||
3.2.6 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we just needed the custom debian packages below for node, so this switches to the node image