flake & makefile

ethanndickson · ethanndickson · commit a82ac93f00ef · 2025-03-11T14:46:45.000+11:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -47,6 +47,7 @@ jobs:
 
       - name: Setup Nix
         uses: ./.github/actions/nix-devshell
+
       - name: Authenticate to Google Cloud
         id: gcloud_auth
         uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
@@ -55,17 +56,6 @@ jobs:
           service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }}
           token_format: "access_token"
 
-      - name: Setup GCloud SDK
-        uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a # v2.1.4
-
-      - name: Insert Mutagen resources
-        run: |
-          gsutil cp gs://coder-desktop/mutagen/v0.18.1/mutagen-agents.tar.gz "Coder Desktop/Resources/mutagen-agents.tar.gz"
-          gsutil cp gs://coder-desktop/mutagen/v0.18.1/mutagen-darwin-arm64 "Coder Desktop/Resources/mutagen-darwin-arm64"
-          gsutil cp gs://coder-desktop/mutagen/v0.18.1/mutagen-darwin-amd64 "Coder Desktop/Resources/mutagen-darwin-amd64"
-          chmod +x "Coder Desktop/Resources/mutagen-darwin-arm64"
-          chmod +x "Coder Desktop/Resources/mutagen-darwin-amd64"
-
       - name: Build
         env:
           APPLE_DEVELOPER_ID_PKCS12_B64: ${{ secrets.APPLE_DEVELOPER_ID_PKCS12_B64 }}
diff --git a/Makefile b/Makefile
@@ -34,7 +34,22 @@ APP_SIGNING_KEYCHAIN := $(if $(wildcard $(KEYCHAIN_FILE)),$(shell realpath $(KEY
 setup: \
 	$(XCPROJECT) \
 	$(PROJECT)/VPNLib/vpn.pb.swift \
-	$(PROJECT)/VPNLib/FileSync/daemon.pb.swift
+	$(PROJECT)/VPNLib/FileSync/daemon.pb.swift \
+	$(PROJECT)/Resources/mutagen-agents.tar.gz \
+	$(PROJECT)/Resources/mutagen-darwin-arm64 \
+	$(PROJECT)/Resources/mutagen-darwin-amd64
+
+# Mutagen resources
+$(PROJECT)/Resources/mutagen-agents.tar.gz:
+	gsutil cp gs://coder-desktop/mutagen/v0.18.1/mutagen-agents.tar.gz "$@"
+
+$(PROJECT)/Resources/mutagen-darwin-arm64:
+	gsutil cp gs://coder-desktop/mutagen/v0.18.1/mutagen-darwin-arm64 "$@"
+	chmod +x "$@"
+
+$(PROJECT)/Resources/mutagen-darwin-amd64:
+	gsutil cp gs://coder-desktop/mutagen/v0.18.1/mutagen-darwin-amd64 "$@"
+	chmod +x "$@"
 
 $(XCPROJECT): $(PROJECT)/project.yml
 	cd $(PROJECT); \
@@ -113,7 +128,7 @@ lint/actions: ## Lint GitHub Actions
 	zizmor .
 
 .PHONY: clean
-clean: clean/project clean/keychain clean/build ## Clean project and artifacts
+clean: clean/project clean/keychain clean/build clean/mutagen ## Clean project and artifacts
 
 .PHONY: clean/project
 clean/project:
@@ -136,6 +151,12 @@ clean/keychain:
 clean/build:
 	rm -rf build/ release/ $$out
 
+.PHONY: clean/mutagen
+clean/mutagen:
+	rm -f "$(PROJECT)/Resources/mutagen-agents.tar.gz"
+	rm -f "$(PROJECT)/Resources/mutagen-darwin-arm64"
+	rm -f "$(PROJECT)/Resources/mutagen-darwin-amd64"
+
 .PHONY: proto
 proto: $(PROJECT)/VPNLib/vpn.pb.swift $(PROJECT)/VPNLib/FileSync/daemon.pb.swift ## Generate Swift files from protobufs
 
diff --git a/flake.nix b/flake.nix
@@ -49,6 +49,7 @@
                 gh
                 git
                 gnumake
+                google-cloud-sdk
                 protobuf_28
                 grpc-swift.packages.${system}.protoc-gen-grpc-swift
                 grpc-swift.packages.${system}.protoc-gen-swift
