Upgrade Ruby to 3.3

sethboyles · sethboyles · commit 95a4e64a8e4b · 2025-03-25T14:46:44.000-07:00
diff --git a/.final_builds/packages/ruby-3.3/index.yml b/.final_builds/packages/ruby-3.3/index.yml
@@ -0,0 +1,6 @@
+builds:
+  66254aa852dfb5ff4bd3b0dea5f5b8ffb9f7322a2d80649ae7154a4a091821cb:
+    version: 66254aa852dfb5ff4bd3b0dea5f5b8ffb9f7322a2d80649ae7154a4a091821cb
+    blobstore_id: 0d880d79-493f-451b-5d7d-dc879f6fbaf6
+    sha1: sha256:a5b268e7ebbf32e31aae3e4621edc45c2d173e1fb6a22253a340c172201cdcf7
+format-version: "2"
diff --git a/jobs/cc_deployment_updater/spec b/jobs/cc_deployment_updater/spec
@@ -34,7 +34,7 @@ packages:
   - libpq
   - jemalloc
   - mariadb_connector_c
-  - ruby-3.2
+  - ruby-3.3
 
 consumes:
 - name: database
diff --git a/jobs/cloud_controller_clock/spec b/jobs/cloud_controller_clock/spec
@@ -34,7 +34,7 @@ packages:
   - libpq
   - jemalloc
   - mariadb_connector_c
-  - ruby-3.2
+  - ruby-3.3
 
 consumes:
 - name: database
diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec
@@ -73,7 +73,7 @@ packages:
   - libpq
   - jemalloc
   - mariadb_connector_c
-  - ruby-3.2
+  - ruby-3.3
 
 provides:
 - name: cloud_controller
diff --git a/jobs/cloud_controller_ng/templates/shutdown_drain.rb.erb b/jobs/cloud_controller_ng/templates/shutdown_drain.rb.erb
@@ -1,4 +1,4 @@
-#!/var/vcap/packages/ruby-3.2/bin/ruby --disable-all
+#!/var/vcap/packages/ruby-3.3/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')
diff --git a/jobs/cloud_controller_worker/spec b/jobs/cloud_controller_worker/spec
@@ -44,7 +44,7 @@ packages:
   - libpq
   - jemalloc
   - mariadb_connector_c
-  - ruby-3.2
+  - ruby-3.3
 
 consumes:
 - name: database
diff --git a/jobs/cloud_controller_worker/templates/shutdown_drain.rb.erb b/jobs/cloud_controller_worker/templates/shutdown_drain.rb.erb
@@ -1,4 +1,4 @@
-#!/var/vcap/packages/ruby-3.2/bin/ruby --disable-all
+#!/var/vcap/packages/ruby-3.3/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')
diff --git a/jobs/rotate_cc_database_key/spec b/jobs/rotate_cc_database_key/spec
@@ -16,7 +16,7 @@ packages:
   - libpq
   - jemalloc
   - mariadb_connector_c
-  - ruby-3.2
+  - ruby-3.3
 
 consumes:
 - name: cloud_controller_db
diff --git a/packages/cloud_controller_ng/packaging b/packages/cloud_controller_ng/packaging
@@ -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.3/bosh/compile.env"
 cp -a * ${BOSH_INSTALL_TARGET}
 cd ${BOSH_INSTALL_TARGET}/cloud_controller_ng
 
diff --git a/packages/cloud_controller_ng/spec b/packages/cloud_controller_ng/spec
@@ -3,7 +3,7 @@ name: cloud_controller_ng
 dependencies:
 - libpq
 - mariadb_connector_c
-- ruby-3.2
+- ruby-3.3
 
 files:
 - cloud_controller_ng/{.ruby-version,Rakefile,Gemfile,Gemfile.lock}
diff --git a/packages/nginx_newrelic_plugin/packaging b/packages/nginx_newrelic_plugin/packaging
@@ -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.3/bosh/compile.env"
 
 echo "Installing nginx newrelic plugin"
 
diff --git a/packages/nginx_newrelic_plugin/spec b/packages/nginx_newrelic_plugin/spec
@@ -1,6 +1,6 @@
 ---
 name: nginx_newrelic_plugin
 dependencies:
-- ruby-3.2
+- ruby-3.3
 files:
 - nginx/newrelic_nginx_agent-1.2.1.tar.gz
diff --git a/packages/ruby-3.3/spec.lock b/packages/ruby-3.3/spec.lock
@@ -0,0 +1,2 @@
+name: ruby-3.3
+fingerprint: 66254aa852dfb5ff4bd3b0dea5f5b8ffb9f7322a2d80649ae7154a4a091821cb
diff --git a/shared_job_templates/ruby_version.sh.erb b/shared_job_templates/ruby_version.sh.erb
@@ -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.3/bosh/runtime.env"
diff --git a/src/code.cloudfoundry.org/cc-uploader b/src/code.cloudfoundry.org/cc-uploader
@@ -1 +1 @@
-Subproject commit fdce82697d4826139edb3e7246abcf0ae8f410f1
+Subproject commit 81b660bad6d60e7a7f91038f32e23c7f5b53f064
diff --git a/src/code.cloudfoundry.org/tps b/src/code.cloudfoundry.org/tps
@@ -1 +1 @@
-Subproject commit 0e3cad2e11eea85a1c2325d4197c761ed86a7575
+Subproject commit 43187a2c4468b10334f14c8a587bfb492f093ead
diff --git a/src/github.com/cloudfoundry/blobstore_url_signer b/src/github.com/cloudfoundry/blobstore_url_signer
@@ -1 +1 @@
-Subproject commit 732a7668932591a7a13aad128912f9b0cfd59e13
+Subproject commit 86e19cc30474653e65c626a3f6f633b925997930

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/var/vcap/packages/ruby-3.2/bin/ruby --disable-all`
	`1`	`+#!/var/vcap/packages/ruby-3.3/bin/ruby --disable-all`
`2`	`2`
`3`	`3`	`$LOAD_PATH.unshift('/var/vcap/packages/cloud_controller_ng/cloud_controller_ng/app')`
`4`	`4`	`$LOAD_PATH.unshift('/var/vcap/packages/cloud_controller_ng/cloud_controller_ng/lib')`