Merge pull request #18 from xmudrii/fix-gopkg-path

Use proper path for GOPATH/pkg cache

Author: kcp-ci-bot

artifacts/scripts/util.sh

@@ -952,7 +952,7 @@ checkout-deps-to-kube-commit() {
             local mod_major=$(gomod-module-major)
             local cache_dir="${GOPATH}/pkg/mod/cache/download/${base_package}/${dep}/@v"
             if [ "${mod_major}" != "v0" ] && [ "${mod_major}" != "v1" ]; then
-                cache_dir="${GOPATH}/pkg/mod/cache/download/${base_package}/${dep}/@v/${mod_major}"
+                cache_dir="${GOPATH}/pkg/mod/cache/download/${base_package}/${dep}/${mod_major}/@v"
             fi
 
             if [ -f "${cache_dir}/list" ] && grep -q "${pseudo_version}" "${cache_dir}/list"; then

cmd/gomod-zip/zip.go

@@ -72,7 +72,7 @@ func main() {
 	packagePath := fmt.Sprintf("%s/src/%s", os.Getenv("GOPATH"), *packageName)
 	cacheDir := fmt.Sprintf("%s/pkg/mod/cache/download/%s/@v", os.Getenv("GOPATH"), *packageName)
 	if pseudoSemver.Major >= 2 {
-		cacheDir = fmt.Sprintf("%s/v%d", cacheDir, pseudoSemver.Major)
+		cacheDir = fmt.Sprintf("%s/pkg/mod/cache/download/%s/v%d/@v", os.Getenv("GOPATH"), *packageName, pseudoSemver.Major)
 	}
 
 	moduleFile, err := getModuleFile(packagePath, *pseudoVersion)

cmd/sync-tags/gomod.go

@@ -214,7 +214,7 @@ func packageDepToGoModCache(depPath, depPkg, commit, pseudoVersionOrTag string,
 
 	cacheDir := fmt.Sprintf("%s/pkg/mod/cache/download/%s/@v", os.Getenv("GOPATH"), depPkg)
 	if pseudoSemver.Major >= 2 {
-		cacheDir = fmt.Sprintf("%s/v%d", cacheDir, pseudoSemver.Major)
+		cacheDir = fmt.Sprintf("%s/pkg/mod/cache/download/%s/v%d/@v", os.Getenv("GOPATH"), depPkg, pseudoSemver.Major)
 	}
 
 	goModFile := fmt.Sprintf("%s/%s.mod", cacheDir, pseudoVersionOrTag)

cmd/sync-tags/main.go

@@ -589,7 +589,7 @@ func cleanCacheForTag(tag string) error {
 
 	cacheDir := fmt.Sprintf("%s/pkg/mod/cache/download/%s/@v", os.Getenv("GOPATH"), pkg)
 	if pseudoSemver.Major >= 2 {
-		cacheDir = fmt.Sprintf("%s/v%d", cacheDir, pseudoSemver.Major)
+		cacheDir = fmt.Sprintf("%s/pkg/mod/cache/download/%s/v%d/@v", os.Getenv("GOPATH"), pkg, pseudoSemver.Major)
 	}
 
 	goModFile := fmt.Sprintf("%s/%s.mod", cacheDir, tag)