Skip to content

Commit 2d47b81

Browse files
Do not require libs on CI/CD (when providing Java only)
1 parent e64e89d commit 2d47b81

File tree

4 files changed

+17
-11
lines changed

4 files changed

+17
-11
lines changed

cmd/aem/vendor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func (c *CLI) vendorPrepareCmd() *cobra.Command {
5959
Short: "Prepare vendor tools",
6060
Aliases: []string{"prep", "download", "dw"},
6161
Run: func(cmd *cobra.Command, args []string) {
62-
changed, err := c.aem.VendorManager().PrepareWithChanged()
62+
changed, err := c.aem.VendorManager().PrepareWithChanged(false)
6363
if err != nil {
6464
c.Error(err)
6565
return

pkg/base.go

+4
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,7 @@ func (o *BaseOpts) PrepareWithChanged() (bool, error) {
3838
}
3939
return changed, nil
4040
}
41+
42+
func (o *BaseOpts) HasLibs() bool {
43+
return pathx.Exists(o.LibDir)
44+
}

pkg/project.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ func (p Project) InitWithChanged() (bool, error) {
259259
return changed, err
260260
}
261261

262-
vendorPrepared, err := p.aem.VendorManager().PrepareWithChanged()
262+
vendorPrepared, err := p.aem.VendorManager().PrepareWithChanged(true)
263263
changed = changed || vendorPrepared
264264
if err != nil {
265265
return changed, err

pkg/vendor_manager.go

+11-9
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func (vm *VendorManager) InstanceJar() (string, error) {
3030
return vm.quickstart.FindDistFile()
3131
}
3232

33-
func (vm *VendorManager) PrepareWithChanged() (bool, error) {
33+
func (vm *VendorManager) PrepareWithChanged(requireLibs bool) (bool, error) {
3434
changed := false
3535

3636
javaChanged, err := vm.javaManager.PrepareWithChanged()
@@ -39,15 +39,17 @@ func (vm *VendorManager) PrepareWithChanged() (bool, error) {
3939
return changed, err
4040
}
4141

42-
sdk, err := vm.quickstart.IsDistSDK()
43-
if err != nil {
44-
return false, err
45-
}
46-
if sdk {
47-
sdkChanged, err := vm.sdk.PrepareWithChanged()
48-
changed = changed || sdkChanged
42+
if requireLibs || vm.aem.baseOpts.HasLibs() {
43+
sdk, err := vm.quickstart.IsDistSDK()
4944
if err != nil {
50-
return changed, err
45+
return false, err
46+
}
47+
if sdk {
48+
sdkChanged, err := vm.sdk.PrepareWithChanged()
49+
changed = changed || sdkChanged
50+
if err != nil {
51+
return changed, err
52+
}
5153
}
5254
}
5355

0 commit comments

Comments
 (0)