kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

state: disabled remote stdlib install (keep vendoring until migration is complete)

Browse Source 
Signed-off-by: Sam Alba <sam.alba@gmail.com>
This commit is contained in:
Sam Alba 2021-10-13 14:55:06 -07:00
parent e9ca8f38e6
commit fe83b578f6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
state/project.go
View File

@ -10,8 +10,6 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"go.dagger.io/dagger/mod"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"go.dagger.io/dagger/keychain" "go.dagger.io/dagger/keychain"
"go.dagger.io/dagger/stdlib" "go.dagger.io/dagger/stdlib"
@ -382,23 +380,25 @@ func cueModInit(ctx context.Context, parentDir string) error {
return nil return nil
} }
func vendorUniverse(ctx context.Context, workspace string) error { func vendorUniverse(ctx context.Context, p string) error {
// ensure cue module is initialized // ensure cue module is initialized
if err := cueModInit(ctx, workspace); err != nil { if err := cueModInit(ctx, p); err != nil {
return err return err
} }
// add universe to `.gitignore` // add universe to `.gitignore`
if err := os.WriteFile( if err := os.WriteFile(
path.Join(workspace, "cue.mod", "pkg", ".gitignore"), path.Join(p, "cue.mod", "pkg", ".gitignore"),
[]byte(fmt.Sprintf("# dagger universe\n%s\n", stdlib.PackageName)), []byte(fmt.Sprintf("# dagger universe\n%s\n", stdlib.PackageName)),
0600, 0600,
); err != nil { ); err != nil {
return err return err
} }
log.Ctx(ctx).Debug().Str("mod", workspace).Msg("vendoring universe") log.Ctx(ctx).Debug().Str("mod", p).Msg("vendoring universe")
if err := mod.InstallStdlib(workspace); err != nil { // FIXME(samalba): disabled install remote stdlib temporarily
// if err := mod.InstallStdlib(p); err != nil {
if err := stdlib.Vendor(ctx, p); err != nil {
return err return err
} }