From 21c20651759ec348884c6c482549792b8380b0e7 Mon Sep 17 00:00:00 2001 From: Dan Leedham Date: Mon, 16 Feb 2026 16:54:47 +0000 Subject: [PATCH 1/2] Remove duplicate Building protocol --- Sources/ForeFlightKML/Styles/IconStyle.swift | 2 +- Sources/ForeFlightKML/Utils/Protocols.swift | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Sources/ForeFlightKML/Styles/IconStyle.swift b/Sources/ForeFlightKML/Styles/IconStyle.swift index 720821a..dc80caf 100644 --- a/Sources/ForeFlightKML/Styles/IconStyle.swift +++ b/Sources/ForeFlightKML/Styles/IconStyle.swift @@ -130,7 +130,7 @@ public enum CustomIconType: Codable { "target": .target, "square": .square, "placemark_square": .placemarksquare, - "placemark_circle": .placemarkcircle, + "placemark_circle": .placemarkcircle ] public func encode(to encoder: any Encoder) throws { diff --git a/Sources/ForeFlightKML/Utils/Protocols.swift b/Sources/ForeFlightKML/Utils/Protocols.swift index 8783e78..379ca57 100644 --- a/Sources/ForeFlightKML/Utils/Protocols.swift +++ b/Sources/ForeFlightKML/Utils/Protocols.swift @@ -60,7 +60,3 @@ public extension KMLSubStyle { protocol Building { func build(as format: OutputFormat) throws -> BuildResult } - -protocol Building { - func build(as format: OutputFormat) throws -> BuildResult -} From e74d1a3d8d9854affbe433845ef3b5bddbd02cbb Mon Sep 17 00:00:00 2001 From: Dan Leedham Date: Mon, 16 Feb 2026 16:59:10 +0000 Subject: [PATCH 2/2] Action restricts merges != develop --- .github/workflows/restrict-main.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/restrict-main.yml diff --git a/.github/workflows/restrict-main.yml b/.github/workflows/restrict-main.yml new file mode 100644 index 0000000..d4316bd --- /dev/null +++ b/.github/workflows/restrict-main.yml @@ -0,0 +1,17 @@ +name: Restrict main merges + +on: + pull_request: + branches: + - main + +jobs: + check-branch: + runs-on: ubuntu-latest + steps: + - name: Ensure PR comes from develop + run: | + if [ "${{ github.head_ref }}" != "develop" ]; then + echo "Only develop can be merged into main." + exit 1 + fi