mirror of
https://github.com/outbackdingo/firezone.git
synced 2026-01-27 02:18:47 +00:00
chore: improve macos dev experience (#10363)
Quality of life improvements for macOS devs, mostly relevant when not using Xcode as daily driver - although some convenience functions & explicit sentry dependency should make it better there too.
This commit is contained in:
Mariusz Klochowicz
committed by
GitHub
GitHub
parent
852a7a9484
commit
b1ed2f8a5e
@@ -8,3 +8,9 @@ rustflags="-C force-frame-pointers=yes"
|
||||
# (can be removed once link.exe is fixed)
|
||||
[target.x86_64-pc-windows-msvc]
|
||||
linker = "rust-lld"
|
||||
|
||||
# Set consistent macOS deployment target to prevent rebuilds
|
||||
# when environment variables change between Xcode and CLI builds
|
||||
# This must match the Xcode project setting (12.4)
|
||||
[env]
|
||||
MACOSX_DEPLOYMENT_TARGET = "12.4"
|
||||
|
||||
@@ -436,7 +436,7 @@
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "swift format format --in-place --recursive --parallel .\nfind . -name \"*.swift\" -not -path \"./FirezoneNetworkExtension/Connlib/Generated/*\" | xargs swift format lint --parallel --strict -\n";
|
||||
shellScript = "make format\n";
|
||||
};
|
||||
8D8555822D0A796100A1EA09 /* Build Connlib */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
|
||||
@@ -11,11 +11,15 @@ let package = Package(
|
||||
// other packages.
|
||||
.library(name: "FirezoneKit", targets: ["FirezoneKit"])
|
||||
],
|
||||
dependencies: [],
|
||||
dependencies: [
|
||||
.package(url: "https://github.com/getsentry/sentry-cocoa", from: "8.55.0")
|
||||
],
|
||||
targets: [
|
||||
.target(
|
||||
name: "FirezoneKit",
|
||||
dependencies: []
|
||||
dependencies: [
|
||||
.product(name: "Sentry", package: "sentry-cocoa")
|
||||
]
|
||||
),
|
||||
.testTarget(
|
||||
name: "FirezoneKitTests",
|
||||
|
||||
@@ -3,15 +3,133 @@
|
||||
PLATFORM=macOS
|
||||
ARCH=$(shell uname -m)
|
||||
|
||||
# Set consistent environment to prevent Rust rebuilds
|
||||
# This must match the Xcode project setting
|
||||
export MACOSX_DEPLOYMENT_TARGET=12.4
|
||||
|
||||
build-macos:
|
||||
echo "Building debug build for ${PLATFORM}, ${ARCH}"
|
||||
cd ../../rust/apple-client-ffi && rm -rf ./Connlib.xcframework && ./build-rust.sh && ./build-xcframework-dev.sh
|
||||
@xcodebuild build -scheme Firezone -sdk macosx -destination 'platform=${PLATFORM},arch=${ARCH}'
|
||||
|
||||
|
||||
.PHONY: install
|
||||
install:
|
||||
@echo "Stopping any running Firezone instances..."
|
||||
@-osascript -e 'tell application "Firezone" to quit' 2>/dev/null || true
|
||||
@-pkill -x Firezone 2>/dev/null || true
|
||||
@echo "Stopping and removing Firezone network extension..."
|
||||
@-sudo pkill -f "Firezone.NetworkExtension" 2>/dev/null || true
|
||||
@-sudo systemextensionsctl uninstall 47R2M6779T dev.firezone.firezone.network-extension 2>/dev/null || true
|
||||
@-sudo systemextensionsctl uninstall 47R2M6779T dev.firezone.firezone.network-extension-systemextension 2>/dev/null || true
|
||||
@sleep 2
|
||||
@echo "Copying app to /Applications..."
|
||||
@sudo cp -R ~/Library/Developer/Xcode/DerivedData/Firezone-*/Build/Products/$(CONFIGURATION)/Firezone.app /Applications/
|
||||
@echo "Launching Firezone..."
|
||||
@open /Applications/Firezone.app
|
||||
|
||||
clean:
|
||||
@xcodebuild clean -scheme Firezone -sdk macosx -destination 'platform=${PLATFORM},arch=${ARCH}'
|
||||
cd ../../rust/apple-client-ffi && rm -rf ./Connlib.xcframework
|
||||
|
||||
.PHONY: format
|
||||
format:
|
||||
@swiftformat .
|
||||
@echo "Formatting Swift code..."
|
||||
@find . -name "*.swift" -not -path "./FirezoneNetworkExtension/Connlib/Generated/*" -not -path "./FirezoneKit/.build/*" | xargs swift format format --in-place --parallel
|
||||
@echo "Linting Swift code..."
|
||||
@find . -name "*.swift" -not -path "./FirezoneNetworkExtension/Connlib/Generated/*" -not -path "./FirezoneKit/.build/*" | xargs swift format lint --parallel --strict
|
||||
.PHONY: show-client-log
|
||||
show-client-log:
|
||||
@echo "Opening latest Firezone client log..."
|
||||
@latest_log=$$(find ~/Library/Group\ Containers/47R2M6779T.dev.firezone.firezone/Library/Caches/logs/app -name "*.jsonl" -print0 2>/dev/null | xargs -0 ls -t | head -1); \
|
||||
if [ -n "$$latest_log" ]; then \
|
||||
less "$$latest_log"; \
|
||||
else \
|
||||
echo "No log files found"; \
|
||||
fi
|
||||
|
||||
.PHONY: tail-client-log
|
||||
tail-client-log:
|
||||
@echo "Tailing latest Firezone client log..."
|
||||
@latest_log=$$(find ~/Library/Group\ Containers/47R2M6779T.dev.firezone.firezone/Library/Caches/logs/app -name "*.jsonl" -print0 2>/dev/null | xargs -0 ls -t | head -1); \
|
||||
if [ -n "$$latest_log" ]; then \
|
||||
tail -f "$$latest_log"; \
|
||||
else \
|
||||
echo "No log files found"; \
|
||||
fi
|
||||
|
||||
.PHONY: show-client-log-pretty
|
||||
show-client-log-pretty:
|
||||
@echo "Opening latest Firezone client log (formatted)..."
|
||||
@latest_log=$$(find ~/Library/Group\ Containers/47R2M6779T.dev.firezone.firezone/Library/Caches/logs/app -name "*.jsonl" -print0 2>/dev/null | xargs -0 ls -t | head -1); \
|
||||
if [ -n "$$latest_log" ]; then \
|
||||
jq -r '[.timestamp, .level, .message] | @tsv' "$$latest_log" | less; \
|
||||
else \
|
||||
echo "No log files found"; \
|
||||
fi
|
||||
|
||||
.PHONY: show-ext-log
|
||||
show-ext-log:
|
||||
@echo "Showing Firezone Network Extension logs from system console (last 30 minutes)..."
|
||||
@log show --predicate 'process CONTAINS "dev.firezone.firezone.network-extension" OR (subsystem CONTAINS "dev.firezone" AND process != "Firezone")' --last 30m | less
|
||||
|
||||
.PHONY: tail-ext-log
|
||||
tail-ext-log:
|
||||
@echo "Following Firezone Network Extension logs..."
|
||||
@log stream --predicate 'process CONTAINS "dev.firezone.firezone.network-extension" OR (subsystem CONTAINS "dev.firezone" AND process != "Firezone")'
|
||||
|
||||
.PHONY: show-all-logs
|
||||
show-all-logs:
|
||||
@echo "Showing all Firezone logs from system console (last 30 minutes)..."
|
||||
@log show --predicate '(process CONTAINS "Firezone" OR subsystem CONTAINS "dev.firezone") AND process != "codebook-lsp"' --last 30m | less
|
||||
|
||||
.PHONY: tail-all-logs
|
||||
tail-all-logs:
|
||||
@echo "Following all Firezone logs (including connlib from file)..."
|
||||
@# Stream console logs in background
|
||||
@log stream --predicate '(process CONTAINS "Firezone" OR subsystem CONTAINS "dev.firezone" OR category == "connlib") AND process != "codebook-lsp"' &
|
||||
@# Also tail connlib log file if accessible
|
||||
@if [ -r "/private/var/root/Library/Group Containers/47R2M6779T.dev.firezone.firezone/Library/Caches/logs/connlib/latest" ]; then \
|
||||
tail -f "/private/var/root/Library/Group Containers/47R2M6779T.dev.firezone.firezone/Library/Caches/logs/connlib/latest"; \
|
||||
else \
|
||||
echo "Note: connlib file logs require sudo access. Run 'make tail-connlib' with sudo for file logs."; \
|
||||
wait; \
|
||||
fi
|
||||
|
||||
.PHONY: show-connlib-log
|
||||
show-connlib-log:
|
||||
@echo "Viewing connlib log (requires sudo)..."
|
||||
@if [ -r "/private/var/root/Library/Group Containers/47R2M6779T.dev.firezone.firezone/Library/Caches/logs/connlib/latest" ]; then \
|
||||
less "/private/var/root/Library/Group Containers/47R2M6779T.dev.firezone.firezone/Library/Caches/logs/connlib/latest"; \
|
||||
else \
|
||||
sudo less "/private/var/root/Library/Group Containers/47R2M6779T.dev.firezone.firezone/Library/Caches/logs/connlib/latest"; \
|
||||
fi
|
||||
|
||||
.PHONY: tail-connlib-log
|
||||
tail-connlib-log:
|
||||
@echo "Following connlib log (requires sudo)..."
|
||||
@if [ -r "/private/var/root/Library/Group Containers/47R2M6779T.dev.firezone.firezone/Library/Caches/logs/connlib/latest" ]; then \
|
||||
tail -f "/private/var/root/Library/Group Containers/47R2M6779T.dev.firezone.firezone/Library/Caches/logs/connlib/latest"; \
|
||||
else \
|
||||
sudo tail -f "/private/var/root/Library/Group Containers/47R2M6779T.dev.firezone.firezone/Library/Caches/logs/connlib/latest"; \
|
||||
fi
|
||||
|
||||
.PHONY: show-tunnel-log
|
||||
show-tunnel-log:
|
||||
@echo "Viewing latest tunnel log (requires sudo)..."
|
||||
@latest_log=$$(sudo find "/private/var/root/Library/Group Containers/47R2M6779T.dev.firezone.firezone/Library/Caches/logs/tunnel" -name "*.jsonl" -print0 2>/dev/null | xargs -0 ls -t | head -1); \
|
||||
if [ -n "$$latest_log" ]; then \
|
||||
sudo less "$$latest_log"; \
|
||||
else \
|
||||
echo "No tunnel log files found"; \
|
||||
fi
|
||||
|
||||
.PHONY: tail-tunnel-log
|
||||
tail-tunnel-log:
|
||||
@echo "Following latest tunnel log (requires sudo)..."
|
||||
@latest_log=$$(sudo find "/private/var/root/Library/Group Containers/47R2M6779T.dev.firezone.firezone/Library/Caches/logs/tunnel" -name "*.jsonl" -print0 2>/dev/null | xargs -0 ls -t | head -1); \
|
||||
if [ -n "$$latest_log" ]; then \
|
||||
sudo tail -f "$$latest_log"; \
|
||||
else \
|
||||
echo "No tunnel log files found"; \
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user