Skip to content

Commit 2ba2883

Browse files
committed
Merge branch 'master' into path-tool
1 parent cd07c98 commit 2ba2883

File tree

22 files changed

+1085
-1398
lines changed

22 files changed

+1085
-1398
lines changed

.github/workflows/ci.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,28 @@ jobs:
3939

4040
- name: 🧪 Run Rust tests
4141
run: cargo test --verbose
42+
43+
cargo-deny:
44+
runs-on: ubuntu-latest
45+
46+
strategy:
47+
matrix:
48+
checks:
49+
- 'security advisories'
50+
- 'banned licenses and crates'
51+
52+
# Prevent sudden announcement of a new advisory from failing ci:
53+
continue-on-error: ${{ matrix.checks == 'security advisories' }}
54+
55+
steps:
56+
- uses: actions/checkout@v2
57+
58+
- uses: EmbarkStudios/cargo-deny-action@v1
59+
if: matrix.checks == 'security advisories'
60+
with:
61+
command: check advisories
62+
63+
- uses: EmbarkStudios/cargo-deny-action@v1
64+
if: matrix.checks == 'banned licenses and crates'
65+
with:
66+
command: check bans licenses sources

.vscode/launch.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212
"args": [
1313
"build",
1414
"--bin=graphite",
15-
"--package=graphite"
15+
"--package=graphite",
1616
],
1717
"filter": {
1818
"name": "graphite",
19-
"kind": "bin"
20-
}
19+
"kind": "bin",
20+
},
2121
},
2222
"args": [],
2323
"cwd": "${workspaceFolder}",
2424
"env": {
25-
"RUST_LOG": "error"
26-
}
25+
"RUST_LOG": "error",
26+
},
2727
},
2828
{
2929
"type": "lldb",
@@ -34,15 +34,15 @@
3434
"test",
3535
"--no-run",
3636
"--bin=graphite",
37-
"--package=graphite"
37+
"--package=graphite",
3838
],
3939
"filter": {
4040
"name": "graphite",
41-
"kind": "bin"
42-
}
41+
"kind": "bin",
42+
},
4343
},
4444
"args": [],
45-
"cwd": "${workspaceFolder}"
46-
}
47-
]
48-
}
45+
"cwd": "${workspaceFolder}",
46+
},
47+
],
48+
}

.vscode/settings.json

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,48 @@
11
{
2+
// Rust: save on format
23
"[rust]": {
34
"editor.formatOnSave": true,
45
"editor.formatOnPaste": true,
56
"editor.defaultFormatter": "matklad.rust-analyzer",
67
},
7-
"[typescript, javascript, json, vue]": {
8+
// Web: save on format (consolidate these when https://github.com/microsoft/vscode/issues/51935 is implemented)
9+
"[typescript]": {
810
"editor.codeActionsOnSave": {
9-
"source.fixAll.eslint": true
11+
"source.fixAll.eslint": true,
1012
},
1113
"editor.formatOnSave": true,
1214
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
1315
},
16+
"[javascript]": {
17+
"editor.codeActionsOnSave": {
18+
"source.fixAll.eslint": true,
19+
},
20+
"editor.formatOnSave": true,
21+
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
22+
},
23+
"[vue]": {
24+
"editor.codeActionsOnSave": {
25+
"source.fixAll.eslint": true,
26+
},
27+
"editor.formatOnSave": true,
28+
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
29+
},
30+
// Rust Analyzer config
1431
"rust-analyzer.experimental.procAttrMacros": true,
1532
"rust-analyzer.cargo.target": "wasm32-unknown-unknown",
16-
"files.eol": "\n",
17-
"html.format.wrapLineLength": 200,
33+
// ESLint config
1834
"eslint.format.enable": true,
1935
"eslint.workingDirectories": [
20-
"./frontend"
36+
"./frontend",
2137
],
2238
"eslint.validate": [
2339
"javascript",
2440
"typescript",
2541
],
42+
// Vue config
2643
"vetur.format.enable": false,
27-
}
44+
// VS Code config
45+
"html.format.wrapLineLength": 200,
46+
"files.eol": "\n",
47+
"files.insertFinalNewline": true,
48+
}

deny.toml

