Skip to content

Ruby 3.4 #517

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.

Sign up for GitHub

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

Open
sethboyles wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Ruby 3.4 #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions .final_builds/packages/ruby-3.4/index.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
builds:
aad98da8cc8e1eb18a31a24189671b844a9c799b75ab6da5fe8bcce3e04080f5:
version: aad98da8cc8e1eb18a31a24189671b844a9c799b75ab6da5fe8bcce3e04080f5
blobstore_id: ef20b1d1-d14d-4706-603f-3c6218d36188
sha1: sha256:43eee985218dcefaec2be6aabc0e7241fe9060aaea0e611ec2ac9401a3084719
format-version: "2"
2 changes: 1 addition & 1 deletion jobs/cc_deployment_updater/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ packages:
- libpq
- jemalloc
- mariadb_connector_c
- ruby-3.2
- ruby-3.4

consumes:
- name: database
Expand Down
2 changes: 1 addition & 1 deletion jobs/cloud_controller_clock/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ packages:
- libpq
- jemalloc
- mariadb_connector_c
- ruby-3.2
- ruby-3.4

consumes:
- name: database
Expand Down
2 changes: 1 addition & 1 deletion jobs/cloud_controller_ng/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ packages:
- libpq
- jemalloc
- mariadb_connector_c
- ruby-3.2
- ruby-3.4

provides:
- name: cloud_controller
Expand Down
2 changes: 1 addition & 1 deletion jobs/cloud_controller_worker/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ packages:
- libpq
- jemalloc
- mariadb_connector_c
- ruby-3.2
- ruby-3.4

consumes:
- name: database
Expand Down
4 changes: 2 additions & 2 deletions jobs/cloud_controller_worker/templates/shutdown_drain.rb.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/var/vcap/packages/ruby-3.2/bin/ruby --disable-all
#!/var/vcap/packages/ruby-3.4/bin/ruby --disable-all

$LOAD_PATH.unshift('/var/vcap/packages/cloud_controller_ng/cloud_controller_ng/app')
$LOAD_PATH.unshift('/var/vcap/packages/cloud_controller_ng/cloud_controller_ng/lib')
Expand All @@ -13,4 +13,4 @@ require 'cloud_controller/drain'
@threads << Thread.new { @drain.shutdown_delayed_worker("/var/vcap/sys/run/bpm/cloud_controller_worker/worker_#{i}.pid", @grace_period.to_i) }
end

@threads.each(&:join)
@threads.each(&:join)
2 changes: 1 addition & 1 deletion jobs/rotate_cc_database_key/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ packages:
- libpq
- jemalloc
- mariadb_connector_c
- ruby-3.2
- ruby-3.4

consumes:
- name: cloud_controller_db
Expand Down
2 changes: 1 addition & 1 deletion packages/cloud_controller_ng/packaging
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
set -e -x

# shellcheck disable=1090
source "${BOSH_PACKAGES_DIR:-/var/vcap/packages}/ruby-3.2/bosh/compile.env"
source "${BOSH_PACKAGES_DIR:-/var/vcap/packages}/ruby-3.4/bosh/compile.env"
cp -a * ${BOSH_INSTALL_TARGET}
cd ${BOSH_INSTALL_TARGET}/cloud_controller_ng

Expand Down
2 changes: 1 addition & 1 deletion packages/cloud_controller_ng/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: cloud_controller_ng
dependencies:
- libpq
- mariadb_connector_c
- ruby-3.2
- ruby-3.4

files:
- cloud_controller_ng/{.ruby-version,Rakefile,Gemfile,Gemfile.lock}
Expand Down
2 changes: 1 addition & 1 deletion packages/nginx_newrelic_plugin/packaging
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
set -ex
# shellcheck disable=1090

source "${BOSH_PACKAGES_DIR:-/var/vcap/packages}/ruby-3.2/bosh/compile.env"
source "${BOSH_PACKAGES_DIR:-/var/vcap/packages}/ruby-3.4/bosh/compile.env"

echo "Installing nginx newrelic plugin"

Expand Down
2 changes: 1 addition & 1 deletion packages/nginx_newrelic_plugin/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: nginx_newrelic_plugin
dependencies:
- ruby-3.2
- ruby-3.4
files:
- nginx/newrelic_nginx_agent-1.2.1.tar.gz
2 changes: 0 additions & 2 deletions packages/ruby-3.2/spec.lock
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions packages/ruby-3.4/spec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name: ruby-3.4
fingerprint: aad98da8cc8e1eb18a31a24189671b844a9c799b75ab6da5fe8bcce3e04080f5
2 changes: 1 addition & 1 deletion shared_job_templates/ruby_version.sh.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# shellcheck disable=1090
source "${BOSH_PACKAGES_DIR:-/var/vcap/packages}/ruby-3.2/bosh/runtime.env"
source "${BOSH_PACKAGES_DIR:-/var/vcap/packages}/ruby-3.4/bosh/runtime.env"
2 changes: 1 addition & 1 deletion spec/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,4 @@ DEPENDENCIES
rubocop-rspec_rails

BUNDLED WITH
2.4.10
2.6.6