coder · johnstcn · Jul 2, 2024 · Jul 2, 2024 · Jul 2, 2024 · Jul 3, 2024
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -39,6 +39,12 @@ jobs:
         with:
           go-version: "~1.22"
 
+      - name: Download Go modules
+        run: go mod download
+
+      - name: Lint
+        run: make -j lint
+
       - name: Test
         run: make test
   docs:
@@ -51,8 +57,8 @@ jobs:
         with:
           go-version: "~1.22"
 
-      - name: Generate docs
-        run: make docs
+      - name: Generate env vars docs
+        run: make docs/env-variables.md
 
       - name: Check for unstaged files
         run: git diff --exit-code
@@ -93,24 +99,23 @@ jobs:
       - name: Build
         if: github.event_name == 'pull_request'
         run: |
-          VERSION=$(./scripts/version.sh)-dev-$(git rev-parse --short HEAD)
-          BASE=ghcr.io/coder/envbuilder-preview
+          ./scripts/build.sh \
+            --arch=amd64
 
           ./scripts/build.sh \
-            --arch=amd64 \
-            --base=$BASE \
-            --tag=$VERSION
+            --arch=arm64
+
+          ./scripts/build.sh \
+            --arch=arm
 
       - name: Build and Push
         if: github.ref == 'refs/heads/main'
         run: |
-          VERSION=$(./scripts/version.sh)-dev-$(git rev-parse --short HEAD)
           BASE=ghcr.io/coder/envbuilder-preview
 
           ./scripts/build.sh \
             --arch=amd64 \
             --arch=arm64 \
             --arch=arm \
             --base=$BASE \
-            --tag=$VERSION \
             --push
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -19,7 +19,12 @@ jobs:
     name: Build and publish
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+
+        # Workaround for actions/checkout#1467
+      - name: Fetch tags
+        run: |
+          git fetch --tags --depth 1 --force
 
       - name: Echo Go Cache Paths
         id: go-cache-paths
@@ -44,11 +49,18 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and Push
+      - name: Get version
+        id: get-version
+        env:
+          ENVBUILDER_RELEASE: "t"
         run: |
-          VERSION=$(./scripts/version.sh)
-          BASE=ghcr.io/coder/envbuilder
+          echo "ENVBUILDER_VERSION=$(./scripts/version.sh)" >> $GITHUB_OUTPUT
 
+      - name: Build and Push
+        env:
+          VERSION: "${{ steps.get-version.outputs.ENVBUILDER_VERSION }}"
+          BASE: "ghcr.io/coder/envbuilder"
+        run: |
           ./scripts/build.sh \
             --arch=amd64 \
             --arch=arm64 \

diff --git a/Makefile b/Makefile
@@ -4,10 +4,25 @@ PWD=$(shell pwd)
 GO_SRC_FILES := $(shell find . -type f -name '*.go' -not -name '*_test.go')
 GO_TEST_FILES := $(shell find . -type f -not -name '*.go' -name '*_test.go')
 GOLDEN_FILES := $(shell find . -type f -name '*.golden')
+SHELL_SRC_FILES := $(shell find . -type f -name '*.sh')
+GOLANGCI_LINT_VERSION := v1.59.1
 
 fmt: $(shell find . -type f -name '*.go')
 	go run mvdan.cc/gofumpt@v0.6.0 -l -w .
 
+.PHONY: lint
+lint: lint/go lint/shellcheck
+
+.PHONY: lint/go
+lint/go: $(GO_SRC_FILES)
+	go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
+	golangci-lint run --timeout=10m
+
+.PHONY: lint/shellcheck
+lint/shellcheck: $(SHELL_SRC_FILES)
+	echo "--- shellcheck"
+	shellcheck --external-sources $(SHELL_SRC_FILES)
+
 develop:
 	./scripts/develop.sh
 
@@ -18,10 +33,10 @@ build: scripts/envbuilder-$(GOARCH)
 update-golden-files: .gen-golden
 
 .gen-golden: $(GOLDEN_FILES) $(GO_SRC_FILES) $(GO_TEST_FILES)
-	go test . -update
+	go test ./options -update
 	@touch "$@"
 
-docs: options.go
+docs/env-variables.md: options/options.go options/options_test.go
 	go run ./scripts/docsgen/main.go
 
 .PHONY: test