diff --git a/.github/workflows/build-syncthing-macos.yml b/.github/workflows/build-syncthing-macos.yml
index 12ecd40..a8a828d 100644
--- a/.github/workflows/build-syncthing-macos.yml
+++ b/.github/workflows/build-syncthing-macos.yml
@@ -17,21 +17,29 @@ jobs:
build-debug:
name: Build debug
if: github.event_name == 'push' && github.ref != 'refs/heads/release' # Debug not necessary on release branch (develop is intermediate branch)
- runs-on: macos-latest
+ runs-on: macos-13
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Build debug target
- run: |
- make debug
+ run: make debug
+
+ - name: Prepare debug build for artifact
+ run: make debug-dist
+
+ - name: Archive artifacts
+ uses: actions/upload-artifact@v4
+ with:
+ name: syncthing-macos-debug
+ path: Build/Products/Debug/dist
build-release:
name: Build release
if: github.event_name == 'push' && github.ref == 'refs/heads/release'
environment: signing
- runs-on: macos-latest
+ runs-on: macos-13
steps:
- uses: actions/checkout@v4
with:
diff --git a/Makefile b/Makefile
index fa91329..4f330f5 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,9 @@ all: debug
debug:
xcodebuild -workspace "syncthing.xcworkspace" -derivedDataPath $(PWD) -configuration Debug -scheme Pods-syncthing
xcodebuild -workspace "syncthing.xcworkspace" -derivedDataPath $(PWD) -configuration Debug -scheme syncthing
+debug-dist:
+ mkdir -p Build/Products/Debug/dist
+ cp -r Build/Products/Debug/Syncthing.app Build/Products/Debug/dist
debug-dmg:
xcodebuild -workspace "syncthing.xcworkspace" -derivedDataPath $(PWD) -configuration Debug -scheme Pods-syncthing
xcodebuild -workspace "syncthing.xcworkspace" -derivedDataPath $(PWD) -configuration Debug -scheme syncthing-dmg
diff --git a/cmd/update-release.py b/cmd/update-release.py
index e2aa828..de7efd2 100755
--- a/cmd/update-release.py
+++ b/cmd/update-release.py
@@ -14,7 +14,7 @@
from urllib.request import urlopen
from string import Template
-distVersion = 1
+distVersion = 2
latest_url = "https://api.github.com/repos/syncthing/syncthing/releases/latest"
infoPlist = 'syncthing/Info.plist'
infoPlistTmpl = 'syncthing/Info.plist.tmpl'
diff --git a/syncthing/Info.plist b/syncthing/Info.plist
index 13fc9d4..d2aea58 100644
--- a/syncthing/Info.plist
+++ b/syncthing/Info.plist
@@ -19,9 +19,9 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.29.2-1
+ 1.29.2-2
CFBundleVersion
- 102900201
+ 102900202
LSApplicationCategoryType
public.app-category.utilities
LSMinimumSystemVersion
diff --git a/syncthing/STApplication.m b/syncthing/STApplication.m
index 4e2b35a..e6ad1fa 100644
--- a/syncthing/STApplication.m
+++ b/syncthing/STApplication.m
@@ -76,7 +76,6 @@ - (void)applicationLoadConfiguration {
_executable = [NSString stringWithFormat:@"%@/%@",
[[NSBundle mainBundle] resourcePath],
@"syncthing/syncthing"];
- [defaults setValue:_executable forKey:@"Executable"];
}
_syncthing.URI = [defaults stringForKey:@"URI"];
@@ -203,7 +202,7 @@ - (void)refreshDevices {
self.toggleAllDevicesItem.title = @"Pause All Devices";
[[self statusMonitor] setCurrentStatus:SyncthingStatusIdle];
}
-
+
self.devicesPaused = allPaused;
}