Lines changed: 204 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
1+
# This template contains all of the possible sections and their default values
2+
3+
# Note that all fields that take a lint level have these possible values:
4+
# * deny - An error will be produced and the check will fail
5+
# * warn - A warning will be produced, but the check will not fail
6+
# * allow - No warning or error will be produced, though in some cases a note
7+
# will be
8+
9+
# The values provided in this template are the default values that will be used
10+
# when any section or field is not specified in your own configuration
11+
12+
# If 1 or more target triples (and optionally, target_features) are specified,
13+
# only the specified targets will be checked when running `cargo deny check`.
14+
# This means, if a particular package is only ever used as a target specific
15+
# dependency, such as, for example, the `nix` crate only being used via the
16+
# `target_family = "unix"` configuration, that only having windows targets in
17+
# this list would mean the nix crate, as well as any of its exclusive
18+
# dependencies not shared by any other crates, would be ignored, as the target
19+
# list here is effectively saying which targets you are building for.
20+
targets = [
21+
# The triple can be any string, but only the target triples built in to
22+
# rustc (as of 1.40) can be checked against actual config expressions
23+
#{ triple = "x86_64-unknown-linux-musl" },
24+
# You can also specify which target_features you promise are enabled for a
25+
# particular target. target_features are currently not validated against
26+
# the actual valid features supported by the target architecture.
27+
#{ triple = "wasm32-unknown-unknown", features = ["atomics"] },
28+
]
29+
30+
# This section is considered when running `cargo deny check advisories`
31+
# More documentation for the advisories section can be found here:
32+
# https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html
33+
[advisories]
34+
# The path where the advisory database is cloned/fetched into
35+
db-path = "~/.cargo/advisory-db"
36+
# The url(s) of the advisory databases to use
37+
db-urls = ["https://github.com/rustsec/advisory-db"]
38+
# The lint level for security vulnerabilities
39+
vulnerability = "deny"
40+
# The lint level for unmaintained crates
41+
unmaintained = "warn"
42+
# The lint level for crates that have been yanked from their source registry
43+
yanked = "warn"
44+
# The lint level for crates with security notices. Note that as of
45+
# 2019-12-17 there are no security notice advisories in
46+
# https://github.com/rustsec/advisory-db
47+
notice = "warn"
48+
# A list of advisory IDs to ignore. Note that ignored advisories will still
49+
# output a note when they are encountered.
50+
ignore = [
51+
#"RUSTSEC-0000-0000",
52+
]
53+
# Threshold for security vulnerabilities, any vulnerability with a CVSS score
54+
# lower than the range specified will be ignored. Note that ignored advisories
55+
# will still output a note when they are encountered.
56+
# * None - CVSS Score 0.0
57+
# * Low - CVSS Score 0.1 - 3.9
58+
# * Medium - CVSS Score 4.0 - 6.9
59+
# * High - CVSS Score 7.0 - 8.9
60+
# * Critical - CVSS Score 9.0 - 10.0
61+
#severity-threshold =
62+
63+
# This section is considered when running `cargo deny check licenses`
64+
# More documentation for the licenses section can be found here:
65+
# https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
66+
[licenses]
67+
# The lint level for crates which do not have a detectable license
68+
unlicensed = "deny"
69+
# List of explictly allowed licenses
70+
# See https://spdx.org/licenses/ for list of possible licenses
71+
# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
72+
allow = [
73+
"MIT",
74+
"Apache-2.0",
75+
#"Apache-2.0 WITH LLVM-exception",
76+
]
77+
# List of explictly disallowed licenses
78+
# See https://spdx.org/licenses/ for list of possible licenses
79+
# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
80+
deny = [
81+
#"Nokia",
82+
]
83+
# Lint level for licenses considered copyleft
84+
copyleft = "deny"
85+
# Blanket approval or denial for OSI-approved or FSF Free/Libre licenses
86+
# * both - The license will be approved if it is both OSI-approved *AND* FSF
87+
# * either - The license will be approved if it is either OSI-approved *OR* FSF
88+
# * osi-only - The license will be approved if is OSI-approved *AND NOT* FSF
89+
# * fsf-only - The license will be approved if is FSF *AND NOT* OSI-approved
90+
# * neither - This predicate is ignored and the default lint level is used
91+
allow-osi-fsf-free = "neither"
92+
# Lint level used when no other predicates are matched
93+
# 1. License isn't in the allow or deny lists
94+
# 2. License isn't copyleft
95+
# 3. License isn't OSI/FSF, or allow-osi-fsf-free = "neither"
96+
default = "deny"
97+
# The confidence threshold for detecting a license from license text.
98+
# The higher the value, the more closely the license text must be to the
99+
# canonical license text of a valid SPDX license file.
100+
# [possible values: any between 0.0 and 1.0].
101+
confidence-threshold = 0.8
102+
# Allow 1 or more licenses on a per-crate basis, so that particular licenses
103+
# aren't accepted for every possible crate as with the normal allow list
104+
exceptions = [
105+
# Each entry is the crate and version constraint, and its specific allow
106+
# list
107+
#{ allow = ["Zlib"], name = "adler32", version = "*" },
108+
]
109+
110+
# Some crates don't have (easily) machine readable licensing information,
111+
# adding a clarification entry for it allows you to manually specify the
112+
# licensing information
113+
#[[licenses.clarify]]
114+
# The name of the crate the clarification applies to
115+
#name = "ring"
116+
# The optional version constraint for the crate
117+
#version = "*"
118+
# The SPDX expression for the license requirements of the crate
119+
#expression = "MIT AND ISC AND OpenSSL"
120+
# One or more files in the crate's source used as the "source of truth" for
121+
# the license expression. If the contents match, the clarification will be used
122+
# when running the license check, otherwise the clarification will be ignored
123+
# and the crate will be checked normally, which may produce warnings or errors
124+
# depending on the rest of your configuration
125+
#license-files = [
126+
# Each entry is a crate relative path, and the (opaque) hash of its contents
127+
#{ path = "LICENSE", hash = 0xbd0eed23 }
128+
#]
129+
130+
[licenses.private]
131+
# If true, ignores workspace crates that aren't published, or are only
132+
# published to private registries
133+
ignore = false
134+
# One or more private registries that you might publish crates to, if a crate
135+
# is only published to private registries, and ignore is true, the crate will
136+
# not have its license(s) checked
137+
registries = [
138+
#"https://sekretz.com/registry
139+
]
140+
141+
# This section is considered when running `cargo deny check bans`.
142+
# More documentation about the 'bans' section can be found here:
143+
# https://embarkstudios.github.io/cargo-deny/checks/bans/cfg.html
144+
[bans]
145+
# Lint level for when multiple versions of the same crate are detected
146+
multiple-versions = "warn"
147+
# Lint level for when a crate version requirement is `*`
148+
wildcards = "allow"
149+
# The graph highlighting used when creating dotgraphs for crates
150+
# with multiple versions
151+
# * lowest-version - The path to the lowest versioned duplicate is highlighted
152+
# * simplest-path - The path to the version with the fewest edges is highlighted
153+
# * all - Both lowest-version and simplest-path are used
154+
highlight = "all"
155+
# List of crates that are allowed. Use with care!
156+
allow = [
157+
#{ name = "ansi_term", version = "=0.11.0" },
158+
]
159+
# List of crates to deny
160+
deny = [
161+
# Each entry the name of a crate and a version range. If version is
162+
# not specified, all versions will be matched.
163+
#{ name = "ansi_term", version = "=0.11.0" },
164+
#
165+
# Wrapper crates can optionally be specified to allow the crate when it
166+
# is a direct dependency of the otherwise banned crate
167+
#{ name = "ansi_term", version = "=0.11.0", wrappers = [] },
168+
]
169+
# Certain crates/versions that will be skipped when doing duplicate detection.
170+
skip = [
171+
#{ name = "ansi_term", version = "=0.11.0" },
172+
{ name = "cfg-if", version = "=0.1.10" },
173+
]
174+
# Similarly to `skip` allows you to skip certain crates during duplicate
175+
# detection. Unlike skip, it also includes the entire tree of transitive
176+
# dependencies starting at the specified crate, up to a certain depth, which is
177+
# by default infinite
178+
skip-tree = [
179+
#{ name = "ansi_term", version = "=0.11.0", depth = 20 },
180+
]
181+
182+
# This section is considered when running `cargo deny check sources`.
183+
# More documentation about the 'sources' section can be found here:
184+
# https://embarkstudios.github.io/cargo-deny/checks/sources/cfg.html
185+
[sources]
186+
# Lint level for what to happen when a crate from a crate registry that is not
187+
# in the allow list is encountered
188+
unknown-registry = "warn"
189+
# Lint level for what to happen when a crate from a git repository that is not
190+
# in the allow list is encountered
191+
unknown-git = "warn"
192+
# List of URLs for allowed crate registries. Defaults to the crates.io index
193+
# if not specified. If it is specified but empty, no registries are allowed.
194+
allow-registry = ["https://github.com/rust-lang/crates.io-index"]
195+
# List of URLs for allowed Git repositories
196+
allow-git = []
197+
198+
[sources.allow-org]
199+
# 1 or more github.com organizations to allow git sources for
200+
github = ["GraphiteEditor"]
201+
# 1 or more gitlab.com organizations to allow git sources for
202+
#gitlab = [""]
203+
# 1 or more bitbucket.org organizations to allow git sources for
204+
#bitbucket = [""]

0 commit comments

Comments
 (0)