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

ci: download mutagen binary into resources#103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
ethanndickson merged 20 commits intomainfromethan/ci-mutagen-binary
Mar 12, 2025
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
Show all changes
20 commits
Select commitHold shift + click to select a range
9e5453f
ci: download mutagen binary into resources
ethanndicksonMar 10, 2025
560765a
retry
ethanndicksonMar 10, 2025
783e373
retry
ethanndicksonMar 10, 2025
e6e2c0a
retry
ethanndicksonMar 10, 2025
2ecf6dd
retry
ethanndicksonMar 10, 2025
57cdaf2
chmod
ethanndicksonMar 10, 2025
632d2b2
flake & makefile
ethanndicksonMar 10, 2025
b77dda7
fixup
ethanndicksonMar 10, 2025
c6506e9
improve clean & download
ethanndicksonMar 11, 2025
e85113e
remove google cloud auth
ethanndicksonMar 11, 2025
7f48e45
newline
ethanndicksonMar 11, 2025
3e29f02
switch to basename
ethanndicksonMar 11, 2025
e2b57da
improvement
ethanndicksonMar 11, 2025
fa835d0
improvement
ethanndicksonMar 11, 2025
85acb77
remove unused perm
ethanndicksonMar 11, 2025
8a13b43
validate mutagen version
ethanndicksonMar 11, 2025
9715718
remove tabs
ethanndicksonMar 11, 2025
7bb448b
add back oneshell
ethanndicksonMar 11, 2025
1780f03
undo
ethanndicksonMar 12, 2025
52d8876
download mutagen before xcodegen
ethanndicksonMar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion.github/workflows/release.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,13 @@ on:
release:
types: [published]

workflow_dispatch:
inputs:
dryrun:
description: 'Run in dry-run mode (upload as artifact instead of release asset)'
required: true
type: boolean
default: false
permissions: {}

# Cancel in-progress runs for when multiple PRs get merged
Expand DownExpand Up@@ -51,7 +58,18 @@ jobs:
EXT_PROF: ${{ secrets.CODER_DESKTOP_EXTENSION_PROVISIONPROFILE_B64 }}
run: make release

# Upload as artifact in dry-run mode
- name: Upload Build Artifact
if: ${{ inputs.dryrun }}
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
with:
name: coder-desktop-build
path: ${{ github.workspace }}/outputs/out
retention-days: 7

# Upload to release in non-dry-run mode
- name: Upload Release Assets
if: ${{ !inputs.dryrun }}
run: gh release upload "$RELEASE_TAG" "$out"/* --clobber
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All@@ -60,7 +78,7 @@ jobs:
update-cask:
name: Update homebrew-coder cask
runs-on: ${{ github.repository_owner == 'coder' && 'depot-macos-latest' || 'macos-latest'}}
if: ${{ github.repository_owner == 'coder' }}
if: ${{ github.repository_owner == 'coder'&& !inputs.dryrun}}
needs: build
steps:
- name: Checkout
Expand Down
3 changes: 3 additions & 0 deletions.gitignore
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -302,3 +302,6 @@ release/

# marker files
.fl5C1A396C

# Embedded mutagen resources
Coder Desktop/Resources/mutagen-*
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletionsCoder Desktop/Resources/.mutagenversion
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
v0.18.1
36 changes: 31 additions & 5 deletionsMakefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
# Use bash, and immediately exit on failure
SHELL := bash
.SHELLFLAGS := -ceu

# This doesn't work on directories.
# See https://stackoverflow.com/questions/25752543/make-delete-on-error-for-directory-targets
.DELETE_ON_ERROR:

ifdef CI
LINTFLAGS := --reporter github-actions-logging
FMTFLAGS := --lint --reporter github-actions-log
Expand All@@ -11,18 +19,26 @@ XCPROJECT := Coder\ Desktop/Coder\ Desktop.xcodeproj
SCHEME := Coder\ Desktop
SWIFT_VERSION := 6.0

MUTAGEN_RESOURCES := mutagen-agents.tar.gz mutagen-darwin-arm64 mutagen-darwin-amd64
ifndef MUTAGEN_VERSION
MUTAGEN_VERSION:=$(shell grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$$' $(PROJECT)/Resources/.mutagenversion)
endif
ifeq ($(strip $(MUTAGEN_VERSION)),)
$(error MUTAGEN_VERSION must be a valid version)
endif

ifndef CURRENT_PROJECT_VERSION
CURRENT_PROJECT_VERSION:=$(shell git describe --match 'v[0-9]*' --dirty='.devel' --always --tags)
CURRENT_PROJECT_VERSION:=$(shell git describe --match 'v[0-9]*' --dirty='.devel' --always --tags)
endif
ifeq ($(strip $(CURRENT_PROJECT_VERSION)),)
$(error CURRENT_PROJECT_VERSION cannot be empty)
$(error CURRENT_PROJECT_VERSION cannot be empty)
endif

ifndef MARKETING_VERSION
MARKETING_VERSION:=$(shell git describe --match 'v[0-9]*' --tags --abbrev=0 | sed 's/^v//' | sed 's/-.*$$//')
MARKETING_VERSION:=$(shell git describe --match 'v[0-9]*' --tags --abbrev=0 | sed 's/^v//' | sed 's/-.*$$//')
endif
ifeq ($(strip $(MARKETING_VERSION)),)
$(error MARKETING_VERSION cannot be empty)
$(error MARKETING_VERSION cannot be empty)
endif

# Define the keychain file name first
Expand All@@ -32,10 +48,16 @@ APP_SIGNING_KEYCHAIN := $(if $(wildcard $(KEYCHAIN_FILE)),$(shell realpath $(KEY

.PHONY: setup
setup: \
$(addprefix $(PROJECT)/Resources/,$(MUTAGEN_RESOURCES)) \
$(XCPROJECT) \
$(PROJECT)/VPNLib/vpn.pb.swift \
$(PROJECT)/VPNLib/FileSync/daemon.pb.swift

# Mutagen resources
$(addprefix $(PROJECT)/Resources/,$(MUTAGEN_RESOURCES)): $(PROJECT)/Resources/.mutagenversion
curl -sL "https://storage.googleapis.com/coder-desktop/mutagen/$(MUTAGEN_VERSION)/$$(basename "$@")" -o "$@"
chmod +x "$@"

$(XCPROJECT): $(PROJECT)/project.yml
cd $(PROJECT); \
SWIFT_VERSION=$(SWIFT_VERSION) \
Expand DownExpand Up@@ -113,7 +135,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/buildclean/mutagen## Clean project and artifacts

.PHONY: clean/project
clean/project:
Expand All@@ -136,6 +158,10 @@ clean/keychain:
clean/build:
rm -rf build/ release/ $$out

.PHONY: clean/mutagen
clean/mutagen:
find $(PROJECT)/Resources -name 'mutagen-*' -delete

.PHONY: proto
proto: $(PROJECT)/VPNLib/vpn.pb.swift $(PROJECT)/VPNLib/FileSync/daemon.pb.swift ## Generate Swift files from protobufs

Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp