diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ca14d41..f1b11b9f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,16 +17,21 @@ jobs: go-version: 1.16 id: go + - name: Check out + uses: actions/checkout@v2 + - name: Install Dependencies run: | sudo apt-get update sudo apt-get install -y --no-install-recommends shellcheck + + export CUE_VERSION="$(grep cue ./go.mod | cut -d' ' -f2)" + export CUE_TARBALL="cue_$(echo "$CUE_VERSION" | sed 's/^v//')_Linux_x86_64.tar.gz" + + echo "Installing cue version $CUE_VERSION" 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.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 + curl -L https://github.com/cuelang/cue/releases/download/${CUE_VERSION}/${CUE_TARBALL} | sudo tar zxf - -C /usr/local/bin - name: Build run: | make diff --git a/Makefile b/Makefile index ba2c989d..efc5b1f6 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ cuefmt: @(cue fmt -s ./examples/*) .PHONY: lint -lint: cuefmt check-buildkit-version check-cue-version +lint: cuefmt check-buildkit-version golangci-lint run @test -z "$$(git status -s . | grep -e "^ M" | grep .cue | cut -d ' ' -f3 | tee /dev/stderr)" @@ -30,12 +30,6 @@ 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