renaming

ethanndickson · ethanndickson · commit a9cfb4d875d4 · 2024-11-15T06:29:16.000Z
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -863,8 +863,6 @@ jobs:
 
           make gen/mark-fresh
           make build/coder-dylib
-          # Remove a header file since they're identical
-          rm "$(ls ./build/*.h 2>/dev/null | head -n 1)" 2>/dev/null
         env:
           CODER_SIGN_DARWIN: "1"
           AC_CERTIFICATE_FILE: /tmp/apple_cert.p12
@@ -875,8 +873,8 @@ jobs:
         with:
           name: dylibs
           path: |
-            ./build/*.h
-            ./build/*.dylib
+            ./site/out/bin/*.h
+            ./site/out/bin/*.dylib
           retention-days: 7
 
   build:
@@ -928,13 +926,7 @@ jobs:
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
           name: dylibs
-          path: ./build
-
-      - name: Insert dylibs
-        run: |
-          mv ./build/*amd64.dylib ./site/out/bin/coder-amd64.dylib
-          mv ./build/*arm64.dylib ./site/out/bin/coder-arm64.dylib
-          mv ./build/*.h          ./site/out/bin/coder-dylib.h
+          path: ./site/out/bin
 
       - name: Build
         run: |
diff --git a/Makefile b/Makefile
@@ -84,7 +84,7 @@ DYLIB_ARCHES := darwin_amd64.dylib darwin_arm64.dylib
 
 # Computed variables based on the above.
 CODER_SLIM_BINARIES      := $(addprefix build/coder-slim_$(VERSION)_,$(OS_ARCHES))
-CODER_DYLIBS             := $(addprefix build/coder-desktop_$(VERSION)_,$(DYLIB_ARCHES))
+CODER_DYLIBS             := $(addprefix build/coder-vpn_$(VERSION)_,$(DYLIB_ARCHES))
 CODER_FAT_BINARIES       := $(addprefix build/coder_$(VERSION)_,$(OS_ARCHES))
 CODER_ALL_BINARIES       := $(CODER_SLIM_BINARIES) $(CODER_FAT_BINARIES)
 CODER_TAR_GZ_ARCHIVES    := $(foreach os_arch, $(ARCHIVE_TAR_GZ), build/coder_$(VERSION)_$(os_arch).tar.gz)
@@ -253,7 +253,8 @@ $(CODER_DYLIBS): go.mod go.sum $(GO_SRC_FILES)
 			--output "$@" \
 			--dylib
 
-		cp "$@" "./site/out/bin/coder-desktop-$$os-$$arch.dylib"
+		cp "$@" "./site/out/bin/coder-vpn-$$os-$$arch.dylib"
+		cp "*.h" "./site/out/bin/coder-vpn-$$os.h"
 	else
 		echo "Skipping dylib build on non-Darwin OS"
 	fi
diff --git a/scripts/build_go.sh b/scripts/build_go.sh
@@ -186,7 +186,7 @@ if [[ "$dylib" == 1 ]]; then
 	cmd_path="./vpn/dylib/lib.go"
 	build_args+=("-buildmode=c-shared")
 	sdk="$(xcrun --sdk macosx --show-sdk-path)"
-	bin_ident="com.coder.desktop"
+	bin_ident="com.coder.vpn"
 fi
 
 goexp=""
