TOOLS-2442: Naming conventions and refactors #202
Conversation
| @@ -587,7 +584,7 @@ functions: | |||
| aws_key: ${aws_key} | |||
| aws_secret: ${aws_secret} | |||
| local_files_include_filter: | |||
| - src/github.com/mongodb/mongo-tools/mongodb-cli-tools-* | |||
| - src/github.com/mongodb/mongo-tools/release.* | |||
There was a problem hiding this comment.
Since the same artifact may get uploaded as multiple different names (for example, as a "stable" and a "latest stable" release), it is easier and less confusing to just use release.tgz (and release.msi, etc) here.
| @@ -1416,13 +1430,12 @@ buildvariants: | |||
| # Amazon x86_64 Buildvariants # | |||
| ####################################### | |||
|
|
|||
| - name: amazonlinux64 | |||
| - name: amazon | |||
There was a problem hiding this comment.
did some work to match the server's platform naming here. also removed the largely-redundant _platform expansion
| @@ -0,0 +1,34 @@ | |||
| package env | |||
There was a problem hiding this comment.
consolidated a bunch of funcs that access env variables into one package
| @@ -12,180 +22,185 @@ import ( | |||
| type Platform struct { | |||
| Name string | |||
| Arch string | |||
| OS string | |||
| Pkg string | |||
| } | |||
There was a problem hiding this comment.
as much as possible, trying to move data about platforms into the structs themselves instead of having it in helper funcs that switch on the name/arch fields
There was a problem hiding this comment.
I'm wondering if we should stick DebArch in here too, but I think that's probably overkill, since not every platform needs that.
| @@ -75,13 +78,18 @@ func run(name string, args ...string) (string, error) { | |||
| } | |||
|
|
|||
| func getVersion() string { | |||
| desc, err := run("git", "describe") | |||
| desc, err := run("git", "describe", "--dirty") | |||
There was a problem hiding this comment.
differentiate between a build run with a clean git status and one run with uncommitted changes
release/release.go
Outdated
|
|
||
| md5sums := make(map[string]string) | ||
| // We use the order just to make sure the md5sums are always in the same order. | ||
| // This probably doesn't matter, but it looks nicer for anyone inspecting the md5sums file. | ||
| md5sumsOrder := make([]string, 0, len(binaries) + len(staticFiles)) | ||
| md5sumsOrder := make([]string, 0, len(binaries)+len(staticFiles)) |
There was a problem hiding this comment.
We should probably set gofmt to run automatically at some point. But I've always felt that way :D
| @@ -83,7 +83,7 @@ set_goenv() { | |||
| } | |||
|
|
|||
| print_ldflags() { | |||
| VersionStr="$(git describe)" | |||
| VersionStr="$(go run release/release.go get-version)" | |||
There was a problem hiding this comment.
make sure --version is getting its version info from the same place as our packaging code
| @@ -1472,7 +1482,7 @@ buildvariants: | |||
| # macOS Buildvariant # | |||
| ####################################### | |||
|
|
|||
| - name: macOS-1014 | |||
| - name: macos | |||
There was a problem hiding this comment.
much better, macos should always be latest.
| return true, nil | ||
| func (p Platform) DebianArch() string { | ||
| if p.Pkg != PkgDeb { | ||
| panic("called DebianArch on non-debian platform") |
rychipman
force-pushed
the
TOOLS-2442
branch
from
cff907c to
887255d
Compare
rychipman
force-pushed
the
TOOLS-2442
branch
from
aede276 to
ac2734d
Compare
This PR contains some platform renaming that is better to do in a separate PR from the rest of 2442 for ease of testing. Also wrapped in some refactors/rationalizations of the helper functions and types we're using in the release/ dir.
Only requiring @pmeredit from the get-go, since it's mostly just internal refactors of code he and I have added in the release/ dir.