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

ci: cleaner pattern for sharing base images across actions

Browse Source 
Signed-off-by: Sam Alba <samalba@users.noreply.github.com>
This commit is contained in:
Sam Alba 2022-02-17 11:58:31 -08:00
parent f17c470feb
commit 8e2f3eb21d
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ci/base.cue → ci/images.cue
View File

@ -8,10 +8,11 @@ let GoVersion = "1.17"
let GolangCILintVersion = "1.44.0" let GolangCILintVersion = "1.44.0"
// Base container images used for the CI // Base container images used for the CI
images: { #Images: {
// base image to build go binaries // base image to build go binaries
goBuilder: docker.#Build & { goBuilder: _goBuilder.output
_goBuilder: docker.#Build & {
_packages: ["bash", "git"] _packages: ["bash", "git"]
steps: [ steps: [
@ -35,7 +36,8 @@ images: {
// base image for the Go linter // base image for the Go linter
// https://golangci-lint.run/usage/install/#docker // https://golangci-lint.run/usage/install/#docker
goLinter: docker.#Build & { goLinter: _goLinter.output
_goLinter: docker.#Build & {
steps: [ steps: [
docker.#Pull & { docker.#Pull & {
source: "index.docker.io/golangci/golangci-lint:v\(GolangCILintVersion)" source: "index.docker.io/golangci/golangci-lint:v\(GolangCILintVersion)"

6
ci/main.cue
View File

@ -33,6 +33,8 @@ engine.#Plan & {
id: "go mod cache" id: "go mod cache"
} }
baseImages: #Images
source: "dagger source code": { source: "dagger source code": {
contents: inputs.directories.source.contents contents: inputs.directories.source.contents
dest: "/usr/src/dagger" dest: "/usr/src/dagger"
@ -40,7 +42,7 @@ engine.#Plan & {
// FIXME: build only if the linter passed // FIXME: build only if the linter passed
build: bash.#Run & { build: bash.#Run & {
input: images.goBuilder.output input: baseImages.goBuilder
env: { env: {
GOMODCACHE: mounts["go mod cache"].dest GOMODCACHE: mounts["go mod cache"].dest
@ -71,7 +73,7 @@ engine.#Plan & {
} }
goLint: bash.#Run & { goLint: bash.#Run & {
input: images.goLinter.output input: baseImages.goLinter
// FIXME: the source volume is too slow, taking >3m on docker for mac (vs < 2sec on the host machine) // FIXME: the source volume is too slow, taking >3m on docker for mac (vs < 2sec on the host machine)
script: contents: "golangci-lint run -v --timeout 5m" script: contents: "golangci-lint run -v --timeout 5m"