Skip to content

Commit fd4a881

Browse files
johnnzhoujohnnzhou
committed
Merge remote-tracking branch 'upstream/main'
2 parents 97fbe53 + 87a9e06 commit fd4a881

File tree

1,460 files changed

+381690
-314829
lines changed

Some content is hidden

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

1,460 files changed

+381690
-314829
lines changed

‎.editorconfig‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
root = true
2+
3+
[*]
4+
indent_style = space
5+
indent_size = 4
6+
end_of_line = lf
7+
insert_final_newline = true
8+
trim_trailing_whitespace = true

‎.github/ISSUE_TEMPLATE/BUG_REPORT.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ about: If something isn't working as expected
99
### New Issue Checklist
1010

1111
- [ ] I'm using the latest version of Swift Crypto (`main` branch)
12-
- [ ] I read the [Contribution Guidelines](https://github.com/apple/swift-crypto/blob/master/CONTRIBUTING.md)
12+
- [ ] I read the [Contribution Guidelines](https://github.com/apple/swift-crypto/blob/main/CONTRIBUTING.md)
1313
- [ ] I searched for [existing GitHub issues](https://github.com/apple/swift-crypto/issues)
1414

1515
### Expected behavior

‎.github/ISSUE_TEMPLATE/QUESTION.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ about: Not sure how something works or how to implement some functionality? Ask
66

77
### Question Checklist
88

9-
- [ ] I'm using the latest version of Swift Crypto (master branch)
10-
- [ ] I read the [Contribution Guidelines](https://github.com/apple/swift-crypto/blob/master/CONTRIBUTING.md)
9+
- [ ] I'm using the latest version of Swift Crypto (main branch)
10+
- [ ] I read the [Contribution Guidelines](https://github.com/apple/swift-crypto/blob/main/CONTRIBUTING.md)
1111
- [ ] I searched for [existing GitHub issues](https://github.com/apple/swift-crypto/issues)
1212

1313
### Question Subject

‎.github/ISSUE_TEMPLATE/REGRESSION.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ about: If a recent release broke a feature (Please make sure you know the last k
88

99
### New Regression Checklist
1010

11-
- [ ] I'm using the latest version of Swift Crypto (master branch)
12-
- [ ] I read the [Contribution Guidelines](https://github.com/apple/swift-crypto/blob/master/CONTRIBUTING.md)
11+
- [ ] I'm using the latest version of Swift Crypto (main branch)
12+
- [ ] I read the [Contribution Guidelines](https://github.com/apple/swift-crypto/blob/main/CONTRIBUTING.md)
1313
- [ ] I searched for [existing GitHub issues](https://github.com/apple/swift-crypto/issues)
1414

1515
### Regression Information

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ _[One line description of your change]_
99
- [ ] I've updated the documentation if necessary
1010

1111
#### If you've made changes to `gyb` files
12-
- [ ] I've run `.script/generate_boilerplate_files_with_gyb` and included updated generated files in a commit of this pull request
12+
- [ ] I've run `./scripts/generate_boilerplate_files_with_gyb.sh` and included updated generated files in a commit of this pull request
1313

1414
### Motivation:
1515

@@ -21,4 +21,4 @@ _[Describe the modifications you've done.]_
2121

2222
### Result:
2323

24-
_[After your change, what will change.]_
24+
_[After your change, what will change.]_

‎.github/release.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
changelog:
2+
categories:
3+
- title: SemVer Major
4+
labels:
5+
- ⚠️ semver/major
6+
- title: SemVer Minor
7+
labels:
8+
- 🆕 semver/minor
9+
- title: SemVer Patch
10+
labels:
11+
- 🔨 semver/patch
12+
- title: Other Changes
13+
labels:
14+
- semver/none

‎.github/workflows/main.yml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Main
2+
3+
permissions:
4+
contents: read
5+
6+
on:
7+
push:
8+
branches: [main]
9+
schedule:
10+
- cron: "0 8,20 * * *"
11+
12+
jobs:
13+
unit-tests:
14+
name: Unit tests
15+
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
16+
with:
17+
linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
18+
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error"
19+
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error"
20+
linux_6_2_arguments_override: "--explicit-target-dependency-import-check error"
21+
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error"
22+
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
23+
windows_6_0_enabled: true
24+
windows_6_1_enabled: true
25+
windows_6_2_enabled: true
26+
windows_nightly_next_enabled: true
27+
windows_nightly_main_enabled: true
28+
windows_6_0_arguments_override: "--explicit-target-dependency-import-check error"
29+
windows_6_1_arguments_override: "--explicit-target-dependency-import-check error"
30+
windows_6_2_arguments_override: "--explicit-target-dependency-import-check error"
31+
windows_nightly_next_arguments_override: "--explicit-target-dependency-import-check error"
32+
windows_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
33+
34+
release-builds:
35+
name: Release builds
36+
uses: apple/swift-nio/.github/workflows/release_builds.yml@main
37+
with:
38+
windows_6_0_enabled: true
39+
windows_6_1_enabled: true
40+
windows_6_2_enabled: true
41+
windows_nightly_next_enabled: true
42+
windows_nightly_main_enabled: true
43+
44+
cxx-interop:
45+
name: Cxx interop
46+
uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main
47+
48+
static-sdk:
49+
name: Static SDK
50+
uses: apple/swift-nio/.github/workflows/static_sdk.yml@main
51+
52+
macos-tests:
53+
name: macOS tests
54+
uses: apple/swift-nio/.github/workflows/macos_tests.yml@main
55+
with:
56+
runner_pool: nightly
57+
build_scheme: swift-crypto-Package

‎.github/workflows/pull_request.yml‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
name: PR
2+
3+
permissions:
4+
contents: read
5+
6+
on:
7+
pull_request:
8+
types: [opened, reopened, synchronize]
9+
10+
jobs:
11+
soundness:
12+
name: Soundness
13+
uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
14+
with:
15+
license_header_check_project_name: "SwiftCrypto"
16+
docs_check_enabled: false
17+
18+
unit-tests:
19+
name: Unit tests
20+
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
21+
with:
22+
linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
23+
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error"
24+
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error"
25+
linux_6_2_arguments_override: "--explicit-target-dependency-import-check error"
26+
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error"
27+
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
28+
windows_6_0_enabled: true
29+
windows_6_1_enabled: true
30+
windows_6_2_enabled: true
31+
windows_nightly_next_enabled: true
32+
windows_nightly_main_enabled: true
33+
windows_6_0_arguments_override: "--explicit-target-dependency-import-check error"
34+
windows_6_1_arguments_override: "--explicit-target-dependency-import-check error"
35+
windows_6_2_arguments_override: "--explicit-target-dependency-import-check error"
36+
windows_nightly_next_arguments_override: "--explicit-target-dependency-import-check error"
37+
windows_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
38+
39+
release-builds:
40+
name: Release builds
41+
uses: apple/swift-nio/.github/workflows/release_builds.yml@main
42+
with:
43+
windows_6_0_enabled: true
44+
windows_6_1_enabled: true
45+
windows_6_2_enabled: true
46+
windows_nightly_next_enabled: true
47+
windows_nightly_main_enabled: true
48+
49+
cxx-interop:
50+
name: Cxx interop
51+
uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main
52+
53+
cmake-checks:
54+
name: CMake checks
55+
uses: apple/swift-nio/.github/workflows/cmake_tests.yml@main
56+
with:
57+
update_cmake_lists_config: >-
58+
{
59+
"targets": [
60+
{ "name": "CCryptoBoringSSL", "type": "source", "exceptions": [] },
61+
{ "name": "CCryptoBoringSSLShims", "type": "source", "exceptions": [] },
62+
{ "name": "CryptoBoringWrapper", "type": "source", "exceptions": [] },
63+
{ "name": "CXKCP", "type": "source", "exceptions": [] },
64+
{ "name": "CXKCPShims", "type": "source", "exceptions": [] },
65+
{ "name": "Crypto", "type": "source", "exceptions": [] },
66+
{ "name": "CryptoExtras", "type": "source", "exceptions": [] },
67+
{ "name": "CCryptoBoringSSL", "type": "assembly", "exceptions": [ "*/AES/*.swift" ] }
68+
]
69+
}
70+
71+
macos-tests:
72+
name: macOS tests
73+
uses: apple/swift-nio/.github/workflows/macos_tests.yml@main
74+
with:
75+
runner_pool: general
76+
build_scheme: swift-crypto-Package
77+
78+
static-sdk:
79+
name: Static SDK
80+
uses: apple/swift-nio/.github/workflows/static_sdk.yml@main

‎.github/workflows/pull_request_label.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: PR label
2+
3+
permissions:
4+
contents: read
5+
6+
on:
7+
pull_request:
8+
types: [labeled, unlabeled, opened, reopened, synchronize]
9+
10+
jobs:
11+
semver-label-check:
12+
name: Semantic version label check
13+
runs-on: ubuntu-latest
14+
timeout-minutes: 1
15+
steps:
16+
- name: Checkout repository
17+
uses: actions/checkout@v4
18+
with:
19+
persist-credentials: false
20+
- name: Check for Semantic Version label
21+
uses: apple/swift-nio/.github/actions/pull_request_semver_label_checker@main

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.DS_Store
2-
/.build
2+
.build
33
/out
44
/Packages
55
/*.xcodeproj
@@ -12,6 +12,7 @@ Package.resolved
1212
DerivedData
1313
.swiftpm
1414
**/gyb.pyc
15+
scripts/__pycache__/
1516

1617
.*.sw[nop]
1718

0 commit comments

Comments
 (0)