Skip to content
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 8 commits into from
Jan 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 9 additions & 29 deletions .circleci/config.yml
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
Copy link
Contributor Author

@tiegz tiegz Jan 4, 2025

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

environment:
PGHOST: 127.0.0.1
PGUSER: postgres
Expand All @@ -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
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is already set by ruby/install-deps


- 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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.5
3.2.6
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.2.5
FROM ruby:3.2.6
RUN apt-get update -qq && apt-get install -y build-essential libpq-dev libxml2-dev libxslt1-dev nodejs libicu-dev cmake git
RUN curl -sSL https://sdk.cloud.google.com | CLOUDSDK_INSTALL_DIR=/usr/local bash
ENV PATH $PATH:/usr/local/google-cloud-sdk/bin
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

source "https://rubygems.org"
ruby "3.2.5"
ruby "3.2.6"

gem "active_model_serializers"
gem "api-pagination"
Expand Down
Loading