Merge pull request #1242 from jonjohnsonjr/goarch

Add ${{build.goarch}} substitution

Author: jonjohnsonjr

README.md

@@ -154,6 +154,8 @@ Melange provides the following default substitutions which can be referenced in
 | `${{package.contextdir}}`   | Directory where targets will be stored for main packages and subpackages |
 | `${{targets.destdir}}`      | Directory where targets will be stored for main                          |
 | `${{targets.subpkgdir}}`    | Directory where targets will be stored for subpackages                   |
+| `${{build.arch}}`           | Architecture of current build (e.g. x86_64, aarch64)                     |
+| `${{build.goarch}}`         | GOARCH of current build (e.g. amd64, arm64)                              |
 
 An example build file pipeline with substitutions:
 

pkg/build/pipeline.go

@@ -149,6 +149,7 @@ func substitutionMap(pb *PipelineBuild) (map[string]string, error) {
 		nw[config.SubstitutionCrossTripletRustGlibc] = pb.Build.Arch.ToRustTriplet("gnu")
 		nw[config.SubstitutionCrossTripletRustMusl] = pb.Build.Arch.ToRustTriplet("musl")
 		nw[config.SubstitutionBuildArch] = pb.Build.Arch.ToAPK()
+		nw[config.SubstitutionBuildGoArch] = pb.Build.Arch.String()
 	}
 
 	// Retrieve vars from config

pkg/config/vars.go

@@ -37,6 +37,7 @@ const (
 	SubstitutionCrossTripletRustGlibc = "${{cross.triplet.rust.glibc}}"
 	SubstitutionCrossTripletRustMusl  = "${{cross.triplet.rust.musl}}"
 	SubstitutionBuildArch             = "${{build.arch}}"
+	SubstitutionBuildGoArch           = "${{build.goarch}}"
 )
 
 // Get variables from configuration and return them in a map

pkg/renovate/renovate.go

@@ -106,6 +106,7 @@ func (rc *RenovationContext) LoadConfig(ctx context.Context) error {
 	vars[config.SubstitutionPackageVersion] = cfg.Package.Version
 	vars[config.SubstitutionPackageEpoch] = strconv.FormatUint(cfg.Package.Epoch, 10)
 	vars[config.SubstitutionBuildArch] = apko_types.ParseArchitecture(runtime.GOARCH).ToAPK()
+	vars[config.SubstitutionBuildGoArch] = apko_types.ParseArchitecture(runtime.GOARCH).String()
 
 	err = cfg.PerformVarSubstitutions(vars)
 	if err != nil {