diff --git a/.github/workflows/build-syncthing-macos.yml b/.github/workflows/build-syncthing-macos.yml index b81eb87..20147ae 100644 --- a/.github/workflows/build-syncthing-macos.yml +++ b/.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 diff --git a/Makefile b/Makefile index e2f8153..4c0bdf5 100644 --- a/Makefile +++ b/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 diff --git a/README.md b/README.md index 641e601..0453b7b 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Features include: Currently, macOS 11 or higher is necessary to run the latest version. For older version support, see the [FAQ](#faq-frequently-asked-questions). **syncthing-macos** is packaged as a disk image as an application bundled with the [syncthing](https://github.com/syncthing/syncthing/releases) binary. -To install [just download the dmg](https://github.com/syncthing/syncthing-macos/releases/latest), mount it and drag and drop the application to install. The only necessary configuration is to set the API key and URL when provisioning a remote syncthing instance, the local instance is auto-configured. The `syncthing-macos` application bundle disables the auto-updater of `syncthing` as it has its own update mechanism using [Sparkle](https://sparkle-project.org/). +To install [just download the DMG](https://github.com/syncthing/syncthing-macos/releases/latest), mount it and drag and drop the application to install. The only necessary configuration is to set the API key and URL when provisioning a remote syncthing instance, the local instance is auto-configured. The `syncthing-macos` application bundle disables the auto-updater of `syncthing` as it has its own update mechanism using [Sparkle](https://sparkle-project.org/). The latest version is available at [GitHub Releases](https://github.com/syncthing/syncthing-macos/releases/latest), or it can also be installed using [homebrew](https://github.com/Homebrew/homebrew-cask) [`brew install --cask syncthing-app`](https://formulae.brew.sh/cask/syncthing-app) @@ -218,9 +218,7 @@ defaults delete com.github.xor-gate.syncthing-macosx Executable ## Dependency management -[CocoaPods](https://cocoapods.org/) is used for dependency management. It can be installed -with [Homebrew](https://brew.sh/) package manager. For more information about CocoaPods read -the [CocoaPods Guides](https://guides.cocoapods.org/). +With [Homebrew](https://brew.sh/) package manager. And native XCode Swift packages (for Sparkle framework). ## Versioning scheme diff --git a/syncthing/Info.plist b/syncthing/Info.plist index f9db187..d1bb0de 100644 --- a/syncthing/Info.plist +++ b/syncthing/Info.plist @@ -24,9 +24,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.0.14-1 + 2.0.16-1 CFBundleVersion - 200001401 + 200001601 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/syncthing/Scripts/syncthing-resource.sh b/syncthing/Scripts/syncthing-resource.sh index 2945255..44cf50a 100755 --- a/syncthing/Scripts/syncthing-resource.sh +++ b/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"