Skip to content

Commit fead0ed

Browse files
authored
Merge pull request #376 from trussworks/rp/fix-builds
Fixing build errors
2 parents 31bc985 + 4fa833a commit fead0ed

33 files changed

+15826
-22349
lines changed

.markdownlintrc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
"MD014": false,
88
"MD025": false,
99
"MD033": false,
10+
"MD034": false,
1011
"MD040": false,
1112
"MD041": false,
1213
"MD042": false,
1314
"MD046": false,
14-
"MD051": false
15+
"MD051": false,
16+
"MD059": false
1517
}

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18.19.1
1+
22.21.0

.pre-commit-config.yaml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
repos:
33
- repo: https://github.com/pre-commit/pre-commit-hooks
4-
rev: v4.4.0
4+
rev: v6.0.0
55
hooks:
66
- id: check-merge-conflict
77
- id: check-yaml
@@ -10,24 +10,19 @@ repos:
1010
- id: trailing-whitespace
1111

1212
- repo: https://github.com/igorshubovych/markdownlint-cli
13-
rev: v0.33.0
13+
rev: v0.45.0
1414
hooks:
1515
- id: markdownlint
1616

1717
- repo: https://github.com/executablebooks/mdformat
18-
rev: 0.7.22
18+
rev: 0.7.22 # we can't adopt 1.0.0 because the dependencies don't support it yet
1919
hooks:
2020
- id: mdformat
2121
additional_dependencies:
2222
- mdformat-gfm
2323
- mdformat-toc
2424
- mdformat-frontmatter
2525

26-
- repo: https://github.com/trussworks/pre-commit-hooks
27-
rev: v1.1.1
28-
hooks:
29-
- id: circleci-validate
30-
3126
- repo: local
3227
hooks:
3328
- id: no-mdformat-toc

docs/developing/code-reviews/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gaining valuable feedback from peers, ensuring that quality standards are upheld
77
throughout a project, and defects are caught as early as possible.
88

99
We recognize code reviews can be a vulnerable exercise and should be approached
10-
with care and deliberate intention. We've collected some of the best practices
10+
with care and deliberate intention. We've collected some of the best practices
1111
for projects to systematize the code review process and lay out expectations for
1212
the creator of the pull request as well as the role of the reviewer.
1313

docs/developing/command-line-tools/docker.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Overview
44

55
Docker is useful because it allows you to both package and run
6-
software with all its dependencies and configuration in isolation. It
6+
software with all its dependencies and configuration in isolation. It
77
also allows you (in theory) to have the same environment in
88
development as in CI and production.
99

@@ -18,9 +18,9 @@ brew cask install docker
1818
### Configuration of Shared Folders
1919

2020
Anecdata suggests that removing some of the default shared folders can
21-
decrease CPU usage. Usually you only need to share volumes under your
22-
home directory. Open the docker for mac preferences, then select
23-
"File Sharing" and then remove `/Volumes` and `/private`. You may
21+
decrease CPU usage. Usually you only need to share volumes under your
22+
home directory. Open the docker for mac preferences, then select
23+
"File Sharing" and then remove `/Volumes` and `/private`. You may
2424
also find improvements removing `/Users` and replacing it with
2525
`/Users/YOUR_USERNAME_GOES_HERE`.
2626

@@ -36,13 +36,13 @@ Storage Driver: overlay2
3636

3737
If you don't see overlay2, upgrading to the latest version will add
3838
that support, but you would need to recreate all of your docker data
39-
to utilize it. The `Reset` bomb should do it.
39+
to utilize it. The `Reset` bomb should do it.
4040

4141
### Configuration of Disk Image
4242

4343
If you've been running Docker for Mac for some time, make sure you are
44-
using the `raw` disk image format and not `qcow2`. Open Docker for
45-
Mac preferences and select `Disk`. Make sure the image ends with
44+
using the `raw` disk image format and not `qcow2`. Open Docker for
45+
Mac preferences and select `Disk`. Make sure the image ends with
4646
`Docker.raw`.
4747

4848
### Configuration of Resources
@@ -59,7 +59,7 @@ by the docker developers.
5959
## Volume Mount Performance
6060

