Merge pull request #39 from openmeterio/improve-release

ci: improve binary archive

.github/workflows/ci.yaml

@@ -21,7 +21,7 @@ jobs:
           module: github.com/${{ github.repository }}/ci@${{ github.ref }}
           args: --checkout ${{ github.ref }} ci
           cloud-token: ${{ secrets.DAGGER_CLOUD_TOKEN }}
-          version: "0.9.5"
+          version: "0.9.7"
 
   build:
     name: Build

ci/build.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"path"
 	"strings"
 	"time"
 )
@@ -89,6 +88,7 @@ func (m *Build) binary(platform Platform, version string) *File {
 		WithCgoDisabled().
 		WithSource(m.Source).
 		Build(GoWithSourceBuildOpts{
+			Name:     "benthos",
 			Trimpath: true,
 			RawArgs: []string{
 				"-ldflags",
@@ -116,38 +116,21 @@ func (m *Build) binaryArchives(version string) []*File {
 }
 
 func (m *Build) binaryArchive(version string, platform Platform) *File {
-	binary := m.binary(platform, version)
+	var archiver interface {
+		Archive(name string, source *Directory) *File
+	} = dag.Archivist().TarGz()
 
-	dir := dag.Directory().
-		WithFile("benthos", binary).
-		WithFile("", m.Source.File("README.md")).
-		WithFile("", m.Source.File("LICENSE"))
-
-	archiveName := fmt.Sprintf("benthos_%s.tar.gz", strings.ReplaceAll(string(platform), "/", "_"))
-
-	return dag.Container().
-		From(alpineBaseImage).
-		WithWorkdir("/work").
-		WithMountedDirectory("/work", dir).
-		WithExec([]string{"tar", "-czf", archiveName, "."}).
-		File(path.Join("/work", archiveName))
-}
-
-func (m *Build) checksums(files []*File) *File {
-	return dag.Container().
-		From(alpineBaseImage).
-		WithWorkdir("/work").
-		With(func(c *Container) *Container {
-			dir := dag.Directory()
-
-			for _, file := range files {
-				dir = dir.WithFile("", file)
-			}
+	if strings.HasPrefix(string(platform), "windows/") {
+		archiver = dag.Archivist().Zip()
+	}
 
-			return c.WithMountedDirectory("/work", dir)
-		}).
-		WithExec([]string{"sh", "-c", "sha256sum $(ls) > checksums.txt"}).
-		File("/work/checksums.txt")
+	return archiver.Archive(
+		fmt.Sprintf("benthos_%s", strings.ReplaceAll(string(platform), "/", "_")),
+		dag.Directory().
+			WithFile("", m.binary(platform, version)).
+			WithFile("", m.Source.File("README.md")).
+			WithFile("", m.Source.File("LICENSE")),
+	)
 }
 
 func (m *Build) HelmChart(

ci/dagger.json

@@ -8,11 +8,12 @@
     "api/client/node/node_modules"
   ],
   "dependencies": [
+    "github.com/sagikazarmark/daggerverse/archivist@493a0d97d9468d8dee23dec1f805268e940c386d",
+    "github.com/sagikazarmark/daggerverse/checksum@5b3e18c117fb761d645d04c69347b0e1ced73e77",
     "github.com/sagikazarmark/daggerverse/gh@ef6b5bf932277ffc4b7e1ea9fd9a1c26a2780da3",
-    "github.com/sagikazarmark/daggerverse/go@54de323eba85e8d1154751b84a3fb7ab8e2fdd8e",
+    "github.com/sagikazarmark/daggerverse/go@493a0d97d9468d8dee23dec1f805268e940c386d",
     "github.com/sagikazarmark/daggerverse/golangci-lint@fd0f3da52f511b9188a6f5bd44b193e3d614f0e2",
     "github.com/sagikazarmark/daggerverse/helm-docs@1e4b4c1ac88f2980870d084f51f5adb33bf227a3",
-    "github.com/sagikazarmark/daggerverse/helm@4e48ba4471930a7b1f131f029afd4785c8a6f133",
-    "github.com/shykes/daggerverse/supergit@4113b803fcf4ba83b39cd464856af94656197cbf"
+    "github.com/sagikazarmark/daggerverse/helm@4e48ba4471930a7b1f131f029afd4785c8a6f133"
   ]
 }

ci/go.mod

@@ -11,5 +11,5 @@ require (
 
 require (
 	github.com/stretchr/testify v1.8.3 // indirect
-	github.com/vektah/gqlparser/v2 v2.5.6 // indirect
+	github.com/vektah/gqlparser/v2 v2.5.6
 )

ci/release.go

@@ -120,7 +120,7 @@ func (m *Ci) pushImages(ctx context.Context, version string, tags []string) erro
 
 func (m *Ci) releaseAssets(version string) []*File {
 	binaryArchives := m.Build().binaryArchives(version)
-	checksums := m.Build().checksums(binaryArchives)
+	checksums := dag.Checksum().Sha256().Calculate(binaryArchives)
 
 	return append(binaryArchives, checksums)
 }