docker-library
/
bashbrew
mirror of https://github.com/docker-library/bashbrew.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from infosiftr/git-fetch-commit 

Fall back to "git fetch ... +SHA:..." (like GitHub Actions do!) if we fail to find the commit
This commit is contained in:
yosifkit 2020-05-06 10:27:10 -07:00 committed by GitHub
parent 68878f489c 5ab18b3a1a
commit 0386241947
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/ci.yml vendored
View File

@ -27,3 +27,4 @@ jobs:
./bashbrew list "$image"
./bashbrew list --uniq "$image"
./bashbrew cat "$image"
./bashbrew from --uniq "$image"

31
cmd/bashbrew/git.go
View File

@ -11,6 +11,8 @@ import (
"regexp"
"strings"
"github.com/codegangsta/cli"
"github.com/docker-library/go-dockerlibrary/manifest"
"github.com/docker-library/go-dockerlibrary/pkg/execpipe"
@ -234,12 +236,20 @@ func (r Repo) fetchGitRepo(arch string, entry *manifest.Manifest2822Entry) (stri
//Progress: os.Stdout,
})
if err != nil {
return "", err
if fetchErr := fetchGitCommit(arch, entry, gitRemote.Config().URLs[0], fetchString); fetchErr != nil {
return "", cli.NewMultiError(err, fetchErr)
}
}
commit, err := getGitCommit(entry.ArchGitCommit(arch))
if err != nil {
return "", err
if fetchErr := fetchGitCommit(arch, entry, gitRemote.Config().URLs[0], fetchString); fetchErr != nil {
return "", cli.NewMultiError(err, fetchErr)
}
commit, err = getGitCommit(entry.ArchGitCommit(arch))
if err != nil {
return "", err
}
}
gitTag := gitNormalizeForTagUsage(path.Join(arch, namespace, r.RepoName, entry.Tags[0]))
@ -253,3 +263,20 @@ func (r Repo) fetchGitRepo(arch string, entry *manifest.Manifest2822Entry) (stri
entry.SetGitCommit(arch, commit)
return commit, nil
}
// this is used as a fallback if using github.com/go-git/go-git/v5 to fetch the branch fails to find the commit
// Git (and more recently, GitHub) support "git fetch"ing a specific commit directly!
// (The "actions/checkout@v2" GitHub action uses this to fetch commits for running workflows even after branches are deleted!)
// https://github.com/git/git/commit/f8edeaa05d8623a9f6dad408237496c51101aad8
// (Unfortunately, github.com/go-git/go-git/v5 does not support fetching a commit like this from what I can figure [https://github.com/go-git/go-git/issues/56], so we have to shell out.)
func fetchGitCommit(arch string, entry *manifest.Manifest2822Entry, gitRemote, fetchString string) error {
commit := entry.ArchGitCommit(arch)
if commit == "FETCH_HEAD" {
return fmt.Errorf("cannot fetch line-based entry commit when fetching by tag")
}
fetchString = "+" + commit + ":" + strings.SplitN(fetchString, ":", 2)[1]
_, err := git(`fetch`, `--quiet`, gitRemote, fetchString)
return err
}