Do not require libs on CI/CD (when providing Java only)

wttech · Dec 3, 2024 · 2d47b81 · 2d47b81
1 parent e64e89d
commit 2d47b81
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/cmd/aem/vendor.go b/cmd/aem/vendor.go
@@ -59,7 +59,7 @@ func (c *CLI) vendorPrepareCmd() *cobra.Command {
 		Short:   "Prepare vendor tools",
 		Aliases: []string{"prep", "download", "dw"},
 		Run: func(cmd *cobra.Command, args []string) {
-			changed, err := c.aem.VendorManager().PrepareWithChanged()
+			changed, err := c.aem.VendorManager().PrepareWithChanged(false)
 			if err != nil {
 				c.Error(err)
 				return

diff --git a/pkg/base.go b/pkg/base.go
@@ -38,3 +38,7 @@ func (o *BaseOpts) PrepareWithChanged() (bool, error) {
 	}
 	return changed, nil
 }
+
+func (o *BaseOpts) HasLibs() bool {
+	return pathx.Exists(o.LibDir)
+}
diff --git a/pkg/project.go b/pkg/project.go
@@ -259,7 +259,7 @@ func (p Project) InitWithChanged() (bool, error) {
 		return changed, err
 	}
 
-	vendorPrepared, err := p.aem.VendorManager().PrepareWithChanged()
+	vendorPrepared, err := p.aem.VendorManager().PrepareWithChanged(true)
 	changed = changed || vendorPrepared
 	if err != nil {
 		return changed, err

diff --git a/pkg/vendor_manager.go b/pkg/vendor_manager.go
@@ -30,7 +30,7 @@ func (vm *VendorManager) InstanceJar() (string, error) {
 	return vm.quickstart.FindDistFile()
 }
 
-func (vm *VendorManager) PrepareWithChanged() (bool, error) {
+func (vm *VendorManager) PrepareWithChanged(requireLibs bool) (bool, error) {
 	changed := false
 
 	javaChanged, err := vm.javaManager.PrepareWithChanged()
@@ -39,15 +39,17 @@ func (vm *VendorManager) PrepareWithChanged() (bool, error) {
 		return changed, err
 	}
 
-	sdk, err := vm.quickstart.IsDistSDK()
-	if err != nil {
-		return false, err
-	}
-	if sdk {
-		sdkChanged, err := vm.sdk.PrepareWithChanged()
-		changed = changed || sdkChanged
+	if requireLibs || vm.aem.baseOpts.HasLibs() {
+		sdk, err := vm.quickstart.IsDistSDK()
 		if err != nil {
-			return changed, err
+			return false, err
+		}
+		if sdk {
+			sdkChanged, err := vm.sdk.PrepareWithChanged()
+			changed = changed || sdkChanged
+			if err != nil {
+				return changed, err
+			}
 		}
 	}