Skip to content

Commit 99dde1d

Browse files
kateinoigakukunMaxDesiatovzhuowei
authored andcommitted
[wasm] All SwiftWasm patches
Co-authored-by: Max Desiatov <[email protected]> Co-authored-by: Zhuowei Zhang <[email protected]>
1 parent 346fb02 commit 99dde1d

File tree

107 files changed

+2751
-155
lines changed

Some content is hidden

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

107 files changed

+2751
-155
lines changed

.github/FUNDING.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# These are supported funding model platforms
2+
3+
github: [swiftwasm, kateinoigakukun, MaxDesiatov] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
4+
patreon: # Replace with a single Patreon username
5+
open_collective: # Replace with a single Open Collective username
6+
ko_fi: # Replace with a single Ko-fi username
7+
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9+
liberapay: # Replace with a single Liberapay username
10+
issuehunt: # Replace with a single IssueHunt username
11+
otechie: # Replace with a single Otechie username
12+
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 17 deletions
This file was deleted.

.github/pull.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
version: "1"
2+
rules:
3+
- base: swiftwasm
4+
upstream: main
5+
mergeMethod: merge
6+
- base: main
7+
upstream: apple:main
8+
mergeMethod: hardreset
9+
10+
- base: release/5.3
11+
upstream: apple:release/5.3
12+
mergeMethod: hardreset
13+
- base: swiftwasm-release/5.3
14+
upstream: release/5.3
15+
mergeMethod: merge
16+
17+
- base: release/5.4
18+
upstream: apple:release/5.4
19+
mergeMethod: hardreset
20+
- base: swiftwasm-release/5.4
21+
upstream: release/5.4
22+
mergeMethod: merge
23+
24+
- base: release/5.5
25+
upstream: apple:release/5.5
26+
mergeMethod: hardreset
27+
- base: swiftwasm-release/5.5
28+
upstream: release/5.5
29+
mergeMethod: merge
30+
31+
- base: release/5.6
32+
upstream: apple:release/5.6
33+
mergeMethod: hardreset
34+
- base: swiftwasm-release/5.6
35+
upstream: release/5.6
36+
mergeMethod: merge
37+
38+
- base: release/5.7
39+
upstream: apple:release/5.7
40+
mergeMethod: hardreset
41+
- base: swiftwasm-release/5.7
42+
upstream: release/5.7
43+
mergeMethod: merge
44+
45+
- base: release/5.8
46+
upstream: apple:release/5.8
47+
mergeMethod: hardreset
48+
- base: swiftwasm-release/5.8
49+
upstream: release/5.8
50+
mergeMethod: merge
51+
52+
label: ":arrow_heading_down: Upstream Tracking"

.github/scripts/build-matrix.rb

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

0 commit comments

Comments
 (0)