Skip to content

Commit

Permalink
Merge branch 'pointfreeco:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
nikitaame authored Nov 1, 2023
2 parents 1c71271 + bb0ea08 commit 950332a
Show file tree
Hide file tree
Showing 86 changed files with 7,738 additions and 7,005 deletions.
20 changes: 7 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,12 @@ jobs:
strategy:
matrix:
xcode:
- "13.2.1" # Swift 5.5.2
- "13.4.1" # Swift 5.6.1
- "14.0" # Swift 5.7
- "14.3.1"

name: macOS 12 (Xcode ${{ matrix.xcode }})
runs-on: macos-12
name: macOS 13 (Xcode ${{ matrix.xcode }})
runs-on: macos-13
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
- name: Select Xcode ${{ matrix.xcode }}
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
- name: Run tests
Expand All @@ -30,8 +28,6 @@ jobs:
strategy:
matrix:
swift:
- "5.5"
- "5.6"
- "5.7"

name: Ubuntu (Swift ${{ matrix.swift }})
Expand All @@ -40,16 +36,14 @@ jobs:
- uses: swift-actions/setup-swift@v1
with:
swift-version: ${{ matrix.swift }}
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: swift test

windows:
strategy:
matrix:
swift:
- "5.5"
- "5.6"
#- "5.7"
- "5.8"

name: Windows (Swift ${{ matrix.swift }})
runs-on: windows-2019
Expand All @@ -65,6 +59,6 @@ jobs:
git config --global core.autocrlf false
git config --global core.eol lf
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: swift build
- run: swift test
29 changes: 29 additions & 0 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Format

on:
push:
branches:
- main

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

jobs:
swift_format:
name: swift-format
runs-on: macos-13
steps:
- uses: actions/checkout@v3
- name: Xcode Select
run: sudo xcode-select -s /Applications/Xcode_14.3.1.app
- name: Install
run: brew install swift-format
- name: Format
run: make format
- uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: Run swift-format
branch: 'main'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
83 changes: 83 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
name: Release
on:
release:
types: [published]
workflow_dispatch:
jobs:
project-channel:
runs-on: ubuntu-latest
steps:
- name: Dump Github context
env:
GITHUB_CONTEXT: ${{ toJSON(github) }}
run: echo "$GITHUB_CONTEXT"
- name: Slack Notification on SUCCESS
if: success()
uses: tokorom/action-slack-incoming-webhook@main
env:
INCOMING_WEBHOOK_URL: ${{ secrets.SLACK_PROJECT_CHANNEL_WEBHOOK_URL }}
with:
text: swift-snapshot-testing ${{ github.event.release.tag_name }} has been released.
blocks: |
[
{
"type": "header",
"text": {
"type": "plain_text",
"text": "swift-snapshot-testing ${{ github.event.release.tag_name}}"
}
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": ${{ toJSON(github.event.release.body) }}
}
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "${{ github.event.release.html_url }}"
}
}
]
releases-channel:
runs-on: ubuntu-latest
steps:
- name: Dump Github context
env:
GITHUB_CONTEXT: ${{ toJSON(github) }}
run: echo "$GITHUB_CONTEXT"
- name: Slack Notification on SUCCESS
if: success()
uses: tokorom/action-slack-incoming-webhook@main
env:
INCOMING_WEBHOOK_URL: ${{ secrets.SLACK_RELEASES_WEBHOOK_URL }}
with:
text: swift-snapshot-testing ${{ github.event.release.tag_name }} has been released.
blocks: |
[
{
"type": "header",
"text": {
"type": "plain_text",
"text": "swift-snapshot-testing ${{ github.event.release.tag_name}}"
}
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": ${{ toJSON(github.event.release.body) }}
}
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "${{ github.event.release.html_url }}"
}
}
]
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ playground.xcworkspace
# Package.pins
.build/
.swiftpm
Package.resolved

# CocoaPods
#
Expand Down
14 changes: 14 additions & 0 deletions .spi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# This is manifest file for the Swift Package Index for it to auto-generate and
# host DocC documentation.
#
# For reference see https://swiftpackageindex.com/swiftpackageindex/spimanifest/documentation/spimanifest/commonusecases#Host-DocC-documentation-in-the-Swift-Package-Index

version: 1
builder:
configs:
- documentation_targets:
# First item in the list is the "landing" (default) target
- SnapshotTesting
- InlineSnapshotTesting
- platform: watchos
scheme: InlineSnapshotTesting
7 changes: 0 additions & 7 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

This file was deleted.

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

## Code of Conduct

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].
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].
Loading

0 comments on commit 950332a

Please sign in to comment.