mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-29 01:33:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Linting

Browse source
This commit is contained in:
Kegan Dougal 2021-07-08 12:17:34 +01:00
parent fba6664d2b
commit f8646cd989
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmd/dendrite-upgrade-tests/main.go
View file

@ -40,6 +40,8 @@ var (
alphaNumerics = regexp.MustCompile("[^a-zA-Z0-9]+") alphaNumerics = regexp.MustCompile("[^a-zA-Z0-9]+")
) )
const HEAD = "HEAD"
// Embed the Dockerfile to use when building dendrite versions. // Embed the Dockerfile to use when building dendrite versions.
// We cannot use the dockerfile associated with the repo with each version sadly due to changes in // We cannot use the dockerfile associated with the repo with each version sadly due to changes in
// Docker versions. Specifically, earlier Dendrite versions are incompatible with newer Docker clients // Docker versions. Specifically, earlier Dendrite versions are incompatible with newer Docker clients
@ -141,7 +143,7 @@ func buildDendrite(httpClient *http.Client, dockerClient *client.Client, tmpDir,
var err error var err error
// If a custom HEAD location is given, use that, else pull from github. Mostly useful for CI // If a custom HEAD location is given, use that, else pull from github. Mostly useful for CI
// where we want to use the working directory. // where we want to use the working directory.
if branchOrTagName == "HEAD" && *flagHead != "" { if branchOrTagName == HEAD && *flagHead != "" {
log.Printf("%s: Using %s as HEAD", branchOrTagName, *flagHead) log.Printf("%s: Using %s as HEAD", branchOrTagName, *flagHead)
// add top level Dockerfile // add top level Dockerfile
err = ioutil.WriteFile(path.Join(*flagHead, "Dockerfile"), []byte(Dockerfile), os.ModePerm) err = ioutil.WriteFile(path.Join(*flagHead, "Dockerfile"), []byte(Dockerfile), os.ModePerm)
@ -258,7 +260,7 @@ func calculateVersions(cli *http.Client, from, to string) []string {
semvers = semvers[i:] semvers = semvers[i:]
} }
} }
if to != "" && to != "HEAD" { if to != "" && to != HEAD {
toVer, err := semver.NewVersion(to) toVer, err := semver.NewVersion(to)
if err != nil { if err != nil {
log.Fatalf("invalid --to: %s", err) log.Fatalf("invalid --to: %s", err)
@ -276,8 +278,8 @@ func calculateVersions(cli *http.Client, from, to string) []string {
for _, sv := range semvers { for _, sv := range semvers {
versions = append(versions, sv.Original()) versions = append(versions, sv.Original())
} }
if to == "HEAD" { if to == HEAD {
versions = append(versions, "HEAD") versions = append(versions, HEAD)
} }
return versions return versions
} }