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.

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

[WIP]CHEF-12767 Upgrade oc-id to use ruby 3.4 #3967

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

[WIP]CHEF-12767 Upgrade oc-id to use ruby 3.4 #3967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0050e52
pointing to LTS channel for core deps
RoyShravani Oct 28, 2024
ade2a8a
adding LTS-2024 packages
RoyShravani Dec 19, 2024
b8fca04
upgrading to ruby3_4
RoyShravani Dec 23, 2024
4701683
adding pg-client as a dependency
RoyShravani Dec 26, 2024
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: 13 additions & 0 deletions .expeditor/build.habitat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
---
env:
HAB_BLDR_CHANNEL: "LTS-2024"
HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024"
HAB_FALLBACK_CHANNEL: "LTS-2024"

origin: chef
smart_build: false
studio_secrets:
HAB_BLDR_CHANNEL:
value: "LTS-2024"
HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL:
value: "LTS-2024"
HAB_FALLBACK_CHANNEL:
value: "LTS-2024"


1 change: 1 addition & 0 deletions .expeditor/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,3 +129,4 @@ artifact_channels:
- unstable
- current
- stable
- LTS-2024
4 changes: 2 additions & 2 deletions .expeditor/create_manifest.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def get_latest(channel, origin, name)
def get_hab_deps_latest()
ret = {}
["hab", "hab-sup", "hab-launcher"].each do |name|
d = get_latest("stable", "core", name)
d = get_latest("LTS-2024", "core", name)
ret[name] = "#{d["origin"]}/#{d["name"]}/#{d["version"]}/#{d["release"]}"
end
ret
Expand Down Expand Up @@ -78,7 +78,7 @@ def get_hab_deps_latest()
# that were part of the build group. Pulling from unstable means
# that we might include packages that were built as part of an
# ad-hoc run of the pipeline or a concurrently running build.
latest_release = get_latest("unstable", pkg_origin, pkg_name)
latest_release = get_latest("LTS-2024", pkg_origin, pkg_name)

pkg_version = latest_release["version"]
pkg_release = latest_release["release"]
Expand Down
2 changes: 1 addition & 1 deletion .license_scout.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ habitat:
- origin: chef
channel: unstable
- origin: core
channel: stable
channel: LTS-2024

allowed_licenses:
- Apache-1.0
Expand Down
12 changes: 8 additions & 4 deletions src/oc-id/habitat/plan.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ pkg_origin=chef
pkg_maintainer="The Chef Server Maintainers <[email protected]>"
pkg_license=('Apache-2.0')
pkg_deps=(
core/sqitch_pg
core/sqitch
core/postgresql17-client
core/curl
core/node14
core/ruby31/3.1.6/20240912144513
core/node
core/ruby3_4
core/rsync
core/sed
core/libffi
Expand Down Expand Up @@ -102,7 +103,10 @@ do_install() {
--with-xml2-lib=$(pkg_path_for core/libxml2)/lib \
--with-xslt-include=$(pkg_path_for core/libxslt)/include/libxslt \
--with-xslt-lib=$(pkg_path_for core/libxslt)/lib
bundle install --path "${HOME}/vendor/bundle" --binstubs="${HOME}/bin" --shebang ruby --deployment
bundle config set path "${HOME}/vendor/bundle"
bundle config set deployment 'true'
bundle config set --local shebang 'ruby'
bundle install --binstubs="${HOME}/bin"
# fix tzdata location
echo "Adding core/tzdata zoneinfo search path to tzinfo gem"
grep -l DEFAULT_SEARCH_PATH $HOME/vendor/bundle/ruby/*/gems/tzinfo*/lib/tzinfo/zoneinfo_data_source.rb | while read -r f; do
Expand Down
Loading