(build) Fix github workflow and bump v2.0.16 packaging from upstream

Author: xor-gate

.github/workflows/build-syncthing-macos.yml

@@ -14,26 +14,26 @@ on:
 # that lead up to code being packaged and signed.
 
 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-13
-#    steps:
-#      - uses: actions/checkout@v4
-#        with:
-#          fetch-depth: 0
-#
-#      - name: Build debug target
-#        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-debug:
+    name: Build debug
+    if: github.event_name == 'pull_request' && github.ref != 'refs/heads/v2' # Debug not necessary on release branch (develop is intermediate branch)
+    runs-on: macos-15
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Build debug target
+        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

Makefile

@@ -1,18 +1,14 @@
 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
 release:
-	xcodebuild -workspace "syncthing.xcworkspace" -derivedDataPath $(PWD) -configuration Release -scheme Pods-syncthing
 	xcodebuild -workspace "syncthing.xcworkspace" -derivedDataPath $(PWD) -configuration Release -scheme syncthing
 release-dmg:
-	xcodebuild -workspace "syncthing.xcworkspace" -derivedDataPath $(PWD) -configuration Release -scheme Pods-syncthing
 	xcodebuild -workspace "syncthing.xcworkspace" -derivedDataPath $(PWD) -configuration Release -scheme syncthing-dmg
 update-release:
 	$(MAKE) -C cmd/update-release run

syncthing/Info.plist

@@ -24,9 +24,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.14-1</string>
+	<string>2.0.16-1</string>
 	<key>CFBundleVersion</key>
-	<string>200001401</string>
+	<string>200001601</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

syncthing/Scripts/syncthing-resource.sh

@@ -2,7 +2,7 @@
 set -euo pipefail
 
 # Download and unpack syncthing into ${PRODUCT_NAME}.app/Contents/Resources
-SYNCTHING_VERSION="2.0.14"
+SYNCTHING_VERSION="2.0.16"
 SYNCTHING_DIST_URL="https://github.com/syncthing/syncthing/releases/download"
 SYNCTHING_TARBALL_URL="${SYNCTHING_DIST_URL}/v${SYNCTHING_VERSION}/syncthing-macos-universal-v${SYNCTHING_VERSION}.zip"