Rebranding Change and the new version and change.log file #11
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 1.0.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ $ErrorActionPreference = "Stop" | |
| $PSDefaultParameterValues['*:ErrorAction']='Stop' | ||
|
|
||
| $env:HAB_BLDR_CHANNEL = "LTS-2024" | ||
| $pkg_name="chef-test-kitchen-enterprise" | ||
| $pkg_origin="chef" | ||
| $pkg_version=$(Get-Content "$PLAN_CONTEXT/../VERSION") | ||
| $pkg_maintainer="The Chef Maintainers <[email protected]>" | ||
|
|
@@ -44,12 +44,12 @@ function Invoke-Build { | |
| bundle config --local silence_root_warning 1 | ||
| Write-BuildLine " ** Using bundler to retrieve the Ruby dependencies" | ||
| bundle install | ||
| bundle lock --local | ||
| gem build chef-test-kitchen-enterprise.gemspec | ||
| Write-BuildLine " ** Using gem to install" | ||
| gem install chef-test-kitchen-enterprise*.gem --no-document | ||
|
|
||
| ruby ./post-bundle-install.rb | ||
| If ($lastexitcode -ne 0) { Exit $lastexitcode } | ||
| } finally { | ||
| Pop-Location | ||
|
|
@@ -65,11 +65,11 @@ function Invoke-Install { | |
| try { | ||
| Push-Location $pkg_prefix | ||
| bundle config --local gemfile $project_root/Gemfile | ||
| Write-BuildLine "** generating binstubs for chef-test-kitchen-enterprise with precise version pins" | ||
| Write-BuildLine "** generating binstubs for chef-test-kitchen-enterprise with precise version pins $project_root $pkg_prefix/bin " | ||
| Invoke-Expression -Command "appbundler.bat $project_root $pkg_prefix/bin chef-test-kitchen-enterprise" | ||
| If ($lastexitcode -ne 0) { Exit $lastexitcode } | ||
| Write-BuildLine " ** Running the chef-test-kitchen-enterprise project's 'rake install' to install the path-based gems so they look like any other installed gem." | ||
|
|
||
| If ($lastexitcode -ne 0) { Exit $lastexitcode } | ||
| } finally { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| export HAB_BLDR_CHANNEL="LTS-2024" | ||
| _chef_client_ruby="core/ruby3_1" | ||
| pkg_name="chef-test-kitchen-enterprise" | ||
| pkg_origin="chef" | ||
| pkg_maintainer="The Chef Maintainers <[email protected]>" | ||
| pkg_description="The Chef Test Kitchen" | ||
|
|
@@ -11,111 +11,72 @@ pkg_bin_dirs=( | |
| ) | ||
| pkg_build_deps=( | ||
| core/make | ||
| core/bash | ||
| core/gcc | ||
| ) | ||
| pkg_deps=( | ||
| $_chef_client_ruby | ||
| core/coreutils | ||
| core/git | ||
| ) | ||
| pkg_svc_user=root | ||
|
|
||
| pkg_version() { | ||
| cat "$SRC_PATH/VERSION" | ||
| } | ||
|
|
||
| do_before() { | ||
| update_pkg_version | ||
| } | ||
|
|
||
| do_unpack() { | ||
| mkdir -pv "$HAB_CACHE_SRC_PATH/$pkg_dirname" | ||
| cp -RT "$PLAN_CONTEXT"/.. "$HAB_CACHE_SRC_PATH/$pkg_dirname/" | ||
| } | ||
|
|
||
| do_build() { | ||
| echo $(pkg_path_for $_chef_client_ruby) | ||
| export GEM_HOME="$pkg_prefix/vendor/gems" | ||
|
|
||
| build_line "Setting GEM_PATH=$GEM_HOME" | ||
| export GEM_PATH="$GEM_HOME" | ||
| bundle config --local without integration deploy maintenance | ||
| bundle config --local jobs 4 | ||
| bundle config --local retry 5 | ||
| bundle config --local silence_root_warning 1 | ||
| bundle install | ||
| ruby ./post-bundle-install.rb | ||
| gem build chef-test-kitchen-enterprise.gemspec | ||
| } | ||
|
|
||
| do_install() { | ||
| export GEM_HOME="$pkg_prefix/vendor/gems" | ||
|
|
||
| build_line "Setting GEM_PATH=$GEM_HOME" | ||
| export GEM_PATH="$GEM_HOME" | ||
| gem install chef-test-kitchen-enterprise-*.gem --no-document | ||
| wrap_ruby_bin | ||
| set_runtime_env "GEM_PATH" "${pkg_prefix}/vendor/gems" | ||
| } | ||
|
|
||
| wrap_ruby_bin() { | ||
| local bin="$pkg_prefix/bin/kitchen" | ||
| local real_bin="$GEM_HOME/gems/chef-test-kitchen-enterprise-${pkg_version}/bin/kitchen" | ||
| build_line "Adding wrapper $bin to $real_bin" | ||
| cat <<EOF > "$bin" | ||
| #!$(pkg_path_for core/bash)/bin/bash | ||
| set -e | ||
|
|
||
| # Set binary path that allows chef-test-kitchen-enterprise to use non-Hab pkg binaries | ||
| export PATH="/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin:/usr/bin:/bin:\$PATH" | ||
|
|
||
| # Set Ruby paths defined from 'do_setup_environment()' | ||
| export GEM_HOME="$pkg_prefix/vendor/gems" | ||
|
|
||
| export GEM_PATH="$GEM_HOME" | ||
| exec $(pkg_path_for $_chef_client_ruby)/bin/ruby $real_bin \$@ | ||
| EOF | ||
| chmod -v 755 "$bin" | ||
| } | ||
|
|
||
| do_strip() { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,5 +16,5 @@ | |
| # limitations under the License. | ||
|
|
||
| module Kitchen | ||
| VERSION = "1.0.0".freeze | ||
| end | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| #!/usr/bin/env ruby | ||
|
|
||
| gem_home = Gem.paths.home | ||
|
|
||
| puts "fixing bundle installed gems in #{gem_home}" | ||
|
|
||
| # Install gems from git repos. This makes the assumption that there is a <gem_name>.gemspec and | ||
| # you can simply gem build + gem install the resulting gem, so nothing fancy. This does not use | ||
| # rake install since we need --conservative --minimal-deps in order to not install duplicate gems. | ||
| # | ||
| # | ||
| puts "gem path #{gem_home}" | ||
|
|
||
| Dir["#{gem_home}/bundler/gems/*"].each do |gempath| | ||
| puts "#{gempath}" | ||
| matches = File.basename(gempath).match(/.*-[A-Fa-f0-9]{12}/) | ||
| next unless matches | ||
| gem_name = File.basename(Dir["#{gempath}/*.gemspec"].first, ".gemspec") | ||
| # FIXME: should strip any valid ruby platform off of the gem_name if it matches | ||
|
|
||
| next unless gem_name | ||
|
|
||
| puts "re-installing #{gem_name}..." | ||
|
|
||
| Dir.chdir(gempath) do | ||
| system("gem build #{gem_name}.gemspec") or raise "gem build failed" | ||
| system("gem install #{gem_name}*.gem --conservative --minimal-deps --no-document") or raise "gem install failed" | ||
| end | ||
|
|
||
| end | ||
Empty file.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why thor needs to be downgraded?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
inspec-core or train-core gem giving error with upgraded version
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add the comments why we downgraded that so that we can track it