Skip to content

Commit acbdf11

Browse files
liamnicholsliamnichols
authored
Merge branch 'jpsim:main' into main
2 parents 3357d51 + 3969849 commit acbdf11

25 files changed

+323
-144
lines changed

‎.github/workflows/bazel.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121

2222
jobs:
2323
MacOS:
24-
runs-on: macos-11
24+
runs-on: macos-12
2525
steps:
2626
- uses: actions/checkout@v2
2727
- name: MacOS build test
@@ -47,7 +47,7 @@ jobs:
4747
Linux:
4848
strategy:
4949
matrix:
50-
tag: ['5.1', '5.2', '5.3', '5.4', '5.5']
50+
tag: ['5.4', '5.5', '5.6']
5151
runs-on: ubuntu-latest
5252
container:
5353
image: swift:${{ matrix.tag }}

‎.github/workflows/cmake.yml

+35-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
CMake:
2626
strategy:
2727
matrix:
28-
xcode_version: ['11.7', '12.4', '12.5.1', '13.0', '13.1']
28+
xcode_version: ['12.5.1', '13.0', '13.1', '13.2.1']
2929
runs-on: macos-11
3030
env:
3131
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode_version }}.app
@@ -38,3 +38,37 @@ jobs:
3838
- run: cmake --build build
3939
- run: cmake --build build --target install
4040
- run: file /usr/local/lib/swift/macosx/libYams.dylib | grep "Mach-O 64-bit dynamically linked shared library x86_64"
41+
42+
CMake_Monterey:
43+
strategy:
44+
matrix:
45+
xcode_version: ['13.3', '13.4']
46+
runs-on: macos-12
47+
env:
48+
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode_version }}.app
49+
steps:
50+
- uses: actions/checkout@v2
51+
- run: brew install cmake ninja
52+
- run: swift -version
53+
- run: rm -rf build
54+
- run: cmake -B build -G Ninja -S . -DCMAKE_BUILD_TYPE=Release
55+
- run: cmake --build build
56+
- run: cmake --build build --target install
57+
- run: file /usr/local/lib/swift/macosx/libYams.dylib | grep "Mach-O 64-bit dynamically linked shared library x86_64"
58+
59+
CMake_Linux:
60+
strategy:
61+
matrix:
62+
tag: ['5.6-focal', '5.6-bionic']
63+
runs-on: ubuntu-latest
64+
container:
65+
image: swift:${{ matrix.tag }}
66+
steps:
67+
- uses: actions/checkout@v2
68+
- run: apt-get update && apt-get install -y ninja-build curl
69+
- run: curl -L https://github.com/Kitware/CMake/releases/download/v3.23.1/cmake-3.23.1-linux-x86_64.tar.gz | tar xz --strip-components=1 -C /usr
70+
- run: swift -version
71+
- run: rm -rf build
72+
- run: cmake -B build -G Ninja -S . -DCMAKE_BUILD_TYPE=Release
73+
- run: cmake --build build
74+
- run: cmake --build build --target install

‎.github/workflows/jazzy.yml

+14-4
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,24 @@ on:
2424
jobs:
2525
Jazzy:
2626
runs-on: ubuntu-latest
27-
container:
28-
image: norionomura/jazzy:0.13.6_swift-5.3.3
2927
steps:
3028
- uses: actions/checkout@v2
31-
- run: bundle install --path vendor/bundle
29+
- uses: ruby/setup-ruby@v1
30+
with:
31+
ruby-version: 2.7.5
32+
bundler-cache: true
33+
env:
34+
ImageOS: ubuntu18
35+
- uses: fwal/setup-swift@v1
36+
with:
37+
swift-version: "5.6"
38+
- name: Install SourceKitten
39+
uses: fjcaetano/[email protected]
40+
with:
41+
package: jpsim/SourceKitten
3242
- run: swift build
3343
- name: Generate documentation json
34-
run: sourcekitten doc --spm-module Yams > yams.json
44+
run: /home/runner/.mint/bin/sourcekitten doc --spm --module-name Yams > yams.json
3545
- name: Run jazzy
3646
run: bundle exec jazzy --clean --sourcekitten-sourcefile yams.json
3747
- name: Validate documentation coverage