6161
Synchronizing the data between the host (your Mac) and the container
62-
can be resource intensive and/or slow. Read about the [performance
62+
can be resource intensive and/or slow. Read about the [performance
6363
tuning options](https://docs.docker.com/docker-for-mac/osxfs-caching/)
6464
to see if they might apply to the conditions in your project.
6565

docs/developing/eid/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ List of editors that Truss engineers use (sorted alphabetically):
3838

3939
##### Plugins
4040

41-
- [vim-ale](https://github.com:w0rp/ale) - Asynchronous code linter
41+
- [vim-ale](https://github.com/w0rp/ale) - Asynchronous code linter
4242
- [editorconfig](https://github.com/editorconfig/editorconfig-vim)
43-
- [vim-fugitive](https://github.com:tpope/vim-fugitive) - A Git wrapper so awesome, it should be illegal
44-
- [vim-go](https://github:fatih/vim-go) - golang development plugin for vim
43+
- [vim-fugitive](https://github.com/tpope/vim-fugitive) - A Git wrapper so awesome, it should be illegal
44+
- [vim-go](https://github.com/fatih/vim-go) - golang development plugin for vim
4545
- [vim-javascript](https://github.com/pangloss/vim-javascript)
46-
- [vim-plug](https://github.com:junegunn/vim-plug) - Minimalist plugin manager
47-
- [vim-prettier](https://github.com:prettier/vim-prettier)
48-
- [Recover](https://github.com:chrisbra/Recover.vim) - Displays a diff before recovering a swap file
46+
- [vim-plug](https://github.com/junegunn/vim-plug) - Minimalist plugin manager
47+
- [vim-prettier](https://github.com/prettier/vim-prettier)
48+
- [Recover](https://github.com/chrisbra/Recover.vim) - Displays a diff before recovering a swap file
4949

5050
#### VS Code
5151

docs/developing/growth/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ speeding up tests) and the client getting the benefit of learning that
1313
happened elsewhere. Allowing time for growth ensures consistent, high
1414
quality work which benefits everyone.
1515

16-
Mentoring is an important part of growth. Truss has [shared some
16+
Mentoring is an important part of growth. Truss has [shared some
1717
techniques for
1818
mentoring](https://truss.works/blog/2016/8/12/theres-a-method-to-the-mentoring-advice-from-a-teacher-turned-developer).
1919

@@ -23,6 +23,6 @@ restrict exploration and "just get the ticket done", but that should
2323
happen infrequently.
2424

2525
If someone is interested in a topic that is not related to their
26-
client work, a separate plan will need to be made. That might involve
26+
client work, a separate plan will need to be made. That might involve
2727
changing client teams, changing client projects, or joining Truss
2828
Reserve.

docs/developing/vcs/tools.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ for merge conflicts or mistakenly adding secret keys in our code. See
4848
pre-commit config file from one of our projects.
4949

5050
Since git does not distribute hooks when a repository is cloned, you will
51-
have to install pre-commit in each cloned repo manually using `pre-commit install --install-hooks` or pre-commit will not run in that repo. To assist
51+
have to install pre-commit in each cloned repo manually using `pre-commit install --install-hooks` or pre-commit will not run in that repo. To assist
5252
with automating this step, pre-commit has a [feature] to exploit the
5353
[template directory] setting in git:
5454

docs/incident-response/on-call.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ you are expected to fulfill.
8787
have this covered.
8888
- If you know you will be away for an extended period during an on-call
8989
shift, it is *your* responsibility to find someone to cover your shift.
90-
If you are unable to, talk to your lead and see if they can help. If
90+
If you are unable to, talk to your lead and see if they can help. If
9191
you will be gone for more than a day or two, it may be easiest to swap
9292
the entire shift with someone. PagerDuty allows you to schedule these
9393
with [overrides](https://community.pagerduty.com/t/creating-a-schedule-override/850).

docs/incident-response/security-incidents.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ to navigate. This document will outline how to approach security
1010
incidents in general; individual projects will likely have additional
1111
reporting requirements based on client needs.
1212

13-
\[This is a stub and needs to be expanded.\]
13+
[This is a stub and needs to be expanded.]

0 commit comments

Comments
 (0)