put version in binary properly (#73)

Addresses #71 :

    Set version on the CLI framework.
    Add a build.sh script that injects variables into the build tooling using git and a version file.
    Set version in config.
This commit is contained in:
Tobi Smethurst
2021-06-28 12:17:20 +02:00
committed by GitHub
parent 87cf621e21
commit 4f3b3f5c0b
9 changed files with 38 additions and 11 deletions

View File

@ -106,7 +106,7 @@ func loadFromFile(path string) (*Config, error) {
}
// ParseCLIFlags sets flags on the config using the provided Flags object
func (c *Config) ParseCLIFlags(f KeyedFlags) error {
func (c *Config) ParseCLIFlags(f KeyedFlags, version string) error {
fn := GetFlagNames()
// For all of these flags, we only want to set them on the config if:
@ -261,6 +261,8 @@ func (c *Config) ParseCLIFlags(f KeyedFlags) error {
c.AccountCLIFlags[EmailFlag] = f.String(EmailFlag)
c.AccountCLIFlags[PasswordFlag] = f.String(PasswordFlag)
c.SoftwareVersion = version
return nil
}

View File

@ -1,7 +1,5 @@
package config
const softwareVersion = "0.1.0-SNAPSHOT"
// TestDefault returns a default config for testing
func TestDefault() *Config {
defaults := GetTestDefaults()
@ -121,7 +119,6 @@ func GetDefaults() Defaults {
ConfigPath: "",
Host: "",
Protocol: "https",
SoftwareVersion: softwareVersion,
DbType: "postgres",
DbAddress: "localhost",
@ -168,7 +165,6 @@ func GetTestDefaults() Defaults {
ConfigPath: "",
Host: "localhost:8080",
Protocol: "http",
SoftwareVersion: softwareVersion,
DbType: "postgres",
DbAddress: "localhost",