Merge branch '2038-fix-bundle-install-in-gdk' into 'main'

Include gdk_bundle_install target to gdk install/update commands

Closes #2038

See merge request https://gitlab.com/gitlab-org/gitlab-development-kit/-/merge_requests/3572



Merged-by: Tiger Watson <twatson@gitlab.com>
Approved-by: Tiger Watson <twatson@gitlab.com>
Approved-by: Peter Leitzen <pleitzen@gitlab.com>
Reviewed-by: Peter Leitzen <pleitzen@gitlab.com>
Reviewed-by: Ash McKenzie <amckenzie@gitlab.com>
Reviewed-by: Nao Hashizume <nhashizume@gitlab.com>
Co-authored-by: Nao Hashizume <nhashizume@gitlab.com>

Makefile

@@ -82,6 +82,7 @@ list:
 #
 .PHONY: all
 all: preflight-checks \
+gdk_bundle_install \
 gitlab/.git \
 gitlab-shell-setup \
 gitlab-setup \
@@ -126,6 +127,7 @@ install: start-task all post-install-task start
 # Pull `gitlab` directory first, since its dependencies are linked from there.
 .PHONY: update
 update: start-task \
+gdk_bundle_install \
 gitlab/.git/pull \
 gitlab-update \
 platform-update \

lib/gdk/command/update.rb

@@ -23,12 +23,11 @@ def run(_args = [])
 
       def update!
         GDK::Hooks.with_hooks(config.gdk.update_hooks, 'gdk update') do
-          if self_update?
-            GDK.make('self-update')
-            GDK.make('self-update', 'update', env: update_env).success?
-          else
-            GDK.make('update', env: update_env).success?
-          end
+          # Run `self-update` first to make sure Makefiles are up-to-date.
+          # This ensures the next `make update` call works with the latest updates and instructions.
+          GDK.make('self-update') if self_update?
+
+          GDK.make('update', env: update_env).success?
         end
       end
 

spec/lib/gdk/command/update_spec.rb

@@ -14,7 +14,7 @@
     context 'when self-update is enabled' do
       it 'runs self-update and update' do
         expect(GDK).to receive(:make).with('self-update')
-        expect(GDK).to receive(:make).with('self-update', 'update', env: env)
+        expect(GDK).to receive(:make).with('update', env: env)
 
         subject.run
       end