Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update dagger version, fix ci #62

Merged
merged 2 commits into from
Nov 2, 2023
Merged

update dagger version, fix ci #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca56653
update dagger version, fix ci
schlapzz Nov 2, 2023
2483a55
Merge branch 'main' into dagger
schlapzz Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions ci/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,16 +166,29 @@ func buildAndPushDevImage(ctx context.Context, golang *dagger.Container, g *Goff

func runTests(ctx context.Context, golang *dagger.Container, daggerClient *dagger.Client) error {

redis := daggerClient.Container().From("redis").
WithExposedPort(6379)
redis, err := daggerClient.Container().From("registry.puzzle.ch/docker.io/redis").
WithExposedPort(6379).AsService().Start(ctx)

repoServer := daggerClient.Container().From("quay.io/puzzle/argocd-repo-server:latest").
if err != nil {
return err
}

repoServer, err := daggerClient.Container().From("quay.io/puzzle/argocd-repo-server:latest").
WithExposedPort(8081).
WithServiceBinding("argocd-redis", redis)
WithServiceBinding("argocd-redis", redis).
AsService().Start(ctx)

if err != nil {
return err
}

_, err := golang.
_, err = golang.
WithServiceBinding("reposerver", repoServer).
WithExec([]string{"go", "test", "./...", "-v"}).Sync(ctx)

repoServer.Stop(ctx)
redis.Stop(ctx)

return err
}

Expand Down
26 changes: 8 additions & 18 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/spf13/cobra v1.7.0
)

require golang.org/x/text v0.11.0 // indirect
require golang.org/x/text v0.13.0 // indirect

require (
github.com/awalterschulze/gographviz v2.0.3+incompatible
Expand All @@ -34,32 +34,22 @@ require (
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
github.com/hashicorp/go-version v1.2.1 // indirect
github.com/howeyc/gopass v0.0.0-20210920133722-c8aef6fb66ef // indirect
github.com/huandu/xstrings v1.3.3 // indirect
github.com/iancoleman/strcase v0.3.0 // indirect
github.com/jeremywohl/flatten v1.0.1 // indirect
github.com/ktrysmt/go-bitbucket v0.9.55 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
github.com/mgutz/minimist v0.0.0-20151219120022-39eb8cf573ca // indirect
github.com/mgutz/str v1.2.0 // indirect
github.com/mgutz/to v1.0.0 // indirect
github.com/microsoft/azure-devops-go-api/azuredevops v1.0.0-b5 // indirect
github.com/mitchellh/copystructure v1.0.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.0 // indirect
github.com/nozzle/throttler v0.0.0-20180817012639-2ea982251481 // indirect
github.com/shopspring/decimal v1.2.0 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
github.com/vektah/gqlparser/v2 v2.5.6 // indirect
github.com/xanzy/go-gitlab v0.60.0 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/tools v0.11.0 // indirect
gopkg.in/godo.v2 v2.0.9 // indirect
gopkg.in/stretchr/testify.v1 v1.2.2 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
k8s.io/api v0.27.3 // indirect
k8s.io/kubernetes v1.24.2 // indirect
sigs.k8s.io/controller-runtime v0.11.0 // indirect
Expand All @@ -75,7 +65,7 @@ require (

require (
cloud.google.com/go/compute v1.14.0 // indirect
dagger.io/dagger v0.7.4
dagger.io/dagger v0.9.2
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
github.com/Masterminds/semver/v3 v3.2.0 // indirect
Expand Down Expand Up @@ -164,12 +154,12 @@ require (
go.opentelemetry.io/otel v1.11.1 // indirect
go.opentelemetry.io/otel/trace v1.11.1 // indirect
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
golang.org/x/crypto v0.11.0 // indirect
golang.org/x/net v0.12.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/net v0.16.0 // indirect
golang.org/x/oauth2 v0.7.0 // indirect
golang.org/x/sync v0.4.0
golang.org/x/sys v0.10.0 // indirect
golang.org/x/term v0.10.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/time v0.1.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef // indirect
Expand Down
Loading