Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitac08c30

Browse files
committed
flake & makefile
1 parent6cf3aeb commitac08c30

File tree

3 files changed

+25
-13
lines changed

3 files changed

+25
-13
lines changed

‎.github/workflows/release.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ jobs:
4747

4848
-name:Setup Nix
4949
uses:./.github/actions/nix-devshell
50+
5051
-name:Authenticate to Google Cloud
5152
id:gcloud_auth
5253
uses:google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935# v2.1.8
@@ -55,17 +56,6 @@ jobs:
5556
service_account:${{ secrets.GCP_SERVICE_ACCOUNT }}
5657
token_format:"access_token"
5758

58-
-name:Setup GCloud SDK
59-
uses:google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a# v2.1.4
60-
61-
-name:Insert Mutagen resources
62-
run:|
63-
gsutil cp gs://coder-desktop/mutagen/v0.18.1/mutagen-agents.tar.gz "Coder Desktop/Resources/mutagen-agents.tar.gz"
64-
gsutil cp gs://coder-desktop/mutagen/v0.18.1/mutagen-darwin-arm64 "Coder Desktop/Resources/mutagen-darwin-arm64"
65-
gsutil cp gs://coder-desktop/mutagen/v0.18.1/mutagen-darwin-amd64 "Coder Desktop/Resources/mutagen-darwin-amd64"
66-
chmod +x "Coder Desktop/Resources/mutagen-darwin-arm64"
67-
chmod +x "Coder Desktop/Resources/mutagen-darwin-amd64"
68-
6959
-name:Build
7060
env:
7161
APPLE_DEVELOPER_ID_PKCS12_B64:${{ secrets.APPLE_DEVELOPER_ID_PKCS12_B64 }}

‎Makefile

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,22 @@ APP_SIGNING_KEYCHAIN := $(if $(wildcard $(KEYCHAIN_FILE)),$(shell realpath $(KEY
3434
setup:\
3535
$(XCPROJECT)\
3636
$(PROJECT)/VPNLib/vpn.pb.swift\
37-
$(PROJECT)/VPNLib/FileSync/daemon.pb.swift
37+
$(PROJECT)/VPNLib/FileSync/daemon.pb.swift\
38+
$(PROJECT)/Resources/mutagen-agents.tar.gz\
39+
$(PROJECT)/Resources/mutagen-darwin-arm64\
40+
$(PROJECT)/Resources/mutagen-darwin-amd64
41+
42+
# Mutagen resources
43+
$(PROJECT)/Resources/mutagen-agents.tar.gz:
44+
gsutil cp gs://coder-desktop/mutagen/v0.18.1/mutagen-agents.tar.gz"$@"
45+
46+
$(PROJECT)/Resources/mutagen-darwin-arm64:
47+
gsutil cp gs://coder-desktop/mutagen/v0.18.1/mutagen-darwin-arm64"$@"
48+
chmod +x"$@"
49+
50+
$(PROJECT)/Resources/mutagen-darwin-amd64:
51+
gsutil cp gs://coder-desktop/mutagen/v0.18.1/mutagen-darwin-amd64"$@"
52+
chmod +x"$@"
3853

3954
$(XCPROJECT):$(PROJECT)/project.yml
4055
cd$(PROJECT);\
@@ -113,7 +128,7 @@ lint/actions: ## Lint GitHub Actions
113128
zizmor.
114129

115130
.PHONY: clean
116-
clean: clean/project clean/keychain clean/build## Clean project and artifacts
131+
clean: clean/project clean/keychain clean/buildclean/mutagen## Clean project and artifacts
117132

118133
.PHONY: clean/project
119134
clean/project:
@@ -136,6 +151,12 @@ clean/keychain:
136151
clean/build:
137152
rm -rf build/ release/$$out
138153

154+
.PHONY: clean/mutagen
155+
clean/mutagen:
156+
rm -f"$(PROJECT)/Resources/mutagen-agents.tar.gz"
157+
rm -f"$(PROJECT)/Resources/mutagen-darwin-arm64"
158+
rm -f"$(PROJECT)/Resources/mutagen-darwin-amd64"
159+
139160
.PHONY: proto
140161
proto:$(PROJECT)/VPNLib/vpn.pb.swift$(PROJECT)/VPNLib/FileSync/daemon.pb.swift## Generate Swift files from protobufs
141162

‎flake.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
gh
5050
git
5151
gnumake
52+
google-cloud-sdk
5253
protobuf_28
5354
grpc-swift.packages.${system}.protoc-gen-grpc-swift
5455
grpc-swift.packages.${system}.protoc-gen-swift

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp