Merge branch 'main' into cj/git-fetch

Author: johnstcn

.github/workflows/ci.yaml

@@ -57,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

Makefile

@@ -29,14 +29,17 @@ develop:
 build: scripts/envbuilder-$(GOARCH)
 	./scripts/build.sh
 
+.PHONY: gen
+gen: docs/env-variables.md update-golden-files
+
 .PHONY: update-golden-files
 update-golden-files: .gen-golden
 
 .gen-golden: $(GOLDEN_FILES) $(GO_SRC_FILES) $(GO_TEST_FILES)
 	go test ./options -update
 	@touch "$@"
 
-docs: options/options.go options/options_test.go
+docs/env-variables.md: options/options.go options/options_test.go
 	go run ./scripts/docsgen/main.go
 
 .PHONY: test
@@ -85,4 +88,4 @@ test-images-pull:
 	docker push localhost:5000/envbuilder-test-ubuntu:latest
 
 .registry-cache/docker/registry/v2/repositories/envbuilder-test-codercom-code-server:
-	docker push localhost:5000/envbuilder-test-codercom-code-server:latest
+	docker push localhost:5000/envbuilder-test-codercom-code-server:latest