‎.github/workflows/pod_lib_lint.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ on:
2020
jobs:
2121
pod_lib_lint:
2222
name: pod lib lint
23-
runs-on: macos-11
23+
runs-on: macos-12
2424
env:
25-
DEVELOPER_DIR: /Applications/Xcode_13.1.app
25+
DEVELOPER_DIR: /Applications/Xcode_13.4.app
2626
steps:
2727
- uses: actions/checkout@v2
2828
- run: bundle install --path vendor/bundle

‎.github/workflows/swiftlint.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ on:
1010
jobs:
1111
SwiftLint:
1212
runs-on: ubuntu-latest
13+
container:
14+
image: ghcr.io/realm/swiftlint:0.47.1
1315
steps:
1416
- uses: actions/checkout@v2
15-
- name: GitHub Action for SwiftLint
16-
uses: norio-nomura/action-swiftlint@3.1.0
17+
- name: SwiftLint
18+
run: swiftlint lint

‎.github/workflows/swiftlint_analyze.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ on:
2121

2222
jobs:
2323
Analyze:
24-
runs-on: macos-11
24+
runs-on: macos-12
2525
env:
26-
DEVELOPER_DIR: /Applications/Xcode_13.1.app
26+
DEVELOPER_DIR: /Applications/Xcode_13.4.app
2727
steps:
2828
- uses: actions/checkout@v2
2929
- name: Generate xcodebuild.log
30-
run: xcodebuild -scheme Yams -project Yams.xcodeproj clean build-for-testing > xcodebuild.log
30+
run: xcodebuild -sdk macosx -scheme Yams -project Yams.xcodeproj clean build-for-testing > xcodebuild.log
3131
shell: bash
3232
- name: Install SwiftLint
3333
run: brew install swiftlint || brew upgrade swiftlint

‎.github/workflows/swiftpm.yml

+15-15
Original file line numberDiff line numberDiff line change
@@ -27,42 +27,42 @@ jobs:
2727
Xcode:
2828
strategy:
2929
matrix:
30-
xcode_version: ['11.2.1', '11.3.1', '11.4.1', '11.5', '11.6', '12.0.1', '12.1']
31-
runs-on: macOS-10.15
30+
xcode_version: ['12.5.1', '13.0', '13.1', '13.2.1']
31+
runs-on: macos-11
3232
env:
3333
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode_version }}.app
3434
steps:
3535
- uses: actions/checkout@v2
3636
- run: swift -version
3737
- run: YAMS_DEFAULT_ENCODING=UTF16 swift test --parallel
3838
- run: YAMS_DEFAULT_ENCODING=UTF8 swift test --parallel
39+
- name: Code Coverage
40+
if: matrix.xcode_version == '13.2.1'
41+
run: |
42+
swift test --enable-code-coverage
43+
xcrun llvm-cov export -format="lcov" .build/debug/YamsPackageTests.xctest/Contents/MacOS/YamsPackageTests -instr-profile .build/debug/codecov/default.profdata > coverage.lcov
44+
if [[ -n "${CODECOV_TOKEN}" ]]; then
45+
bash <(curl -s https://codecov.io/bash) -f coverage.lcov
46+
fi
47+
env: { 'CODECOV_TOKEN': '${{ secrets.CODECOV_TOKEN }}' }
3948

40-
Xcode_Big_Sur:
49+
Xcode_Monterey:
4150
strategy:
4251
matrix:
43-
xcode_version: ['11.7', '12.4', '12.5.1', '13.0', '13.1']
44-
runs-on: macos-11
52+
xcode_version: ['13.3.1', '13.4']
53+
runs-on: macos-12
4554
env:
4655
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode_version }}.app
4756
steps:
4857
- uses: actions/checkout@v2
4958
- run: swift -version
5059
- run: YAMS_DEFAULT_ENCODING=UTF16 swift test --parallel
5160
- run: YAMS_DEFAULT_ENCODING=UTF8 swift test --parallel
52-
- name: Code Coverage
53-
if: matrix.xcode_version == '13.1'
54-
run: |
55-
swift test --enable-code-coverage
56-
xcrun llvm-cov export -format="lcov" .build/debug/YamsPackageTests.xctest/Contents/MacOS/YamsPackageTests -instr-profile .build/debug/codecov/default.profdata > coverage.lcov
57-
if [[ -n "${CODECOV_TOKEN}" ]]; then
58-
bash <(curl -s https://codecov.io/bash) -f coverage.lcov
59-
fi
60-
env: { 'CODECOV_TOKEN': '${{ secrets.CODECOV_TOKEN }}' }
6161

6262
Linux:
6363
strategy:
6464
matrix:
65-
tag: ['5.1', '5.2', '5.3', '5.4', '5.5']
65+
tag: ['5.4', '5.5', '5.6']
6666
runs-on: ubuntu-latest
6767
container:
6868
image: swift:${{ matrix.tag }}

‎.github/workflows/xcodebuild.yml

+10-19
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,12 @@ jobs:
2626
strategy:
2727
matrix:
2828
xcode:
29-
- version: '11.2.1'
30-
- version: '11.3.1'
31-
- version: '11.4.1'
32-
- version: '11.5'
33-
- version: '11.6'
34-
- version: '11.7'
35-
- version: '12.0.1'
36-
- version: '12.1'
37-
- version: '12.2'
38-
- version: '12.4'
29+
- version: '12.5.1'
30+
- version: '13.0'
31+
- version: '13.1'
32+
- version: '13.2.1'
3933
xcode_flags: ['-scheme Yams -project Yams.xcodeproj']
40-
runs-on: macOS-10.15
34+
runs-on: macos-11
4135
env:
4236
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode.version }}.app
4337
steps:
@@ -64,17 +58,14 @@ jobs:
6458
run: xcodebuild ${{ matrix.xcode_flags }} build -sdk watchsimulator | xcpretty
6559
shell: bash
6660

