Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .github/workflows/restrict-main.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Sources/ForeFlightKML/Styles/IconStyle.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 0 additions & 4 deletions Sources/ForeFlightKML/Utils/Protocols.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
}