fix(action): Correctly use new manifest element (#2123)

Reviewed-by: Alexander Jung <[email protected]> Approved-by: Alexander Jung <[email protected]>
unikraft · Jan 31, 2025 · 1197f28 · 1197f28
2 parents e75394b + 8839014
commit 1197f28
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/tools/github-action/go.mod b/tools/github-action/go.mod
@@ -10,7 +10,7 @@ require (
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/api v0.32.0
 	k8s.io/apimachinery v0.32.1
-	kraftkit.sh v0.9.5-0.20250127160813-2add33327d90
+	kraftkit.sh v0.10.2-0.20250131133505-e75394b1d8dd
 )
 
 require (
@@ -123,7 +123,7 @@ require (
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/gofrs/flock v0.12.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/glog v1.2.2 // indirect
+	github.com/golang/glog v1.2.4 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v0.0.4 // indirect

diff --git a/tools/github-action/go.sum b/tools/github-action/go.sum
@@ -586,8 +586,8 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69
 github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
 github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/glog v1.2.2 h1:1+mZ9upx1Dh6FmUTFR1naJ77miKiXgALjWOZ3NVFPmY=
-github.com/golang/glog v1.2.2/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
+github.com/golang/glog v1.2.4 h1:CNNw5U8lSiiBk7druxtSHHTsRWcxKoac6kZKm2peBBc=
+github.com/golang/glog v1.2.4/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -1749,8 +1749,8 @@ k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
 k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
 k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-kraftkit.sh v0.9.5-0.20250127160813-2add33327d90 h1:b9PfEus0545KBhsK7dOvjnI8vC2GYdXYwADS5I4JN2g=
-kraftkit.sh v0.9.5-0.20250127160813-2add33327d90/go.mod h1:V8EyDUNZj7qhmKi+4RfSax5JnEqn7J1quTd/7422bwY=
+kraftkit.sh v0.10.2-0.20250131133505-e75394b1d8dd h1:SoEln53VqOXhxnJw+rGugz8o91ThxRQ2+kM//aedSlE=
+kraftkit.sh v0.10.2-0.20250131133505-e75394b1d8dd/go.mod h1:GYc0EZDSwqin3wAEwEh5cgnKeexAA/i69S0EaQQZZJU=
 oras.land/oras-go/v2 v2.5.0 h1:o8Me9kLY74Vp5uw07QXPiitjsw7qNXi8Twd+19Zf02c=
 oras.land/oras-go/v2 v2.5.0/go.mod h1:z4eisnLP530vwIOUOJeBIj0aGI0L1C3d53atvCBqZHg=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

diff --git a/tools/github-action/main.go b/tools/github-action/main.go
@@ -147,11 +147,6 @@ func (opts *GithubAction) Run(ctx context.Context, args []string) (err error) {
 		}
 	}
 
-	manifest.ForceGit = opts.ForceGit
-	if opts.GitCloneDepth > 0 {
-		manifest.Depth = opts.GitCloneDepth
-	}
-
 	// If the `run` attribute has been set, only execute this.
 	runScript := fmt.Sprintf("%s/.kraftkit/run.sh", workspace)
 	if _, err := os.Stat(runScript); err == nil {
@@ -208,6 +203,11 @@ func (opts *GithubAction) Run(ctx context.Context, args []string) (err error) {
 		return fmt.Errorf("could not initialize project directory: %w", err)
 	}
 
+	manifest.ForceGit = opts.ForceGit
+	if opts.GitCloneDepth > 0 {
+		manifest.GitCloneDepth = opts.GitCloneDepth
+	}
+
 	if opts.project.Template() != nil {
 		// All the components of a Unikraft unikernel build begin as remote packages
 		// which need fetch.  The first package which we need to fetch is the template