diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec259108..4ca14d41 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: sudo apt-get update sudo apt-get install -y --no-install-recommends shellcheck curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sudo sh -s -- -b /usr/local/bin v1.23.8 - curl -L https://github.com/cuelang/cue/releases/download/v0.3.0-beta.4/cue_0.3.0-beta.4_Linux_x86_64.tar.gz | sudo tar zxf - -C /usr/local/bin + curl -L https://github.com/cuelang/cue/releases/download/v0.3.0-beta.5/cue_0.3.0-beta.5_Linux_x86_64.tar.gz | sudo tar zxf - -C /usr/local/bin - name: Check out uses: actions/checkout@v2 diff --git a/Makefile b/Makefile index 6929bc5f..ba2c989d 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ cuefmt: @(cue fmt -s ./examples/*) .PHONY: lint -lint: cuefmt check-buildkit-version +lint: cuefmt check-buildkit-version check-cue-version golangci-lint run @test -z "$$(git status -s . | grep -e "^ M" | grep .cue | cut -d ' ' -f3 | tee /dev/stderr)" @@ -30,9 +30,16 @@ check-buildkit-version: "$(shell grep ' = "v' ./pkg/buildkitd/buildkitd.go | sed -E 's/^.*version.*=.*\"(v.*)\"/\1/' )" \ || { echo buildkit version mismatch go.mod != pkg/buildkitd/buildkitd.go ; exit 1; } +.PHONY: check-cue-version +check-cue-version: + @grep -q "$(shell grep cue ./go.mod | cut -d' ' -f2)" .github/workflows/ci.yml \ + || { echo cue version mismatch go.mod != .github/workflows/ci.yml ; exit 1; } + + .PHONY: integration integration: dagger-debug # Self-diagnostics ./tests/test-test.sh 2>/dev/null # Actual integration tests DAGGER_BINARY="./cmd/dagger/dagger-debug" time ./tests/test.sh all +