Skip to content
Merged
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
36 changes: 16 additions & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,44 +1,40 @@
name: CI

on:
push:
branches: [master]
pull_request:
push:
branches: [master]

jobs:
macos12:
runs-on: macos-12

strategy:
matrix:
xcode: ["14.2.0", "13.4.1"]

steps:
- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: ${{ matrix.xcode }}
- name: Checkout
uses: actions/checkout@v3
- name: Build and Test
run: swift test

linux:
runs-on: ubuntu-latest

strategy:
matrix:
swift: ["5.7.3", "5.6.3", "5.5.3"]
swift: ["6.2", "6.1", "5.10"]

container:
image: swift:${{ matrix.swift }}

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install System Dependencies
run: |
apt-get update
apt-get install -y libxml2-dev
- name: Build and Test
run: swift test

macos:
runs-on: macos-latest
needs: linux

steps:
- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: latest-stable
- name: Checkout
uses: actions/checkout@v4
- name: Build and Test
run: swift test
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated
.build
build/
DerivedData

Expand Down
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.0
6.2
2 changes: 1 addition & 1 deletion Sources/Error.swift
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public enum XMLError: Error {
}
let message = (^-^errorPtr.pointee.message)?.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
let code = Int(errorPtr.pointee.code)
xmlResetError(errorPtr)
xmlResetLastError()
return .libXMLError(code: code, message: message ?? "")
}
}
2 changes: 0 additions & 2 deletions Sources/Node.swift
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ extension XMLNodeType {
public static var XIncludeStart: xmlElementType { return XML_XINCLUDE_START }
/// XInclude End
public static var XIncludeEnd: xmlElementType { return XML_XINCLUDE_END }
/// DocbDocument
public static var DocbDocument: xmlElementType { return XML_DOCB_DOCUMENT_NODE }
}

infix operator ~=
Expand Down