From 8d7d808024623cfc121b80c0d8f72d1997d894a1 Mon Sep 17 00:00:00 2001 From: Andrea Luzzardi Date: Tue, 5 Apr 2022 12:10:54 -0700 Subject: [PATCH] temporarily disable the `platform` field. Need some more time to figure out the correct API. Signed-off-by: Andrea Luzzardi --- ci.cue | 2 +- pkg/dagger.io/dagger/plan.cue | 3 ++- plan/plan.go | 44 ++++++++++++++++++----------------- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/ci.cue b/ci.cue index 310f4b18..4474d0f5 100644 --- a/ci.cue +++ b/ci.cue @@ -18,7 +18,7 @@ dagger.#Plan & { // to avoid the performance hit caused by qemu (linter goes from <3s to >3m when arch is x86) // Uncomment if running locally on Mac M1 to bypass qemu // platform: "linux/aarch64" - platform: "linux/amd64" + // platform: "linux/amd64" client: filesystem: ".": read: exclude: [ "bin", diff --git a/pkg/dagger.io/dagger/plan.cue b/pkg/dagger.io/dagger/plan.cue index 55020e03..524d4dc2 100644 --- a/pkg/dagger.io/dagger/plan.cue +++ b/pkg/dagger.io/dagger/plan.cue @@ -39,7 +39,8 @@ package dagger } // Configure platform execution - platform?: string + // FIXME: temporarily disabled + // platform?: string // Execute actions in containers actions: { diff --git a/plan/plan.go b/plan/plan.go index 6414e443..033b8248 100644 --- a/plan/plan.go +++ b/plan/plan.go @@ -82,9 +82,10 @@ func Load(ctx context.Context, cfg Config) (*Plan, error) { p.fillAction() - if err := p.configPlatform(); err != nil { - return nil, err - } + // FIXME: `platform` field temporarily disabled + // if err := p.configPlatform(); err != nil { + // return nil, err + // } if err := p.prepare(ctx); err != nil { return nil, err @@ -108,27 +109,28 @@ func (p *Plan) Action() *Action { // configPlatform load the platform specified in the context // Buildkit will then run every operation using that platform // If platform is not define, context keep default platform -func (p *Plan) configPlatform() error { - platformField := p.source.Lookup("platform") +// FIXME: `platform` field temporarily disabled +// func (p *Plan) configPlatform() error { +// platformField := p.source.Lookup("platform") - // Ignore if platform is not set in `#Plan` - if !platformField.Exists() { - return nil - } +// // Ignore if platform is not set in `#Plan` +// if !platformField.Exists() { +// return nil +// } - // Convert platform to string - platform, err := platformField.String() - if err != nil { - return err - } +// // Convert platform to string +// platform, err := platformField.String() +// if err != nil { +// return err +// } - // Set platform to context - err = p.context.Platform.SetString(platform) - if err != nil { - return err - } - return nil -} +// // Set platform to context +// err = p.context.Platform.SetString(platform) +// if err != nil { +// return err +// } +// return nil +// } // prepare executes the pre-run hooks of tasks func (p *Plan) prepare(ctx context.Context) error {