Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions dev-tools/mage/settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,17 +162,18 @@ func initGlobals() {

versionQualifier, versionQualified = os.LookupEnv("VERSION_QUALIFIER")

agentPackageVersion = EnvOr(agentPackageVersionEnvVar, "")

ManifestURL = EnvOr(ManifestUrlEnvVar, "")
PackagingFromManifest = ManifestURL != ""

// order matters this must be called last as it will override some of the
// values above
Comment thread
pchila marked this conversation as resolved.
Outdated
err = initPackageVersion()
if err != nil {
panic(fmt.Errorf("failed to init package version: %w", err))
}

agentPackageVersion = EnvOr(agentPackageVersionEnvVar, agentPackageVersion)

ManifestURL = EnvOr(ManifestUrlEnvVar, ManifestURL)
PackagingFromManifest = ManifestURL != ""

}

// ProjectType specifies the type of project (OSS vs X-Pack).
Expand Down
Loading