New upstream version 0.3.1

Author: anthonyfok

make.go

@@ -410,19 +410,48 @@ func createGitRepository(debsrc, gopkg, orig string, u *upstream,
 	if err := runGitCommandIn(dir, "config", "push.default", "matching"); err != nil {
 		return dir, err
 	}
+
+	// [remote "origin"]
+
+	originURL := "[email protected]:go-team/packages/" + debsrc + ".git"
+	log.Printf("Adding remote \"origin\" with URL %q\n", originURL)
+	if err := runGitCommandIn(dir, "remote", "add", "origin", originURL); err != nil {
+		return dir, err
+	}
 	if err := runGitCommandIn(dir, "config", "--add", "remote.origin.push", "+refs/heads/*:refs/heads/*"); err != nil {
 		return dir, err
 	}
 	if err := runGitCommandIn(dir, "config", "--add", "remote.origin.push", "+refs/tags/*:refs/tags/*"); err != nil {
 		return dir, err
 	}
 
+	// Preconfigure branches
+
+	var debianBranch string
+	if dep14 {
+		debianBranch = "debian/sid"
+	} else {
+		debianBranch = "master"
+	}
+	branches := []string{debianBranch, "upstream"}
+	if pristineTar {
+		branches = append(branches, "pristine-tar")
+	}
+	for _, branch := range branches {
+		if err := runGitCommandIn(dir, "config", "branch."+branch+".remote", "origin"); err != nil {
+			return dir, err
+		}
+		if err := runGitCommandIn(dir, "config", "branch."+branch+".merge", "refs/heads/"+branch); err != nil {
+			return dir, err
+		}
+	}
+
 	if includeUpstreamHistory {
 		u.remote, err = shortHostName(gopkg, allowUnknownHoster)
 		if err != nil {
 			return dir, fmt.Errorf("Unable to fetch upstream history: %q", err)
 		}
-		log.Printf("Adding %q as remote %q\n", u.rr.Repo, u.remote)
+		log.Printf("Adding remote %q with URL %q\n", u.remote, u.rr.Repo)
 		if err := runGitCommandIn(dir, "remote", "add", u.remote, u.rr.Repo); err != nil {
 			return dir, err
 		}
@@ -543,7 +572,7 @@ func shortHostName(gopkg string, allowUnknownHoster bool) (host string, err erro
 	default:
 		if allowUnknownHoster {
 			suffix, _ := publicsuffix.PublicSuffix(host)
-			host = host[:len(host)-len(suffix)-len(".")]
+			host = fqdn[:len(fqdn)-len(suffix)-len(".")]
 			log.Printf("WARNING: Using %q as canonical hostname for %q. If that is not okay, please file a bug against %s.\n", host, fqdn, os.Args[0])
 		} else {
 			err = fmt.Errorf("unknown hoster %q", fqdn)
@@ -940,7 +969,7 @@ func execMake(args []string, usage func()) {
 	}
 	fmt.Printf("\n")
 	fmt.Printf("Resolve all TODOs in %s, then email it out:\n", itpname)
-	fmt.Printf("    sendmail -t < %s\n", itpname)
+	fmt.Printf("    /usr/sbin/sendmail -t < %s\n", itpname)
 	fmt.Printf("\n")
 	fmt.Printf("Resolve all the TODOs in debian/, find them using:\n")
 	fmt.Printf("    grep -r TODO debian\n")
@@ -953,7 +982,6 @@ func execMake(args []string, usage func()) {
 	fmt.Printf("    dh-make-golang create-salsa-project %s\n", debsrc)
 	fmt.Printf("\n")
 	fmt.Printf("Once you are happy with your packaging, push it to salsa using:\n")
-	fmt.Printf("    git remote set-url origin [email protected]:go-team/packages/%s.git\n", debsrc)
 	fmt.Printf("    gbp push\n")
 	fmt.Printf("\n")
 

template.go

@@ -43,6 +43,9 @@ func writeTemplates(dir, gopkg, debsrc, debLib, debProg, debversion string,
 	if err := writeDebianPackageInstall(dir, debLib, debProg, pkgType); err != nil {
 		return err
 	}
+	if err := writeDebianGitLabCI(dir); err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -101,21 +104,21 @@ func addDescription(f *os.File, gopkg, comment string) {
 func addLibraryPackage(f *os.File, gopkg, debLib string, dependencies []string) {
 	fmt.Fprintf(f, "\n")
 	fmt.Fprintf(f, "Package: %s\n", debLib)
-	deps := []string{"${misc:Depends}"}
 	fmt.Fprintf(f, "Architecture: all\n")
-	deps = append(deps, dependencies...)
+	deps := dependencies
 	sort.Strings(deps)
+	deps = append(deps, "${misc:Depends}")
 	fprintfControlField(f, "Depends", deps)
 	addDescription(f, gopkg, "(library)")
 }
 
 func addProgramPackage(f *os.File, gopkg, debProg string, dependencies []string) {
 	fmt.Fprintf(f, "\n")
 	fmt.Fprintf(f, "Package: %s\n", debProg)
-	deps := []string{"${misc:Depends}"}
 	fmt.Fprintf(f, "Architecture: any\n")
-	deps = append(deps, "${shlibs:Depends}")
+	deps := dependencies
 	sort.Strings(deps)
+	deps = append(deps, "${misc:Depends}", "${shlibs:Depends}")
 	fprintfControlField(f, "Depends", deps)
 	fmt.Fprintf(f, "Built-Using: ${misc:Built-Using}\n")
 	addDescription(f, gopkg, "(program)")
@@ -358,3 +361,44 @@ func writeDebianPackageInstall(dir, debLib, debProg string, pkgType packageType)
 	}
 	return nil
 }
+
+func writeDebianGitLabCI(dir string) error {
+	const gitlabciymlTmpl = `# auto-generated, DO NOT MODIFY.
+# The authoritative copy of this file lives at:
+# https://salsa.debian.org/go-team/ci/blob/master/config/gitlabciyml.go
+
+# TODO: publish under debian-go-team/ci
+image: stapelberg/ci2
+
+test_the_archive:
+  artifacts:
+    paths:
+    - before-applying-commit.json
+    - after-applying-commit.json
+  script:
+    # Create an overlay to discard writes to /srv/gopath/src after the build:
+    - "rm -rf /cache/overlay/{upper,work}"
+    - "mkdir -p /cache/overlay/{upper,work}"
+    - "mount -t overlay overlay -o lowerdir=/srv/gopath/src,upperdir=/cache/overlay/upper,workdir=/cache/overlay/work /srv/gopath/src"
+    - "export GOPATH=/srv/gopath"
+    - "export GOCACHE=/cache/go"
+    # Build the world as-is:
+    - "ci-build -exemptions=/var/lib/ci-build/exemptions.json > before-applying-commit.json"
+    # Copy this package into the overlay:
+    - "GBP_CONF_FILES=:debian/gbp.conf gbp buildpackage --git-no-pristine-tar --git-ignore-branch --git-ignore-new --git-export-dir=/tmp/export --git-no-overlay --git-tarball-dir=/nonexistant --git-cleaner=/bin/true --git-builder='dpkg-buildpackage -S -d --no-sign'"
+    - "pgt-gopath -dsc /tmp/export/*.dsc"
+    # Rebuild the world:
+    - "ci-build -exemptions=/var/lib/ci-build/exemptions.json > after-applying-commit.json"
+    - "ci-diff before-applying-commit.json after-applying-commit.json"
+`
+
+	f, err := os.Create(filepath.Join(dir, "debian", "gitlab-ci.yml"))
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	fmt.Fprintf(f, gitlabciymlTmpl)
+
+	return nil
+}