From 4c35b8174ad0294e8a18016f56abab98a066d71a Mon Sep 17 00:00:00 2001
From: Kyle Carberry <kyle@coder.com>
Date: Wed, 4 May 2022 09:47:48 -0500
Subject: [PATCH] fix: Prefix paths in find on macOS (#1284)

This fixes paths not resolving in macOS, causing
the build target to fail. This also renames the
site target to specify the index.html, which is
the output artifact of building the site.
---
 .github/workflows/coder.yaml   | 4 ++--
 .github/workflows/release.yaml | 2 +-
 Makefile                       | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/coder.yaml b/.github/workflows/coder.yaml
index 3d0742c458..e3d57e7768 100644
--- a/.github/workflows/coder.yaml
+++ b/.github/workflows/coder.yaml
@@ -355,7 +355,7 @@ jobs:
             js-${{ runner.os }}-
 
       - name: Build site
-        run: make site/out
+        run: make site/out/index.html
 
       - name: Build Release
         uses: goreleaser/goreleaser-action@v2.9.1
@@ -488,7 +488,7 @@ jobs:
 
       - name: Build
         run: |
-          make site/out
+          make site/out/index.html
 
       - run: yarn playwright:install
         working-directory: site
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 7236c33b84..e025aa2a51 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -58,7 +58,7 @@ jobs:
         run: brew install make
 
       - name: Build Site
-        run: make site/out
+        run: make site/out/index.html
 
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2.9.1
diff --git a/Makefile b/Makefile
index e310af5747..ffc08fe329 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ INSTALL_DIR=$(shell go env GOPATH)/bin
 GOOS=$(shell go env GOOS)
 GOARCH=$(shell go env GOARCH)
 
-bin: $(shell find -not -path './vendor/*' -type f -name '*.go') go.mod go.sum
+bin: $(shell find . -not -path './vendor/*' -type f -name '*.go') go.mod go.sum
 	@echo "== This builds binaries for command-line usage."
 	@echo "== Use \"make build\" to embed the site."
 	goreleaser build --snapshot --rm-dist --single-target
@@ -20,7 +20,7 @@ coderd/database/dump.sql: $(wildcard coderd/database/migrations/*.sql)
 coderd/database/querier.go: coderd/database/dump.sql $(wildcard coderd/database/queries/*.sql)
 	coderd/database/generate.sh
 
-dist/artifacts.json: site/out $(shell find -not -path './vendor/*' -type f -name '*.go') go.mod go.sum
+dist/artifacts.json: site/out/index.html $(shell find . -not -path './vendor/*' -type f -name '*.go') go.mod go.sum
 	goreleaser release --snapshot --rm-dist --skip-sign
 
 fmt/prettier:
@@ -76,7 +76,7 @@ provisionersdk/proto/provisioner.pb.go: provisionersdk/proto/provisioner.proto
 		--go-drpc_opt=paths=source_relative \
 		./provisionersdk/proto/provisioner.proto
 
-site/out: $(shell find ./site -not -path './site/node_modules/*' -type f -name '*.tsx') $(shell find ./site -not -path './site/node_modules/*' -type f -name '*.ts') site/package.json
+site/out/index.html: $(shell find ./site -not -path './site/node_modules/*' -type f -name '*.tsx') $(shell find ./site -not -path './site/node_modules/*' -type f -name '*.ts') site/package.json
 	./scripts/yarn_install.sh
 	cd site && yarn typegen
 	cd site && yarn build