retry

ethanndickson · ethanndickson · commit d84a705124b3 · 2024-11-15T07:32:50.000Z
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -873,8 +873,8 @@ jobs:
         with:
           name: dylibs
           path: |
-            ./site/out/bin/*.h
-            ./site/out/bin/*.dylib
+            ./build/*.h
+            ./build/*.dylib
           retention-days: 7
 
   build:
@@ -926,7 +926,13 @@ jobs:
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
           name: dylibs
-          path: ./site/out/bin
+          path: ./build
+
+      - name: Insert dylibs
+        run: |
+            mv ./build/*amd64.dylib ./site/out/bin/coder-desktop-darwin-amd64.dylib
+            mv ./build/*arm64.dylib ./site/out/bin/coder-desktop-darwin-arm64.dylib
+            mv ./build/*arm64.h     ./site/out/bin/coder-desktop-darwin-dylib.h
 
       - name: Build
         run: |
diff --git a/Makefile b/Makefile
@@ -84,7 +84,7 @@ DYLIB_ARCHES := darwin_amd64 darwin_arm64
 
 # Computed variables based on the above.
 CODER_SLIM_BINARIES      := $(addprefix build/coder-slim_$(VERSION)_,$(OS_ARCHES))
-CODER_DYLIBS             := $(foreach os_arch, $(DYLIB_ARCHES), build/coder-vpn_$(VERSION)_$(os_arch))
+CODER_DYLIBS             := $(foreach os_arch, $(DYLIB_ARCHES), build/coder-vpn_$(VERSION)_$(os_arch).dylib)
 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)
@@ -250,11 +250,9 @@ $(CODER_DYLIBS): go.mod go.sum $(GO_SRC_FILES)
 			--os "$$os" \
 			--arch "$$arch" \
 			--version "$(VERSION)" \
-			--output "$@.dylib" \
+			--output "$@" \
 			--dylib
 
-		cp "$@.dylib"   "./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
