Skip to content

Commit

Permalink
Fix builds
Browse files Browse the repository at this point in the history
  • Loading branch information
@blaubaer
blaubaer committed Oct 10, 2024
1 parent b353730 commit 5bd187f
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 56 deletions.
23 changes: 16 additions & 7 deletions cmd/build/build.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ func (this *build) init(ctx context.Context, app *kingpin.Application) {
StringVar(&this.prefix)
cmd.Flag("stages", "").
PlaceHolder("<" + strings.Join(allBuildStageVariants.Strings(), "|") + ">[,...]").
Default(this.rawStages.String()).
SetValue(&this.rawStages)
cmd.Flag("os", "").
PlaceHolder("<" + strings.Join(allOsVariants.Strings(), "|") + ">[,...]").
Expand Down Expand Up @@ -137,6 +136,11 @@ func (this *build) allPlatforms(forTesting bool) iter.Seq[*platform] {
}

func (this *build) buildAll(ctx context.Context, forTesting bool) (artifacts buildArtifacts, _ error) {
stages, err := this.stages(ctx)
if err != nil {
return nil, err
}

if this.updateCaCerts {
if err := this.dependencies.caCerts.generatePem(ctx); err != nil {
return nil, err
Expand All @@ -153,23 +157,23 @@ func (this *build) buildAll(ctx context.Context, forTesting bool) (artifacts bui
artifacts = append(artifacts, vs...)
}

if this.stages.contains(buildStageImage) {
if stages.contains(buildStageImage) {
var err error
artifacts, err = this.image.merge(ctx, artifacts)
if err != nil {
return nil, err
}
}

if this.stages.contains(buildStageDigest) {
if stages.contains(buildStageDigest) {
var err error
artifacts, err = this.digest.create(ctx, artifacts)
if err != nil {
return nil, err
}
}

if this.stages.contains(buildStagePublish) {
if stages.contains(buildStagePublish) {
if err := this.image.publish(ctx, artifacts); err != nil {
return nil, err
}
Expand All @@ -184,13 +188,18 @@ func (this *build) buildSingle(ctx context.Context, p *platform) (artifacts buil
return nil, fmt.Errorf("cannot build %v: %w", *p, err)
}

stages, err := this.stages(ctx)
if err != nil {
return nil, err
}

l := log.With("platform", p)

success := false
common.IgnoreCloseErrorIfFalse(&success, artifacts)

var ba *buildArtifact
if this.stages.contains(buildStageBinary) && p.isBinarySupported(this.assumedBuildOs(), this.assumedBuildArch()) {
if stages.contains(buildStageBinary) && p.isBinarySupported(this.assumedBuildOs(), this.assumedBuildArch()) {
var err error
ba, err = this.binary.compile(ctx, p)
if err != nil {
Expand All @@ -202,7 +211,7 @@ func (this *build) buildSingle(ctx context.Context, p *platform) (artifacts buil
l.With("stage", buildStageBinary).Info("build binary skipped")
}

if ba != nil && this.stages.contains(buildStageArchive) {
if ba != nil && stages.contains(buildStageArchive) {
aa, err := this.archive.create(ctx, ba)
if err != nil {
return fail(err)
Expand All @@ -212,7 +221,7 @@ func (this *build) buildSingle(ctx context.Context, p *platform) (artifacts buil
l.With("stage", buildStageArchive).Info("build archive skipped")
}

if ba != nil && this.stages.contains(buildStageImage) && ba.isImageSupported() {
if ba != nil && stages.contains(buildStageImage) && ba.isImageSupported() {
aas, err := this.image.create(ctx, ba)
if err != nil {
return fail(err)
Expand Down
28 changes: 14 additions & 14 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@ require (
github.com/google/go-containerregistry v0.20.2
github.com/google/go-github/v65 v65.0.0
github.com/google/uuid v1.6.0
github.com/gwatts/rootcerts v0.0.0-20240701182254-d67b2c3ed211
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
github.com/mattn/go-zglob v0.0.6
github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a
github.com/mr-tron/base58 v1.2.0
github.com/msteinert/pam/v2 v2.0.0
github.com/opencontainers/image-spec v1.1.0-rc3
github.com/opencontainers/image-spec v1.1.0
github.com/openwall/yescrypt-go v1.0.0
github.com/otiai10/copy v1.14.0
github.com/pkg/sftp v1.13.6
Expand All @@ -37,34 +38,33 @@ require (
dario.cat/mergo v1.0.1 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30 // indirect
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/cli v27.1.1+incompatible // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/docker-credential-helpers v0.7.0 // indirect
github.com/docker/cli v27.3.1+incompatible // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker-credential-helpers v0.8.2 // indirect
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/gwatts/rootcerts v0.0.0-20240701182254-d67b2c3ed211 // indirect
github.com/huandu/xstrings v1.5.0 // indirect
github.com/klauspost/compress v1.16.5 // indirect
github.com/klauspost/compress v1.17.10 // indirect
github.com/kr/fs v0.1.0 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/rogpeppe/go-internal v1.13.1 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/sirupsen/logrus v1.9.1 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/cast v1.7.0 // indirect
github.com/tklauser/go-sysconf v0.3.14 // indirect
github.com/tklauser/numcpus v0.8.0 // indirect
github.com/vbatts/tar-split v0.11.3 // indirect
github.com/tklauser/numcpus v0.9.0 // indirect
github.com/vbatts/tar-split v0.11.6 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/sys v0.26.0 // indirect
)
Loading

0 comments on commit 5bd187f

Please sign in to comment.