Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@ updates:
directory: "/"
schedule:
interval: "weekly"
ignore:
# taiki-e/install-action is referenced by its floating @v2 major tag and
# ships patch releases almost daily. Without this, Dependabot rewrites
# @v2 to a patch pin (@v2.x.y) and reopens that PR every week. Major
# bumps still get a PR.
- dependency-name: "taiki-e/install-action"
update-types:
- "version-update:semver-minor"
- "version-update:semver-patch"

# Cargo is configured only to record accepted-risk suppressions, not to open
# version-bump PRs (open-pull-requests-limit: 0 disables version updates; the
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/S1-Test-CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ jobs:
- uses: Swatinem/rust-cache@v2

- name: Install Node
uses: actions/setup-node@v6
uses: actions/setup-node@v7
with:
node-version: 24

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/S2-Release-GitHub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ jobs:
- uses: Swatinem/rust-cache@v2

- name: Install Node
uses: actions/setup-node@v6
uses: actions/setup-node@v7
with:
node-version: 24

Expand Down Expand Up @@ -502,7 +502,7 @@ jobs:
find artifacts -type f -exec cp {} release-assets/ \;

- name: Create/update release
uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
uses: softprops/action-gh-release@efb35369e0ad2afab669f228072c1b0d510eae64 # v3.0.3
with:
files: release-assets/*
env:
Expand Down
6 changes: 3 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ members = [
resolver = "2"

[workspace.package]
version = "3.1.0"
version = "3.1.1"
edition = "2021"
authors = ["Manuel Gruber"]
license = "MIT"
Expand Down
2 changes: 1 addition & 1 deletion crates/git-same-app/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://schema.tauri.app/config/2",
"productName": "Git-Same",
"version": "3.1.0",
"version": "3.1.1",
"identifier": "com.zaai.git-same",
"build": {
"beforeDevCommand": "corepack pnpm dev",
Expand Down
2 changes: 1 addition & 1 deletion crates/git-same-app/ui/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "git-same-app-ui",
"private": true,
"version": "3.1.0",
"version": "3.1.1",
"type": "module",
"packageManager": "pnpm@11.0.9+sha512.34ce82e6780233cf9cad8685029a8f81d2e06196c5a9bad98879f7424940c6817c4e4524fb7d38b8553ceed48b9758b8ebaf1abd3600c232c4c8cf7366086f38",
"scripts": {
Expand Down
24 changes: 12 additions & 12 deletions crates/git-same-app/ui/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/git-same-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ tui = ["dep:ratatui", "dep:crossterm"]
release-tools = ["dep:clap_complete", "dep:clap_mangen"]

[dependencies]
git-same-core = { path = "../git-same-core", version = "=3.1.0" }
git-same-core = { path = "../git-same-core", version = "=3.1.1" }
clap = { workspace = true }
tokio = { workspace = true }
serde = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions macos/GitSameBadges/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>3.1.0</string>
<string>3.1.1</string>
<key>CFBundleVersion</key>
<string>3.1.0</string>
<string>3.1.1</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
Expand Down
43 changes: 26 additions & 17 deletions toolkit/homebrew/cask.rb.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -29,30 +29,39 @@ cask "git-same" do
binary "#{appdir}/Git-Same.app/Contents/Helpers/git-same", target: "gitsa"
binary "#{appdir}/Git-Same.app/Contents/Helpers/git-same", target: "gisa"

postflight do
legacy_plist_dst = "#{Dir.home}/Library/LaunchAgents/com.zaai.git-same.daemon.plist"
if File.exist?(legacy_plist_dst)
system_command "/bin/launchctl", args: ["unload", legacy_plist_dst], sudo: false, must_succeed: false
File.delete(legacy_plist_dst)
# Steps run in Homebrew's sandbox with a throwaway HOME, so file paths use
# `base: :home` (the real home) instead of "~". `run` args have no home
# token, so launchctl paths are spelled /Users/{{user}}. All launchctl and
# pluginkit calls are best-effort: the agent also loads at next login.
postflight_steps do
if_path_exists "Library/LaunchAgents/com.zaai.git-same.daemon.plist", base: :home do
run "/bin/launchctl",
args: ["unload", "/Users/{{user}}/Library/LaunchAgents/com.zaai.git-same.daemon.plist"],
must_succeed: false
remove "Library/LaunchAgents/com.zaai.git-same.daemon.plist", base: :home
end

plist_src = "#{appdir}/Git-Same.app/Contents/Resources/com.zaai.git-same.monitor.plist"
plist_dst = "#{Dir.home}/Library/LaunchAgents/com.zaai.git-same.monitor.plist"
monitor_binary = "#{appdir}/Git-Same.app/Contents/Helpers/git-same"

FileUtils.mkdir_p(File.dirname(plist_dst))
rendered = File.read(plist_src).gsub("__GIT_SAME_MONITOR_BINARY__", monitor_binary)
File.write(plist_dst, rendered)
system_command "/bin/launchctl", args: ["unload", plist_dst], sudo: false, must_succeed: false
system_command "/bin/launchctl", args: ["load", plist_dst], sudo: false, must_succeed: false
copy "Git-Same.app/Contents/Resources/com.zaai.git-same.monitor.plist",
"Library/LaunchAgents/com.zaai.git-same.monitor.plist",
source_base: :appdir, target_base: :home
inreplace "Library/LaunchAgents/com.zaai.git-same.monitor.plist",
"__GIT_SAME_MONITOR_BINARY__",
"{{appdir}}/Git-Same.app/Contents/Helpers/git-same",
base: :home
run "/bin/launchctl",
args: ["unload", "/Users/{{user}}/Library/LaunchAgents/com.zaai.git-same.monitor.plist"],
must_succeed: false
run "/bin/launchctl",
args: ["load", "/Users/{{user}}/Library/LaunchAgents/com.zaai.git-same.monitor.plist"],
must_succeed: false

# Clear stale FinderSync registration from pre-rename builds (id was
# `com.zaai.git-same.GitSameBadge.FinderSync`; renamed to
# `com.zaai.git-same.badges` in 3.1.0). Best-effort: ignored if the id
# is not present in pluginkit's cache.
system_command "/usr/bin/pluginkit",
args: ["-e", "ignore", "-i", "com.zaai.git-same.GitSameBadge.FinderSync"],
sudo: false, must_succeed: false
run "/usr/bin/pluginkit",
args: ["-e", "ignore", "-i", "com.zaai.git-same.GitSameBadge.FinderSync"],
must_succeed: false
end

# Both labels listed for one release: `com.zaai.git-same.daemon` is the
Expand Down
Loading