Skip to content

Commit

Permalink
Upgrade to ruby 3.0.3
Browse files Browse the repository at this point in the history
cloudfoundry/cloud_controller_ng#2619

Co-authored-by: Alex Rocha <alexr1@vmware.com>
Co-authored-by: Michael Oleske <moleske@pivotal.io>
  • Loading branch information
xandroc and moleske committed Mar 2, 2022
1 parent eb9422b commit f779972
Show file tree
Hide file tree
Showing 16 changed files with 21 additions and 15 deletions.
6 changes: 6 additions & 0 deletions .final_builds/packages/ruby-3.0.3-r0.79.0/index.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
builds:
a35952ed232904e55e6df2c61dbcb8cdc841ad0e2943cbe71deae3491046a1d8:
version: a35952ed232904e55e6df2c61dbcb8cdc841ad0e2943cbe71deae3491046a1d8
blobstore_id: 88de94d5-7a35-46f3-49a6-c2bbd044279d
sha1: sha256:19941d89d51a1f93dbeca59e60be97814bbb5e32125babc84df548646fbc6745
format-version: "2"
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.2
3.0.3
2 changes: 1 addition & 1 deletion jobs/cc_deployment_updater/spec
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ packages:
- cloud_controller_ng
- libpq
- mariadb_connector_c
- ruby-2.7.2-r0.41.0
- ruby-3.0.3-r0.79.0

consumes:
- name: database
Expand Down
2 changes: 1 addition & 1 deletion jobs/cc_route_syncer/spec
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ packages:
- cloud_controller_ng
- libpq
- mariadb_connector_c
- ruby-2.7.2-r0.41.0
- ruby-3.0.3-r0.79.0

consumes:
- name: database
Expand Down
2 changes: 1 addition & 1 deletion jobs/cloud_controller_clock/spec
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ packages:
- nginx_newrelic_plugin
- libpq
- mariadb_connector_c
- ruby-2.7.2-r0.41.0
- ruby-3.0.3-r0.79.0

consumes:
- name: database
Expand Down
2 changes: 1 addition & 1 deletion jobs/cloud_controller_ng/spec
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ packages:
- nginx_newrelic_plugin
- libpq
- mariadb_connector_c
- ruby-2.7.2-r0.41.0
- ruby-3.0.3-r0.79.0

provides:
- name: cloud_controller
Expand Down
2 changes: 1 addition & 1 deletion jobs/cloud_controller_ng/templates/shutdown_drain.rb.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/var/vcap/packages/ruby-2.7.2-r0.41.0/bin/ruby --disable-all
#!/var/vcap/packages/ruby-3.0.3-r0.79.0/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 Down
2 changes: 1 addition & 1 deletion jobs/cloud_controller_worker/spec
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ packages:
- nginx_newrelic_plugin
- libpq
- mariadb_connector_c
- ruby-2.7.2-r0.41.0
- ruby-3.0.3-r0.79.0

consumes:
- name: database
Expand Down
2 changes: 1 addition & 1 deletion jobs/rotate_cc_database_key/spec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ packages:
- cloud_controller_ng
- libpq
- mariadb_connector_c
- ruby-2.7.2-r0.41.0
- ruby-3.0.3-r0.79.0

consumes:
- name: cloud_controller_db
Expand Down
2 changes: 1 addition & 1 deletion packages/cloud_controller_ng/packaging
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-2.7.2-r0.41.0/bosh/compile.env"
source "${BOSH_PACKAGES_DIR:-/var/vcap/packages}/ruby-3.0.3-r0.79.0/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
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-2.7.2-r0.41.0
- ruby-3.0.3-r0.79.0

files:
- cloud_controller_ng/{.ruby-version,Rakefile,Gemfile,Gemfile.lock}
Expand Down
2 changes: 1 addition & 1 deletion packages/nginx_newrelic_plugin/packaging
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-2.7.2-r0.41.0/bosh/compile.env"
source "${BOSH_PACKAGES_DIR:-/var/vcap/packages}/ruby-3.0.3-r0.79.0/bosh/compile.env"

echo "Installing nginx newrelic plugin"

Expand Down
2 changes: 1 addition & 1 deletion packages/nginx_newrelic_plugin/spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: nginx_newrelic_plugin
dependencies:
- ruby-2.7.2-r0.41.0
- ruby-3.0.3-r0.79.0
files:
- nginx/newrelic_nginx_agent-1.2.1.tar.gz
2 changes: 0 additions & 2 deletions packages/ruby-2.7.2-r0.41.0/spec.lock

This file was deleted.

2 changes: 2 additions & 0 deletions packages/ruby-3.0.3-r0.79.0/spec.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name: ruby-3.0.3-r0.79.0
fingerprint: a35952ed232904e55e6df2c61dbcb8cdc841ad0e2943cbe71deae3491046a1d8
2 changes: 1 addition & 1 deletion shared_job_templates/ruby_version.sh.erb
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-2.7.2-r0.41.0/bosh/runtime.env"
source "${BOSH_PACKAGES_DIR:-/var/vcap/packages}/ruby-3.0.3-r0.79.0/bosh/runtime.env"

0 comments on commit f779972

Please sign in to comment.