diff --git a/.final_builds/packages/ruby-3.4/index.yml b/.final_builds/packages/ruby-3.4/index.yml new file mode 100644 index 0000000000..30b6fb9373 --- /dev/null +++ b/.final_builds/packages/ruby-3.4/index.yml @@ -0,0 +1,6 @@ +builds: + aad98da8cc8e1eb18a31a24189671b844a9c799b75ab6da5fe8bcce3e04080f5: + version: aad98da8cc8e1eb18a31a24189671b844a9c799b75ab6da5fe8bcce3e04080f5 + blobstore_id: ef20b1d1-d14d-4706-603f-3c6218d36188 + sha1: sha256:43eee985218dcefaec2be6aabc0e7241fe9060aaea0e611ec2ac9401a3084719 +format-version: "2" diff --git a/jobs/cc_deployment_updater/spec b/jobs/cc_deployment_updater/spec index 641a812b51..5874d3ba2a 100644 --- 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.4 consumes: - name: database diff --git a/jobs/cloud_controller_clock/spec b/jobs/cloud_controller_clock/spec index 990c7f7070..cdd7754f21 100644 --- 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.4 consumes: - name: database diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec index 7d2a536b66..4fd4171a91 100644 --- 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.4 provides: - name: cloud_controller diff --git a/jobs/cloud_controller_worker/spec b/jobs/cloud_controller_worker/spec index c6685c4427..cd88a1050b 100644 --- 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.4 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 index 6a1c77fd4a..5de237db5a 100644 --- 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.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') @@ -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) \ No newline at end of file +@threads.each(&:join) diff --git a/jobs/rotate_cc_database_key/spec b/jobs/rotate_cc_database_key/spec index bd5fc127b8..19205161cd 100644 --- 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.4 consumes: - name: cloud_controller_db diff --git a/packages/cloud_controller_ng/packaging b/packages/cloud_controller_ng/packaging index 7acfd0bf0a..7e56f0a67f 100644 --- 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.4/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 index 29abcce460..02d6e9b373 100644 --- 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.4 files: - cloud_controller_ng/{.ruby-version,Rakefile,Gemfile,Gemfile.lock} diff --git a/packages/nginx_newrelic_plugin/packaging b/packages/nginx_newrelic_plugin/packaging index 31bd497b4e..d9470e41fa 100644 --- 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.4/bosh/compile.env" echo "Installing nginx newrelic plugin" diff --git a/packages/nginx_newrelic_plugin/spec b/packages/nginx_newrelic_plugin/spec index fb16ba5699..5a8b9ece06 100644 --- 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.4 files: - nginx/newrelic_nginx_agent-1.2.1.tar.gz diff --git a/packages/ruby-3.2/spec.lock b/packages/ruby-3.2/spec.lock deleted file mode 100644 index 1689b2d4b6..0000000000 --- a/packages/ruby-3.2/spec.lock +++ /dev/null @@ -1,2 +0,0 @@ -name: ruby-3.2 -fingerprint: 126f7d46f9a7ca674355d77071274e1c167651c4bb104244370c505faf99f00b diff --git a/packages/ruby-3.4/spec.lock b/packages/ruby-3.4/spec.lock new file mode 100644 index 0000000000..29aefcf8be --- /dev/null +++ b/packages/ruby-3.4/spec.lock @@ -0,0 +1,2 @@ +name: ruby-3.4 +fingerprint: aad98da8cc8e1eb18a31a24189671b844a9c799b75ab6da5fe8bcce3e04080f5 diff --git a/shared_job_templates/ruby_version.sh.erb b/shared_job_templates/ruby_version.sh.erb index ee36d0920d..ec6333f4f6 100644 --- 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.4/bosh/runtime.env" diff --git a/spec/Gemfile.lock b/spec/Gemfile.lock index 7d4a78ce9f..57b7b735a4 100644 --- a/spec/Gemfile.lock +++ b/spec/Gemfile.lock @@ -73,4 +73,4 @@ DEPENDENCIES rubocop-rspec_rails BUNDLED WITH - 2.4.10 + 2.6.6