From 047349638dd151d54c753742915fd33fd6dd85e2 Mon Sep 17 00:00:00 2001 From: Kevin Minehart <5140827+kminehart@users.noreply.github.com> Date: Tue, 8 Jul 2025 07:58:45 -0500 Subject: [PATCH] CI: Run `lerna bump version` before `yarn build` (#107731) lerna bump version before yarn build Co-authored-by: Jack Westbrook --- pkg/build/daggerbuild/artifacts/frontend.go | 2 +- pkg/build/daggerbuild/artifacts/package_targz.go | 2 +- pkg/build/daggerbuild/frontend/build.go | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg/build/daggerbuild/artifacts/frontend.go b/pkg/build/daggerbuild/artifacts/frontend.go index 403c515b4e4..298f990a642 100644 --- a/pkg/build/daggerbuild/artifacts/frontend.go +++ b/pkg/build/daggerbuild/artifacts/frontend.go @@ -47,7 +47,7 @@ func (f *Frontend) BuildFile(ctx context.Context, builder *dagger.Container, opt } func (f *Frontend) BuildDir(ctx context.Context, builder *dagger.Container, opts *pipeline.ArtifactContainerOpts) (*dagger.Directory, error) { - return frontend.Build(builder), nil + return frontend.Build(builder, f.Version), nil } func (f *Frontend) Publisher(ctx context.Context, opts *pipeline.ArtifactContainerOpts) (*dagger.Container, error) { diff --git a/pkg/build/daggerbuild/artifacts/package_targz.go b/pkg/build/daggerbuild/artifacts/package_targz.go index 5e35c553042..93e09112ceb 100644 --- a/pkg/build/daggerbuild/artifacts/package_targz.go +++ b/pkg/build/daggerbuild/artifacts/package_targz.go @@ -164,7 +164,7 @@ func NewTarball( if err != nil { return nil, err } - frontendArtifact, err := NewFrontend(ctx, log, version, artifact, enterprise, src, cache) + frontendArtifact, err := NewFrontend(ctx, log, artifact, version, enterprise, src, cache) if err != nil { return nil, err } diff --git a/pkg/build/daggerbuild/frontend/build.go b/pkg/build/daggerbuild/frontend/build.go index b04cdc01767..9aec71e37d9 100644 --- a/pkg/build/daggerbuild/frontend/build.go +++ b/pkg/build/daggerbuild/frontend/build.go @@ -1,11 +1,14 @@ package frontend import ( + "fmt" + "dagger.io/dagger" ) -func Build(builder *dagger.Container) *dagger.Directory { +func Build(builder *dagger.Container, version string) *dagger.Directory { public := builder. + WithExec([]string{"/bin/sh", "-c", fmt.Sprintf("yarn lerna version %s --exact --no-git-tag-version --no-push --force-publish -y", version)}). WithExec([]string{"yarn", "run", "build"}). WithExec([]string{"/bin/sh", "-c", "find /src/public -type d -name node_modules -print0 | xargs -0 rm -rf"}). Directory("/src/public")