From 3db1a2c4301bb67ff7781e27f8817949c5a18718 Mon Sep 17 00:00:00 2001
From: Christian Schlatter <schlatter@puzzle.ch>
Date: Sat, 1 Jul 2023 01:05:26 +0200
Subject: [PATCH] possible fix for github ci

---
 .github/workflows/main.yml |  9 ++---
 ci/main.go                 | 72 +++++++++++++++++++++-----------------
 2 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 43d6f55..61b4af0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,12 +14,13 @@ jobs:
   dagger:
     runs-on: ubuntu-latest
     services:
-      reposerver:
-        image: quay.io/puzzle/argocd-repo-server:latest
+      argocd-redis:
+        image: redis
         ports:
-          - "8081:8081"
+          - "6379:6379"
+        # Set health checks to wait until redis has started
         options: >-
-          --health-cmd "nc -z localhost 8081"
+          --health-cmd "redis-cli ping"
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
diff --git a/ci/main.go b/ci/main.go
index 6ad8b4a..048e7e8 100644
--- a/ci/main.go
+++ b/ci/main.go
@@ -43,40 +43,13 @@ func (g *GoffPipeline) run() error {
 	}
 	defer daggerClient.Close()
 
-	// create golang base
-	goMod := daggerClient.CacheVolume("go")
-	base := daggerClient.Container(dagger.ContainerOpts{Platform: "linux/amd64"}).
-		From("golang:1.20").
-		WithMountedCache("/go/src", goMod)
-
-	//install musl for alpine builds on base image
-	base = base.
-		WithWorkdir("/src").
-		WithExec([]string{"apt", "update"}).
-		WithExec([]string{"apt", "install", "musl-tools", "-y"})
-
-	// get working directory on host
-	modDir := daggerClient.Host().Directory(".", dagger.HostDirectoryOpts{
-		Include: []string{"go.mod", "go.sum"},
-	})
-
-	//download go modules
-	golang := base.WithDirectory("/src", modDir).
-		WithExec([]string{"go", "mod", "download"})
-
-	//get working directory on host, load files, exclude build and ci directory
-	source := daggerClient.Host().Directory(".", dagger.HostDirectoryOpts{
-		Exclude: []string{"ci/", "build/"},
-	})
-
-	//add source to container
-	golang = golang.WithDirectory("/src", source)
+	golang := createGoBase(daggerClient)
 
 	//new error group for concurrent execution
 	errGroup, _ := errgroup.WithContext(ctx)
 
 	errGroup.Go(func() error {
-		return runTests(ctx, daggerClient, golang)
+		return runTests(ctx, golang, daggerClient)
 	})
 
 	errGroup.Go(func() error {
@@ -119,6 +92,40 @@ func (g *GoffPipeline) run() error {
 	return nil
 }
 
+// create golang base
+func createGoBase(daggerClient *dagger.Client) *dagger.Container {
+	goMod := daggerClient.CacheVolume("go")
+	goChache := daggerClient.CacheVolume("go-cache")
+
+	base := daggerClient.Container(dagger.ContainerOpts{Platform: "linux/amd64"}).
+		From("golang:1.20").
+		WithMountedCache("/go/src", goMod).
+		WithMountedCache("/root/.cache/go-build", goChache)
+
+	//install musl for alpine builds on base image
+	base = base.
+		WithWorkdir("/src").
+		WithExec([]string{"apt", "update"}).
+		WithExec([]string{"apt", "install", "musl-tools", "-y"})
+
+	// get working directory on host
+	modDir := daggerClient.Host().Directory(".", dagger.HostDirectoryOpts{
+		Include: []string{"go.mod", "go.sum"},
+	})
+
+	//download go modules
+	golang := base.WithDirectory("/src", modDir).
+		WithExec([]string{"go", "mod", "download"})
+
+		//get working directory on host, load files, exclude build and ci directory
+	source := daggerClient.Host().Directory(".", dagger.HostDirectoryOpts{
+		Exclude: []string{"ci/", "build/"},
+	})
+
+	golang = golang.WithDirectory("/src", source)
+	return golang
+}
+
 func buildAndPushDevImage(ctx context.Context, golang *dagger.Container, g *GoffPipeline, daggerClient *dagger.Client) error {
 
 	goffGitlab, err := golang.
@@ -152,14 +159,15 @@ func buildAndPushDevImage(ctx context.Context, golang *dagger.Container, g *Goff
 
 }
 
-func runTests(ctx context.Context, daggerClient *dagger.Client, golang *dagger.Container) error {
+func runTests(ctx context.Context, golang *dagger.Container, daggerClient *dagger.Client) error {
+
 	repoServer := daggerClient.Container().From("quay.io/puzzle/argocd-repo-server:latest").
 		WithExposedPort(8081).
-		WithEntrypoint([]string{"argocd-repo-server"}).WithExec(nil)
+		WithEntrypoint([]string{"argocd-repo-server"})
 
 	_, err := golang.
 		WithServiceBinding("reposerver", repoServer).
-		WithExec([]string{"go", "test", "./...", "-v"}).Stdout(ctx)
+		WithExec([]string{"go", "test", "./...", "-v"}).Sync(ctx)
 	return err
 }