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

Use Ruby 3.3.6 #9191

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
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
13 changes: 7 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ commands:
default: ""
steps:
- restore_cache:
key: circleci-docs-v1-{{ .Branch }}-<< parameters.dir >>-{{ checksum "Gemfile.lock" }}
key: circleci-docs-v2-{{ .Branch }}-<< parameters.dir >>-{{ checksum "Gemfile.lock" }}
- run:
name: Install Ruby dependencies
command:
Expand All @@ -56,9 +56,10 @@ commands:
fi
#cmake is needed fo rugged, a gem dependency
sudo apt-get update && sudo apt-get install -y cmake
bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
bundle config set path 'vendor/bundle'
bundle check || bundle install --jobs=4 --retry=3
- save_cache:
key: circleci-docs-v1-{{ .Branch }}-<< parameters.dir >>-{{ checksum "Gemfile.lock" }}
key: circleci-docs-v2-{{ .Branch }}-<< parameters.dir >>-{{ checksum "Gemfile.lock" }}
paths:
- "vendor/bundle"
- "<< parameters.dir >>/vendor/bundle"
Expand Down Expand Up @@ -150,7 +151,7 @@ jobs:
build_api_docs: # a job to manage building our api documentation and persisting it to the workspace.
executor:
name: ruby/default
tag: '3.1.3-browsers'
tag: '3.3.6-browsers'
steps:
- checkout
- *attach_workspace
Expand Down Expand Up @@ -186,7 +187,7 @@ jobs:
build:
executor:
name: ruby/default
tag: '3.1.3-browsers'
tag: '3.3.6-browsers'
resource_class: medium+
working_directory: ~/circleci-docs
environment:
Expand Down Expand Up @@ -260,7 +261,7 @@ jobs:
reindex-search:
executor:
name: ruby/default
tag: '3.1.3-browsers'
tag: '3.3.6-browsers'
working_directory: ~/circleci-docs
environment:
JEKYLL_ENV: production
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.3
3.3.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.1.3
FROM ruby:3.3.6

RUN apt update -y
RUN apt-get install -y cmake pkg-config
Expand Down
6 changes: 5 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

ruby '3.1.3'
ruby '3.3.6'

gem "jekyll", '~> 4.3.0', github: "jekyll/jekyll"
gem 'html-proofer'
Expand All @@ -24,3 +24,7 @@ group :test, :development do
gem 'pronto'
gem 'pronto-markdownlint'
end

gem "base64", "~> 0.2.0"

gem "faraday-retry", "~> 2.2"
46 changes: 27 additions & 19 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ GEM
console (~> 1.26)
fiber-annotation
io-event (~> 1.6, >= 1.6.5)
base64 (0.2.0)
bigdecimal (3.1.9)
colorator (1.1.0)
concurrent-ruby (1.3.4)
Expand All @@ -61,20 +62,23 @@ GEM
ethon (0.16.0)
ffi (>= 1.15.0)
eventmachine (1.2.7)
faraday (1.3.1)
faraday-net_http (~> 1.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords (>= 0.0.4)
faraday-net_http (1.0.2)
faraday (2.12.2)
faraday-net_http (>= 2.0, < 3.5)
json
logger
faraday-net_http (3.4.0)
net-http (>= 0.5.0)
faraday-retry (2.2.1)
faraday (~> 2.0)
ffi (1.17.0)
fiber-annotation (0.2.0)
fiber-local (1.1.0)
fiber-storage
fiber-storage (1.0.0)
filesize (0.2.0)
forwardable-extended (2.6.0)
gitlab (4.8.0)
httparty (>= 0.14.0)
gitlab (4.20.1)
httparty (~> 0.20)
terminal-table (>= 1.5.1)
hashery (2.1.2)
html-proofer (5.0.9)
Expand Down Expand Up @@ -125,18 +129,20 @@ GEM
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
logger (1.6.5)
mercenary (0.4.0)
mini_mime (1.1.5)
mini_portile2 (2.8.8)
multi_xml (0.7.1)
bigdecimal (~> 3.1)
multipart-post (2.1.1)
net-http (0.6.0)
uri
nokogiri (1.18.1)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
octokit (4.20.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
octokit (9.2.0)
faraday (>= 1, < 3)
sawyer (~> 0.9)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
pdf-reader (2.12.0)
Expand All @@ -162,25 +168,25 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rexml (3.3.9)
rexml (3.4.0)
rouge (3.30.0)
ruby-rc4 (0.1.5)
ruby2_keywords (0.0.5)
rugged (1.0.1)
rugged (1.9.0)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
sawyer (0.8.2)
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
faraday (>= 0.17.3, < 3)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thor (1.1.0)
thor (1.3.2)
ttfunk (1.8.0)
bigdecimal (~> 3.1)
typhoeus (1.4.1)
ethon (>= 0.9.0)
unicode-display_width (2.6.0)
uri (1.0.2)
verbal_expressions (0.1.5)
webrick (1.8.2)
yell (2.2.2)
Expand All @@ -191,7 +197,9 @@ PLATFORMS

DEPENDENCIES
asciidoctor
base64 (~> 0.2.0)
dotenv
faraday-retry (~> 2.2)
html-proofer
htmlcompressor
htmlentities (~> 4.3, >= 4.3.4)
Expand All @@ -208,7 +216,7 @@ DEPENDENCIES
rake

RUBY VERSION
ruby 3.1.3p185
ruby 3.3.6p108

BUNDLED WITH
2.5.17
2.5.22
2 changes: 1 addition & 1 deletion src-api/Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ruby '3.1.3'
ruby '3.3.6'
source 'https://rubygems.org'

# Middleman
Expand Down
4 changes: 2 additions & 2 deletions src-api/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ DEPENDENCIES
webrick

RUBY VERSION
ruby 3.1.3p185
ruby 3.3.6p108

BUNDLED WITH
2.1.4
2.5.22