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

[CHEF-10965] Fixing bundler config syntax change in bundler > v2.1 #8733

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
+7 −2
Open

[CHEF-10965] Fixing bundler config syntax change in bundler > v2.1 #8733

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2717498
removing the build callback in plan.sh
RoyShravani Jan 3, 2025
e2ba91a
removing bundle config from run hook
RoyShravani Jan 9, 2025
0d6bff5
revert
RoyShravani Jan 9, 2025
53daeb9
adding BUNDLE_APP_CONFIG env var
RoyShravani Jan 9, 2025
f063504
removing the file
RoyShravani Jan 9, 2025
a4e706f
adding local path to bundle config
RoyShravani Jan 10, 2025
f91ea45
nit
RoyShravani Jan 15, 2025
4af0c11
nit
RoyShravani Jan 15, 2025
9e9ae6e
nit
RoyShravani Jan 15, 2025
e6b1cdf
fixing ocid integration test
RoyShravani Jan 15, 2025
82ddd14
revert
RoyShravani Jan 15, 2025
c06bd23
adding exception to license scout
RoyShravani Jan 16, 2025
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
2 changes: 1 addition & 1 deletion .studio/chef-server-collection
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,4 +603,4 @@ test_if_oauthapps_are_patched_correctly() {
else
echo "OAuth App values are patched correctly"
fi
}
}
3 changes: 2 additions & 1 deletion components/automate-cs-ocid/habitat/hooks/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ cp "{{pkg.svc_config_path}}/tasks/oauth_application.rake" $(hab pkg path "chef/o

cd {{pkgPathFor "chef/oc_id"}}/oc_id

bundle config path "vendor/bundle"
# upgrading the bundle config syntax as per the latest bundler version
bundle config set --local path "vendor/bundle"

export RAILS_ENV="{{cfg.rails_env}}"
export RACK_ENV="{{cfg.rack_env}}"
Expand Down
Loading