"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
test_all: fix branch name in test report
Nick Craig-Wooda9b05e4c7a99
diff --git a/fstest/runs/report.go b/fstest/runs/report.goindex f3c7580aa..39787a2fb 100644--- a/fstest/runs/report.go+++ b/fstest/runs/report.go@@ -1,15 +1,16 @@package runsimport (+ "bytes""encoding/json""fmt""html/template""os""os/exec""path"- "regexp""runtime""sort"+ "strings""time""github.com/rclone/rclone/fs"@@ -45,14 +46,6 @@ type ReportRun struct {Runs Runs}-// Parse version numbers-// v1.49.0-// v1.49.0-031-g2298834e-beta-// v1.49.0-032-g20793a5f-sharefile-beta-// match 1 is commit number-// match 2 is branch name-var parseVersion = regexp.MustCompile(`^v(?:[0-9.]+)-(?:\d+)-g([0-9a-f]+)(?:-(.*))?-beta$`)-// FIXME take -issue or -pr parameter...// NewReport initialises and returns a Report@@ -82,17 +75,33 @@ func NewReport(Opt RunOpt) *Report {// Online versionr.URL = Opt.URLBase + r.DateTime + "/index.html"- // Get branch/commit out of version- parts := parseVersion.FindStringSubmatch(r.Version)- if len(parts) >= 3 {- r.Commit = parts[1]- r.Branch = parts[2]+ // Get branch/commit+ r.Branch, r.Commit = gitBranchAndCommit()++ return r+}++// gitBranchAndCommit returns the current branch and commit hash.+//+// It returns "" on error.+func gitBranchAndCommit() (branch, commit string) {+ // branch (empty if detached)+ var b bytes.Buffer+ cmdB := exec.Command("git", "symbolic-ref", "--short", "-q", "HEAD")+ cmdB.Stdout = &b+ if e := cmdB.Run(); e == nil {+ branch = strings.TrimSpace(b.String())}- if r.Branch == "" {- r.Branch = "master"++ // commit (full SHA)+ var c bytes.Buffer+ cmdC := exec.Command("git", "rev-parse", "HEAD")+ cmdC.Stdout = &c+ if e := cmdC.Run(); e == nil {+ commit = strings.TrimSpace(c.String())}- return r+ return branch, commit}// End should be called when the tests are complete