Skip to content

Commit 02d8760

Browse files
Merge pull request #5037 from swiftwasm/katei/merge-main-2022-11-03
2 parents 9d20879 + f83f983 commit 02d8760

File tree

2,746 files changed

+98073
-65569
lines changed

Some content is hidden

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

2,746 files changed

+98073
-65569
lines changed

.flake8

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ filename =
1616

1717
./utils/80+-check,
1818
./utils/backtrace-check,
19-
./utils/build-parser-lib,
2019
./utils/build-script,
2120
./utils/check-incremental,
2221
./utils/coverage/coverage-build-db,

.github/CODEOWNERS

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Lines starting with '#' are comments.
2+
# Each line is a file pattern followed by one or more owners.
3+
# Order is important. The last matching pattern has the most precedence.
4+
5+
# Owners of ASTGen
6+
lib/ASTGen @zoecarver @CodaFi
7+
8+
# Dependency scanning
9+
include/swift/DependencyScan @artemcm
10+
lib/AST/ModuleLoader.cpp @artemcm
11+
lib/DependencyScan @artemcm
12+
lib/Frontend/ModuleInterfaceLoader.cpp @artemcm
13+
lib/Serialization/SerializedModuleLoader.cpp @artemcm
14+
test/ScanDependencies @artemcm
15+
16+
# Driver
17+
include/swift/Driver @artemcm
18+
lib/Driver @artemcm
19+
test/Driver @artemcm
20+
21+
# Owners of the parser
22+
include/swift/Parse @ahoppen @bnbarham @CodaFi @DougGregor @rintaro
23+
lib/Parse @ahoppen @bnbarham @CodaFi @DougGregor @rintaro
24+
test/Parse @ahoppen @bnbarham @CodaFi @DougGregor @rintaro
25+
26+
SwiftCompilerSources @eeckstein
27+
28+
# C++ Interop
29+
include/swift/ClangImporter @zoecarver @hyp @egorzhdan
30+
include/swift/PrintAsClang @zoecarver @hyp @egorzhdan
31+
lib/ClangImporter @zoecarver @hyp @egorzhdan
32+
lib/PrintAsClang @zoecarver @hyp @egorzhdan
33+
stdlib/public/Cxx @zoecarver @hyp @egorzhdan
34+
test/Interop @zoecarver @hyp @egorzhdan
35+
36+
# Threading implementation
37+
include/swift/Threading @al45tair
38+
lib/Threading @al45tair
39+
40+
# Windows support
41+
cmake/**/*Windows* @compnerd
42+
lib/Basic/Windows @compnerd
43+
stdlib/public/Windows @compnerd
44+
utils/*windows* @compnerd

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 35 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,44 @@
22
name: Bug report
33
about: Create a report to help us improve
44
title: ''
5-
labels: bug
5+
labels: bug, triage needed
66
assignees: ''
77

88
---
99

10-
**Describe the bug**
11-
A clear and concise description of what the bug is.
12-
13-
**Steps To Reproduce**
14-
Steps to reproduce the behavior:
15-
1.
16-
2.
17-
...
10+
<!--
11+
This repository tracks issues related to the implementation of the Swift
12+
compiler, standard library, runtime, and tools that provide IDE support for
13+
Swift (e.g. code completion). If the bug relates to the implementation of a
14+
proprietary (closed-source) Apple framework such as UIKit, SwiftUI, Combine,
15+
etc., please report it to https://feedbackassistant.apple.com instead.
16+
-->
17+
18+
**Description**
19+
<!-- Describe clearly and concisely what the bug is. -->
20+
21+
**Steps to reproduce**
22+
<!--
23+
Explain how to reproduce the problem (in steps if seen fit) and include either
24+
an inline test case (preferred) or a project that reproduces it. Consider
25+
reducing the sample to the smallest amount of code possible — a smaller test
26+
case is easier to reason about and more appealing to сontributors.
27+
-->
1828

1929
**Expected behavior**
20-
A clear and concise description of what you expected to happen.
21-
22-
**Screenshots**
23-
If applicable, add screenshots to help explain your problem.
24-
25-
**Environment (please fill out the following information)**
26-
- OS: [e.g. macOS 11.0]
27-
- Xcode Version/Tag/Branch:
28-
29-
30-
**Additional context**
31-
Add any other context about the problem here.
30+
<!-- Describe what you expected to happen. -->
31+
32+
<!-- If deemed helpful, add screenshots that showcase the problem. -->
33+
<!-- **Screenshots** -->
34+
35+
<!--
36+
Include information about the Swift compiler version and, if applicable, the
37+
Xcode version you are observing the problem in and the deployment target.
38+
-->
39+
**Environment**
40+
- Swift compiler version info <!-- replace with the output of 'swiftc -version' -->
41+
- Xcode version info <!-- replace with the output of 'xcodebuild -version' -->
42+
- Deployment target: <!-- e.g. iOS 12.3 -->
43+
44+
<!-- Add any other context about the problem as appropriate. -->
45+
<!-- **Additional context** -->
Lines changed: 39 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,49 @@
11
---
22
name: Feature request
3-
about: Suggest an idea for this project
3+
about: Share an idea
44
title: ''
5-
labels: New Feature
5+
labels: feature request, triage needed
66
assignees: ''
77

88
---
99

10-
**Is your feature request related to a problem? Please describe.**
11-
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
10+
<!--
11+
This repository tracks issues and requests related to the implementation of the
12+
Swift compiler, standard library, runtime, and tools that provide IDE support
13+
for Swift (e.g. code completion). If your feature request relates to the
14+
implementation of a proprietary (closed-source) Apple framework such as UIKit,
15+
SwiftUI, Combine, etc., please report it to https://feedbackassistant.apple.com
16+
instead.
1217
13-
**Describe the solution you'd like**
14-
A clear and concise description of what you want to happen.
18+
If you haven't found or started a thread on the Swift forums yet, consider
19+
socializing your idea in the "Discussion" subcategory
20+
(https://forums.swift.org/c/evolution/discuss) after submitting this request.
21+
This is an essential step toward the official review of any proposal concerning
22+
language or library design, and while GitHub issues do great for tracking
23+
purposes, the forums are far better ground for drawing attention to ideas and
24+
gauging interest from the community.
1525
16-
**Describe alternatives you've considered**
17-
A clear and concise description of any alternative solutions or features you've considered.
26+
For more information on how ideas are proposed, discussed, and reviewed, see
27+
https://swift.org/swift-evolution
28+
-->
1829

19-
**Additional context**
20-
Add any other context or screenshots about the feature request here.
30+
**Motivation**
31+
<!-- Describe the problem that your feature seeks to address. -->
32+
33+
**Solution**
34+
<!--
35+
Describe your solution to the problem. Provide examples and describe how
36+
they work.
37+
-->
38+
39+
**Alternatives considered**
40+
<!--
41+
Describe any alternative approaches or features that you have considered in
42+
addressing the problem, and why you chose this approach instead.
43+
-->
44+
45+
<!--
46+
Add any other context about your feature as appropriate. For example, link out
47+
to a discussion on the Swift forums (https://forums.swift.org).
48+
-->
49+
<!-- **Additional context** -->

.github/scripts/build-matrix.rb

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
require "json"
2+
require "optparse"
3+
4+
BASE_MATRIX_ENTRIES = [
5+
{
6+
"build_os": "ubuntu-18.04",
7+
"agent_query": "ubuntu-18.04",
8+
"target": "ubuntu18.04_x86_64",
9+
"container": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-18.04",
10+
"run_stdlib_test": true,
11+
"run_full_test": false,
12+
"run_e2e_test": true,
13+
"build_hello_wasm": true,
14+
"clean_build_dir": false,
15+
"free_disk_space": true
16+
},
17+
{
18+
"build_os": "ubuntu-20.04",
19+
"agent_query": "ubuntu-20.04",
20+
"target": "ubuntu20.04_x86_64",
21+
"container": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04",
22+
"run_stdlib_test": true,
23+
"run_full_test": false,
24+
"run_e2e_test": true,
25+
"build_hello_wasm": true,
26+
"clean_build_dir": false,
27+
"free_disk_space": true
28+
},
29+
{
30+
"build_os": "ubuntu-22.04",
31+
"agent_query": "ubuntu-22.04",
32+
"target": "ubuntu22.04_x86_64",
33+
"container": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-22.04",
34+
"run_stdlib_test": true,
35+
"run_full_test": false,
36+
"run_e2e_test": true,
37+
"build_hello_wasm": true,
38+
"clean_build_dir": false,
39+
"free_disk_space": true
40+
},
41+
{
42+
"build_os": "macos-11",
43+
"agent_query": "macos-11",
44+
"target": "macos_x86_64",
45+
"run_stdlib_test": false,
46+
"run_full_test": false,
47+
"run_e2e_test": false,
48+
"build_hello_wasm": false,
49+
"clean_build_dir": false
50+
},
51+
{
52+
"build_os": "macos-11",
53+
"agent_query": ["self-hosted", "macOS", "ARM64"],
54+
"target": "macos_arm64",
55+
"run_stdlib_test": false,
56+
"run_full_test": false,
57+
"run_e2e_test": false,
58+
"build_hello_wasm": true,
59+
"clean_build_dir": true
60+
}
61+
]
62+
63+
def main
64+
options = {}
65+
OptionParser.new do |opts|
66+
opts.banner = "Usage: build-matrix.rb [options]"
67+
opts.on("--runner [JSON FILE]", "Path to runner data file") do |v|
68+
options[:runner] = v
69+
end
70+
end.parse!
71+
72+
matrix_entries = BASE_MATRIX_ENTRIES.dup
73+
if options[:runner]
74+
runner = JSON.parse(File.read(options[:runner]))
75+
if label = runner["outputs"]["ubuntu20_04_aarch64-label"]
76+
matrix_entries << {
77+
"build_os": "amazon-linux-2",
78+
"agent_query": label,
79+
"target": "amazonlinux2_x86_64",
80+
"run_stdlib_test": false,
81+
"run_full_test": false,
82+
"run_e2e_test": false,
83+
"build_hello_wasm": true,
84+
"clean_build_dir": false
85+
}
86+
end
87+
if label = runner["outputs"]["ubuntu20_04_aarch64-label"]
88+
matrix_entries << {
89+
"build_os": "ubuntu-20.04",
90+
"agent_query": label,
91+
"target": "ubuntu20.04_aarch64",
92+
"run_stdlib_test": false,
93+
"run_full_test": false,
94+
"run_e2e_test": false,
95+
"build_hello_wasm": true,
96+
"clean_build_dir": false
97+
}
98+
end
99+
end
100+
101+
print JSON.generate(matrix_entries)
102+
end
103+
104+
if $0 == __FILE__
105+
main
106+
end

0 commit comments

Comments
 (0)