Godeps, vendor: convert dependency management to trash (#3198)
This commit converts the dependency management from Godeps to the vendor folder, also switching the tool from godep to trash. Since the upstream tool lacks a few features proposed via a few PRs, until those PRs are merged in (if), use github.com/karalabe/trash. You can update dependencies via trash --update. All dependencies have been updated to their latest version. Parts of the build system are reworked to drop old notions of Godeps and invocation of the go vet command so that it doesn't run against the vendor folder, as that will just blow up during vetting. The conversion drops OpenCL (and hence GPU mining support) from ethash and our codebase. The short reasoning is that there's noone to maintain and having opencl libs in our deps messes up builds as go install ./... tries to build them, failing with unsatisfied link errors for the C OpenCL deps. golang.org/x/net/context is not vendored in. We expect it to be fetched by the user (i.e. using go get). To keep ci.go builds reproducible the package is "vendored" in build/_vendor.
This commit is contained in:
		
				
					committed by
					
						 Felix Lange
						Felix Lange
					
				
			
			
				
	
			
			
			
						parent
						
							7770304576
						
					
				
				
					commit
					289b30715d
				
			
							
								
								
									
										17
									
								
								build/ci.go
									
									
									
									
									
								
							
							
						
						
									
										17
									
								
								build/ci.go
									
									
									
									
									
								
							| @@ -141,7 +141,6 @@ func doInstall(cmdline []string) { | ||||
| 		log.Println("be compiled with an earlier version. Please upgrade your Go installation.") | ||||
| 		os.Exit(1) | ||||
| 	} | ||||
|  | ||||
| 	// Compile packages given as arguments, or everything if there are no arguments. | ||||
| 	packages := []string{"./..."} | ||||
| 	if flag.NArg() > 0 { | ||||
| @@ -178,6 +177,7 @@ func goTool(subcmd string, args ...string) *exec.Cmd { | ||||
| 	cmd := exec.Command(gocmd, subcmd) | ||||
| 	cmd.Args = append(cmd.Args, args...) | ||||
| 	cmd.Env = []string{ | ||||
| 		"GO15VENDOREXPERIMENT=1", | ||||
| 		"GOPATH=" + build.GOPATH(), | ||||
| 		"GOBIN=" + GOBIN, | ||||
| 	} | ||||
| @@ -200,11 +200,24 @@ func doTest(cmdline []string) { | ||||
| 		coverage = flag.Bool("coverage", false, "Whether to record code coverage") | ||||
| 	) | ||||
| 	flag.CommandLine.Parse(cmdline) | ||||
|  | ||||
| 	packages := []string{"./..."} | ||||
| 	if len(flag.CommandLine.Args()) > 0 { | ||||
| 		packages = flag.CommandLine.Args() | ||||
| 	} | ||||
|  | ||||
| 	if len(packages) == 1 && packages[0] == "./..." { | ||||
| 		// Resolve ./... manually since go vet will fail on vendored stuff | ||||
| 		out, err := goTool("list", "./...").CombinedOutput() | ||||
| 		if err != nil { | ||||
| 			log.Fatalf("package listing failed: %v\n%s", err, string(out)) | ||||
| 		} | ||||
| 		packages = []string{} | ||||
| 		for _, line := range strings.Split(string(out), "\n") { | ||||
| 			if !strings.Contains(line, "vendor") { | ||||
| 				packages = append(packages, strings.TrimSpace(line)) | ||||
| 			} | ||||
| 		} | ||||
| 	} | ||||
| 	// Run analysis tools before the tests. | ||||
| 	if *vet { | ||||
| 		build.MustRun(goTool("vet", packages...)) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user