Skip to content

Commit e7fad31

Browse files
authored
fix pipeline (#53)
1 parent d945549 commit e7fad31

1 file changed

Lines changed: 17 additions & 9 deletions

File tree

dagger/main.go

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@ func (m *NdthanhdevGithubIo) ContainerEcho(stringArg string) *Container {
2727
return dag.Container().From("alpine:latest").WithExec([]string{"echo", stringArg})
2828
}
2929

30+
type Con struct {
31+
*Container
32+
}
33+
34+
func (c *Con) MoonRun(command string) *Container {
35+
return c.Container.WithExec([]string{fmt.Sprintf(`moon run %s`, command)})
36+
}
37+
3038
func (m *NdthanhdevGithubIo) Init(ctx context.Context, dir *Directory) *Container {
3139
source := dag.Directory().WithDirectory("/", dir, DirectoryWithDirectoryOpts{
3240
Exclude: []string{"node_modules", ".cache", "moon/.cache"},
@@ -59,31 +67,31 @@ func (m *NdthanhdevGithubIo) Init(ctx context.Context, dir *Directory) *Containe
5967
WithExec([]string{"moon setup"}).
6068
// yarn install --immutable
6169
WithExec([]string{"yarn install --immutable"})
70+
6271
}
6372

6473
func (m *NdthanhdevGithubIo) MoonRun(ctx context.Context, dir *Directory, command string) *Container {
65-
return m.Init(ctx, dir).
66-
WithExec([]string{fmt.Sprintf(`moon run %s`, command)})
74+
return (&Con{m.
75+
Init(ctx, dir)}).MoonRun(command)
6776
}
6877

6978
func (m *NdthanhdevGithubIo) Build(ctx context.Context, dir *Directory, mode string) *Directory {
70-
return m.
71-
MoonRun(ctx, dir, "app:build").
79+
return (&Con{m.Init(ctx, dir).
7280
WithWorkdir("/mnt/scripts/actions").
73-
WithEnvVariable("MODE", mode).
74-
WithExec([]string{"./build.ts"}).
81+
WithEnvVariable("MODE", mode)}).
82+
MoonRun("scripts:build").
7583
Directory("/mnt/app/public")
7684
}
7785

7886
func (m *NdthanhdevGithubIo) Publish(ctx context.Context, dir *Directory, mode string, token *Secret) (string, error) {
7987

8088
tokenString, _ := token.Plaintext(ctx)
8189

82-
return m.
90+
return (&Con{m.
8391
MoonRun(ctx, dir, "scripts:public").
8492
WithEnvVariable("GH_TOKEN", tokenString).
8593
WithEnvVariable("MODE", mode).
86-
WithWorkdir("/mnt/scripts/actions").
87-
WithExec([]string{"./publish.ts"}).
94+
WithWorkdir("/mnt/scripts/actions")}).
95+
MoonRun("scripts:publish").
8896
Stdout(ctx)
8997
}

0 commit comments

Comments
 (0)