67-
xcodebuild_Big_Sur:
61+
xcodebuild_Monterey:
6862
strategy:
6963
matrix:
7064
xcode:
71-
- version: '11.7'
72-
- version: '12.4'
73-
- version: '12.5.1'
74-
- version: '13.0'
75-
- version: '13.1'
65+
- version: '13.3.1'
66+
- version: '13.4'
7667
xcode_flags: ['-scheme Yams -project Yams.xcodeproj']
77-
runs-on: macos-11
68+
runs-on: macos-12
7869
env:
7970
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode.version }}.app
8071
steps:
@@ -94,7 +85,7 @@ jobs:
9485
shell: bash
9586
- name: Apple TV Simulator
9687
if: always()
97-
run: xcodebuild ${{ matrix.xcode_flags }} test -sdk appletvsimulator -destination "name=Apple TV 4K" | xcpretty
88+
run: xcodebuild ${{ matrix.xcode_flags }} test -sdk appletvsimulator -destination "name=Apple TV 4K (2nd generation)" | xcpretty
9889
shell: bash
9990
- name: watchOS Simulator
10091
if: always()

‎.spi.yml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
version: 1
2+
builder:
3+
configs:
4+
- documentation_targets: [Yams]

‎CHANGELOG.md

+46
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,49 @@
1+
## Main
2+
3+
##### Breaking
4+
5+
* None.
6+
7+
##### Enhancements
8+
9+
* None.
10+
11+
##### Bug Fixes
12+
13+
* None.
14+
15+
## 5.0.1
16+
17+
##### Breaking
18+
19+
* None.
20+
21+
##### Enhancements
22+
23+
* None.
24+
25+
##### Bug Fixes
26+
27+
* Build CYaml as PIC (Position Independent Code) when building with
28+
CMake.
29+
[Yuta Saito](https://github.com/kateinoigakukun)
30+
31+
## 5.0.0
32+
33+
##### Breaking
34+
35+
* Swift 5.4 or later is now required to build Yams.
36+
[JP Simard](https://github.com/jpsim)
37+
38+
##### Enhancements
39+
40+
* Adding `sequenceStyle` and `mappingStyle` to `Emitter.Options`
41+
[Terence Grant](https://github.com/tatewake)
42+
43+
##### Bug Fixes
44+
45+
* None.
46+
147
## 4.0.6
248

349
##### Breaking

0 commit comments

Comments
 (0)