Skip to content

Commit 950332a

Browse files
nikitaamenikitaame
authored
Merge branch 'pointfreeco:main' into main
2 parents 1c71271 + bb0ea08 commit 950332a

File tree

86 files changed

+7738
-7005
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+7738
-7005
lines changed

‎.github/workflows/ci.yml

+7-13
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@ jobs:
1313
strategy:
1414
matrix:
1515
xcode:
16-
- "13.2.1" # Swift 5.5.2
17-
- "13.4.1" # Swift 5.6.1
18-
- "14.0" # Swift 5.7
16+
- "14.3.1"
1917

20-
name: macOS 12 (Xcode ${{ matrix.xcode }})
21-
runs-on: macos-12
18+
name: macOS 13 (Xcode ${{ matrix.xcode }})
19+
runs-on: macos-13
2220
steps:
23-
- uses: actions/checkout@v1
21+
- uses: actions/checkout@v3
2422
- name: Select Xcode ${{ matrix.xcode }}
2523
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
2624
- name: Run tests
@@ -30,8 +28,6 @@ jobs:
3028
strategy:
3129
matrix:
3230
swift:
33-
- "5.5"
34-
- "5.6"
3531
- "5.7"
3632

3733
name: Ubuntu (Swift ${{ matrix.swift }})
@@ -40,16 +36,14 @@ jobs:
4036
- uses: swift-actions/setup-swift@v1
4137
with:
4238
swift-version: ${{ matrix.swift }}
43-
- uses: actions/checkout@v2
39+
- uses: actions/checkout@v3
4440
- run: swift test
4541

4642
windows:
4743
strategy:
4844
matrix:
4945
swift:
50-
- "5.5"
51-
- "5.6"
52-
#- "5.7"
46+
- "5.8"
5347

5448
name: Windows (Swift ${{ matrix.swift }})
5549
runs-on: windows-2019
@@ -65,6 +59,6 @@ jobs:
6559
git config --global core.autocrlf false
6660
git config --global core.eol lf
6761
68-
- uses: actions/checkout@v2
62+
- uses: actions/checkout@v3
6963
- run: swift build
7064
- run: swift test

‎.github/workflows/format.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Format
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
concurrency:
9+
group: format-${{ github.ref }}
10+
cancel-in-progress: true
11+
12+
jobs:
13+
swift_format:
14+
name: swift-format
15+
runs-on: macos-13
16+
steps:
17+
- uses: actions/checkout@v3
18+
- name: Xcode Select
19+
run: sudo xcode-select -s /Applications/Xcode_14.3.1.app
20+
- name: Install
21+
run: brew install swift-format
22+
- name: Format
23+
run: make format
24+
- uses: stefanzweifel/git-auto-commit-action@v4
25+
with:
26+
commit_message: Run swift-format
27+
branch: 'main'
28+
env:
29+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/release.yml

+83
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
name: Release
2+
on:
3+
release:
4+
types: [published]
5+
workflow_dispatch:
6+
jobs:
7+
project-channel:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Dump Github context
11+
env:
12+
GITHUB_CONTEXT: ${{ toJSON(github) }}
13+
run: echo "$GITHUB_CONTEXT"
14+
- name: Slack Notification on SUCCESS
15+
if: success()
16+
uses: tokorom/action-slack-incoming-webhook@main
17+
env:
18+
INCOMING_WEBHOOK_URL: ${{ secrets.SLACK_PROJECT_CHANNEL_WEBHOOK_URL }}
19+
with:
20+
text: swift-snapshot-testing ${{ github.event.release.tag_name }} has been released.
21+
blocks: |
22+
[
23+
{
24+
"type": "header",
25+
"text": {
26+
"type": "plain_text",
27+
"text": "swift-snapshot-testing ${{ github.event.release.tag_name}}"
28+
}
29+
},
30+
{
31+
"type": "section",
32+
"text": {
33+
"type": "mrkdwn",
34+
"text": ${{ toJSON(github.event.release.body) }}
35+
}
36+
},
37+
{
38+
"type": "section",
39+
"text": {
40+
"type": "mrkdwn",
41+
"text": "${{ github.event.release.html_url }}"
42+
}
43+
}
44+
]
45+
46+
releases-channel:
47+
runs-on: ubuntu-latest
48+
steps:
49+
- name: Dump Github context
50+
env:
51+
GITHUB_CONTEXT: ${{ toJSON(github) }}
52+
run: echo "$GITHUB_CONTEXT"
53+
- name: Slack Notification on SUCCESS
54+
if: success()
55+
uses: tokorom/action-slack-incoming-webhook@main
56+
env:
57+
INCOMING_WEBHOOK_URL: ${{ secrets.SLACK_RELEASES_WEBHOOK_URL }}
58+
with:
59+
text: swift-snapshot-testing ${{ github.event.release.tag_name }} has been released.
60+
blocks: |
61+
[
62+
{
63+
"type": "header",
64+
"text": {
65+
"type": "plain_text",
66+
"text": "swift-snapshot-testing ${{ github.event.release.tag_name}}"
67+
}
68+
},
69+
{
70+
"type": "section",
71+
"text": {
72+
"type": "mrkdwn",
73+
"text": ${{ toJSON(github.event.release.body) }}
74+
}
75+
},
76+
{
77+
"type": "section",
78+
"text": {
79+
"type": "mrkdwn",
80+
"text": "${{ github.event.release.html_url }}"
81+
}
82+
}
83+
]

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ playground.xcworkspace
3939
# Package.pins
4040
.build/
4141
.swiftpm
42-
Package.resolved
4342

4443
# CocoaPods
4544
#

‎.spi.yml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# This is manifest file for the Swift Package Index for it to auto-generate and
2+
# host DocC documentation.
3+
#
4+
# For reference see https://swiftpackageindex.com/swiftpackageindex/spimanifest/documentation/spimanifest/commonusecases#Host-DocC-documentation-in-the-Swift-Package-Index
5+
6+
version: 1
7+
builder:
8+
configs:
9+
- documentation_targets:
10+
# First item in the list is the "landing" (default) target
11+
- SnapshotTesting
12+
- InlineSnapshotTesting
13+
- platform: watchos
14+
scheme: InlineSnapshotTesting

‎.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

-7
This file was deleted.

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
## Code of Conduct
44

5-
This project and everyone participating in it is governed by its [Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [email protected].
5+
This project and everyone participating in it is governed by its [Code of Conduct](.github/CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [email protected].

0 commit comments

Comments
 (0)