Skip to content

Turn on CI workflow #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 14, 2021
Merged

Turn on CI workflow #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
014ddab
Gardening
davdroman Jun 3, 2021
b6adbe4
Update CI macOS 11 runner name
davdroman Jun 3, 2021
086de1d
Turn on CI workflow
davdroman Jun 3, 2021
44fb60c
Cancel previous CI runs via workflow concurrency
davdroman Jun 22, 2021
ef01adf
Fix hidden test logs
davdroman Jul 13, 2021
bafcb10
Fix iOS tests
davdroman Jul 13, 2021
1bd0c25
Set up arch-specific macOS snapshot testing
davdroman Jul 13, 2021
43d7cf4
Use dump snapshots for macOS testing
davdroman Jul 14, 2021
3c1eb92
Add TODO
davdroman Jul 14, 2021
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
18 changes: 8 additions & 10 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@ on:
branches:
- master

concurrency:
group: ${{ github.ref }}
cancel-in-progress: true

jobs:
CI:
if: false # off until this is resolved https://github.com/actions/virtual-environments/issues/2486
runs-on: macos-11.0
runs-on: macos-11
strategy:
fail-fast: false
matrix:
Expand All @@ -20,7 +23,7 @@ jobs:
include:
- platform: iOS
action: test
destination: "'platform=iOS Simulator,name=iPhone 8,OS=14.4'"
destination: "'platform=iOS Simulator,name=iPhone 8,OS=14.5'"

- platform: iOS
action: archive
Expand All @@ -34,11 +37,6 @@ jobs:
action: archive
destination: "'platform=macOS,arch=x86_64'"
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.5.0
with:
access_token: ${{ github.token }}

- name: Git Checkout
uses: actions/checkout@v2

Expand All @@ -47,8 +45,8 @@ jobs:

- name: ${{ matrix.platform }} ${{ matrix.action }}
run: |
NSUnbufferedIO=YES \
set -o pipefail && \
xcodebuild clean ${{ matrix.action }} \
-destination ${{ matrix.destination }} \
-scheme TextBuilder \
2>&1 | xcbeautify
| xcbeautify
4 changes: 3 additions & 1 deletion Tests/TextBuilderTests/TextSnapshotHelpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ func assertTextSnapshot(_ text: Text, file: StaticString = #file, testName: Stri
.background(Color.white)

#if os(macOS)
// TODO: `image` snapshot tests on macOS
// https://github.com/pointfreeco/swift-snapshot-testing/pull/477
let nsView = NSHostingView(rootView: view)
assertSnapshot(
matching: nsView,
as: .image(size: nsView.fittingSize),
as: .dump,
named: "macOS",
record: isRecording,
file: file,
Expand Down
Binary file removed .../TextBuilderTests/__Snapshots__/TextBuilderTests/testBasicTextBuilder.macOS.png
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions Tests/TextBuilderTests/__Snapshots__/TextBuilderTests/testBasicTextBuilder.macOS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- <_TtGC7SwiftUI13NSHostingViewGVS_15ModifiedContentGS1_GS1_GS1_VS_4TextGVS_30_EnvironmentKeyWritingModifierOS_11ColorScheme__GS3_OS_19ContentSizeCategory__VS_16_FixedSizeLayout_GVS_19_BackgroundModifierVS_5Color___>
Binary file removed ...extBuilderTests/__Snapshots__/TextBuilderTests/testComplexTextBuilder.macOS.png
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions Tests/TextBuilderTests/__Snapshots__/TextBuilderTests/testComplexTextBuilder.macOS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- <_TtGC7SwiftUI13NSHostingViewGVS_15ModifiedContentGS1_GS1_GS1_VS_4TextGVS_30_EnvironmentKeyWritingModifierOS_11ColorScheme__GS3_OS_19ContentSizeCategory__VS_16_FixedSizeLayout_GVS_19_BackgroundModifierVS_5Color___>
Binary file removed ...TextBuilderTests/__Snapshots__/TextBuilderTests/testCustomTextBuilder.macOS.png
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions Tests/TextBuilderTests/__Snapshots__/TextBuilderTests/testCustomTextBuilder.macOS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- <_TtGC7SwiftUI13NSHostingViewGVS_15ModifiedContentGS1_GS1_GS1_VS_4TextGVS_30_EnvironmentKeyWritingModifierOS_11ColorScheme__GS3_OS_19ContentSizeCategory__VS_16_FixedSizeLayout_GVS_19_BackgroundModifierVS_5Color___>
Binary file removed ...tBuilderTests/__Snapshots__/TextBuilderTests/testMultilineTextBuilder.macOS.png
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions Tests/TextBuilderTests/__Snapshots__/TextBuilderTests/testMultilineTextBuilder.macOS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- <_TtGC7SwiftUI13NSHostingViewGVS_15ModifiedContentGS1_GS1_GS1_VS_4TextGVS_30_EnvironmentKeyWritingModifierOS_11ColorScheme__GS3_OS_19ContentSizeCategory__VS_16_FixedSizeLayout_GVS_19_BackgroundModifierVS_5Color___>
Binary file removed ...TextBuilderTests/__Snapshots__/TextBuilderTests/testSpacedTextBuilder.macOS.png
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions Tests/TextBuilderTests/__Snapshots__/TextBuilderTests/testSpacedTextBuilder.macOS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- <_TtGC7SwiftUI13NSHostingViewGVS_15ModifiedContentGS1_GS1_GS1_VS_4TextGVS_30_EnvironmentKeyWritingModifierOS_11ColorScheme__GS3_OS_19ContentSizeCategory__VS_16_FixedSizeLayout_GVS_19_BackgroundModifierVS_5Color___>
Binary file removed ...lderTests/__Snapshots__/TextExtensionsTests/testInit_newlineSeparator.macOS.png
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions Tests/TextBuilderTests/__Snapshots__/TextExtensionsTests/testInit_newlineSeparator.macOS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- <_TtGC7SwiftUI13NSHostingViewGVS_15ModifiedContentGS1_GS1_GS1_VS_4TextGVS_30_EnvironmentKeyWritingModifierOS_11ColorScheme__GS3_OS_19ContentSizeCategory__VS_16_FixedSizeLayout_GVS_19_BackgroundModifierVS_5Color___>
Binary file removed ...xtBuilderTests/__Snapshots__/TextExtensionsTests/testInit_noSeparator.macOS.png
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions Tests/TextBuilderTests/__Snapshots__/TextExtensionsTests/testInit_noSeparator.macOS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- <_TtGC7SwiftUI13NSHostingViewGVS_15ModifiedContentGS1_GS1_GS1_VS_4TextGVS_30_EnvironmentKeyWritingModifierOS_11ColorScheme__GS3_OS_19ContentSizeCategory__VS_16_FixedSizeLayout_GVS_19_BackgroundModifierVS_5Color___>
Binary file removed ...uilderTests/__Snapshots__/TextExtensionsTests/testInit_spaceSeparator.macOS.png
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions Tests/TextBuilderTests/__Snapshots__/TextExtensionsTests/testInit_spaceSeparator.macOS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- <_TtGC7SwiftUI13NSHostingViewGVS_15ModifiedContentGS1_GS1_GS1_VS_4TextGVS_30_EnvironmentKeyWritingModifierOS_11ColorScheme__GS3_OS_19ContentSizeCategory__VS_16_FixedSizeLayout_GVS_19_BackgroundModifierVS_5Color___>
Binary file removed ...Tests/__Snapshots__/TextExtensionsTests/testJoined_formattedSeparator.macOS.png
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions ...extBuilderTests/__Snapshots__/TextExtensionsTests/testJoined_formattedSeparator.macOS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- <_TtGC7SwiftUI13NSHostingViewGVS_15ModifiedContentGS1_GS1_GS1_VS_4TextGVS_30_EnvironmentKeyWritingModifierOS_11ColorScheme__GS3_OS_19ContentSizeCategory__VS_16_FixedSizeLayout_GVS_19_BackgroundModifierVS_5Color___>
Binary file removed ...BuilderTests/__Snapshots__/TextExtensionsTests/testJoined_noSeparator.macOS.png
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions Tests/TextBuilderTests/__Snapshots__/TextExtensionsTests/testJoined_noSeparator.macOS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- <_TtGC7SwiftUI13NSHostingViewGVS_15ModifiedContentGS1_GS1_GS1_VS_4TextGVS_30_EnvironmentKeyWritingModifierOS_11ColorScheme__GS3_OS_19ContentSizeCategory__VS_16_FixedSizeLayout_GVS_19_BackgroundModifierVS_5Color___>
Binary file removed ...lderTests/__Snapshots__/TextExtensionsTests/testJoined_spaceSeparator.macOS.png
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions Tests/TextBuilderTests/__Snapshots__/TextExtensionsTests/testJoined_spaceSeparator.macOS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- <_TtGC7SwiftUI13NSHostingViewGVS_15ModifiedContentGS1_GS1_GS1_VS_4TextGVS_30_EnvironmentKeyWritingModifierOS_11ColorScheme__GS3_OS_19ContentSizeCategory__VS_16_FixedSizeLayout_GVS_19_BackgroundModifierVS_5Color___>