Github actions checking out only last commit issue: Putting everything in one commitneha-p6/ruby_31_separate_gemspec

Signed-off-by: Neha Pansare <neha.pansare@progress.com>

8 files changed, 5 insertions, 8 deletions

diff --git a/.github/workflows/func_spec.yml b/.github/workflows/func_spec.yml
index 55c94663f2..3900bd1d00 100644
--- a/.github/workflows/func_spec.yml
+++ b/.github/workflows/func_spec.yml
@@ -18,8 +18,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
diff --git a/.gitignore b/.gitignore
index 72b6a46739..91ab9d6c77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,7 +81,7 @@ chef-utils/pkg
 
 # knife
 knife/.bundle
-#knife/Gemfile.lock We need this lockfile (for now) to make chef getting installed with windows gemspec under knife
+#knife/Gemfile.lock We need this lockfile (for now) so that chef gets installed with windows gemspec under knife on windows platforms.
 knife/pkg
 knife/spec/data/test-dir
 knife/spec/data/nodes
diff --git a/Gemfile.lock b/Gemfile.lock
index 1a05ae828d..478bac1906 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -85,7 +85,7 @@ PATH
       unf_ext (>= 0.0.8.2)
       uuidtools (>= 2.1.5, < 3.0)
       vault (~> 0.16)
-    chef (18.0.147-x64-mingw-ucrt) #This is ucrt gemspec for windows
+    chef (18.0.147-x64-mingw-ucrt)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
diff --git a/Rakefile b/Rakefile
index de77854f4e..ee5ffe4867 100644
--- a/Rakefile
+++ b/Rakefile
@@ -61,7 +61,7 @@ end
 
 # hack in all the preinstall tasks to occur before the traditional install task
 task install: "pre_install:all"
-# make sure we build the correct gemspec on windows
+# make sure we build the correct gemspec on windows.
 gemspec = Gem.win_platform? ? "chef-x64-mingw-ucrt" : "chef"
 
 Bundler::GemHelper.install_tasks name: gemspec
diff --git a/chef-x64-mingw-ucrt.gemspec b/chef-x64-mingw-ucrt.gemspec
index 2edfd751f9..4e099b6184 100644
--- a/chef-x64-mingw-ucrt.gemspec
+++ b/chef-x64-mingw-ucrt.gemspec
@@ -1,3 +1,4 @@
+#This is windows gemspec
 gemspec = instance_eval(File.read(File.expand_path("chef.gemspec", __dir__)))
 
 gemspec.platform = Gem::Platform.new(%w{x64-mingw-ucrt})
diff --git a/chef.gemspec b/chef.gemspec
index d745b1f5fe..5bda9867d6 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -58,7 +58,6 @@ Gem::Specification.new do |s|
   s.add_dependency "corefoundation", "~> 0.3.4" # macos_userdefaults resource
 
   s.add_dependency "proxifier", "~> 1.0"
-
   s.add_dependency "aws-sdk-s3", "~> 1.91" # s3 recipe-url support
   s.add_dependency "aws-sdk-secretsmanager", "~> 1.46"
   s.add_dependency "vault", "~> 0.16" # hashi vault official client gem
diff --git a/knife/Gemfile.lock b/knife/Gemfile.lock
index 77570f212f..b91e67f59d 100644
--- a/knife/Gemfile.lock
+++ b/knife/Gemfile.lock
@@ -1,4 +1,3 @@
-#We will keep it for now so that on bundle install knife can pickup windows gemspec under chef
 PATH
   remote: ..
   specs:
diff --git a/post-bundle-install.rb b/post-bundle-install.rb
index 891fa5e507..3469352a08 100644
--- a/post-bundle-install.rb
+++ b/post-bundle-install.rb
@@ -17,7 +17,7 @@ Dir["#{gem_home}/bundler/gems/*"].each do |gempath|
 
   next unless gem_name
 
-  # FIXME: should omit the gem which is in the current directory and not hard code chef
+  # FIXME: should omit the gem which is in the current directory and not hard code for chef
   next if %w{chef chef-x64-mingw-ucrt}.include?(gem_name)
 
   puts "re-installing #{gem_name}..."