Skip to content

Commit 3b11014

Browse files
authored
Merge pull request #1281 from kolyshkin/codespell
CI: add codespell, bump golangci-lint
2 parents e83cdc2 + d7de8c0 commit 3b11014

File tree

6 files changed

+25
-15
lines changed

6 files changed

+25
-15
lines changed

.codespellrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[codespell]
2+
# Those should always be in lowercase!
3+
ignore-words-list = clos

.github/workflows/build.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,9 @@ jobs:
3333
go get -d ./schema/...
3434
3535
- name: run golangci-lint
36-
uses: golangci/golangci-lint-action@v4
36+
uses: golangci/golangci-lint-action@v8
3737
with:
38-
version: v1.56.1
39-
args: --verbose
38+
version: v2.5
4039

4140
- name: run tests
4241
run: |

.github/workflows/lint.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,12 @@ jobs:
1212
run: make -C schema fmt
1313
- name: Check for changes
1414
run: git diff --exit-code
15+
16+
codespell:
17+
runs-on: ubuntu-24.04
18+
steps:
19+
- uses: actions/checkout@v4
20+
- name: install deps
21+
run: pip install --break-system-packages codespell==v2.4.1
22+
- name: run codespell
23+
run: codespell

ChangeLog

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ Changes with v1.0.1:
230230
* config-linux: More specific documentation for weightDevice and
231231
throttle* (#825)
232232
* config-linux: Modify procfs to proc (#905)
233-
* config-linux: Fix "psuedo" -> "pseudo" typo (#921)
233+
* config-linux: Fix a typo (#921)
234234
* config-windows: Make maximum a uint16 (was a uint) (#891)
235235
* runtime: Change "process in the container" -> "container
236236
process" (#907)
@@ -490,7 +490,7 @@ Changes with v1.0.0-rc3:
490490
* spec: Separate the spec from project scaffolding (#626)
491491
* README: Define "unspecified", "undefined", and
492492
"implementation-defined" (#575)
493-
* config: Clarify absolue and relative values for root.path (#558)
493+
* config: Clarify absolute and relative values for root.path (#558)
494494
* config: Clarify ociVersion covering the configuration <->
495495
runtime API (#523)
496496
* config-linux: Forbid duplicated namespaces with same `type`
@@ -551,7 +551,7 @@ Changes with v1.0.0-rc1:
551551
* runtime: Split create and start, #384, #450, #463, #464, #467,
552552
#468
553553
* runtime: Remove exec, #388
554-
* runtime: Enviroment MUST match the configuration, #397
554+
* runtime: Environment MUST match the configuration, #397
555555
* config: Runtime MUST generate errors for unsupported platforms,
556556
#441
557557
* config: Windows mount destinations MUST NOT be nested, #437
@@ -567,7 +567,7 @@ Changes with v1.0.0-rc1:
567567
* config: Allow absolute paths for root.path (which previously
568568
required relative paths), #394
569569
* config-linux: Add linux.mountLabel, #393
570-
* config-linux: Add suport for cgroup namespace, #397
570+
* config-linux: Add support for cgroup namespace, #397
571571
* config-linux: Runtime SHOULD NOT modify ownership of any
572572
referenced filesystem (previously the restriction only applied to
573573
the root filesystem), #452
@@ -576,7 +576,7 @@ Changes with v1.0.0-rc1:
576576
Minor fixes and documentation:
577577

578578
* README: Add project.md to the Table of Contents, #376
579-
* README: Consistenly indent the Table of Contents, #400
579+
* README: Consistently indent the Table of Contents, #400
580580
* README: Link to LICENSE, #442
581581
* README: Weekly call is OCI-wide, #378
582582
* config: Explicit runtime namespace for hooks, #415
@@ -642,8 +642,7 @@ Changes with v0.5.0:
642642
* style: Move one-sentence-per-line rule from the README, #369
643643
* style: Remove dangling parenthesis, #359
644644
* README: Add a link to the IRC logs, #358
645-
* Fix "manadate", "exmaple", "paramters", and "preferrably" typos,
646-
#353, #354
645+
* Fix typos, #353, #354
647646

648647
Changes with v0.4.0:
649648
Breaking changes:
@@ -729,7 +728,7 @@ Changes with v0.2.0:
729728
* bundle.md: fix off-by-one error
730729
* bundle.md: various updates to latest spec
731730
* bundle: Move 'Linux sysctl' header to its own line
732-
* Change commiter to committer
731+
* Fix a typo
733732
* Change Device field order in spec_linux.go, 'Path' should be top of the 'Type' field, according to the different of the config-linux.md, 'Path' field is the unique key.
734733
* Change layout of mountpoints and mounts
735734
* Change the rlimit type to string instead of int
@@ -854,7 +853,7 @@ Changes with v0.1.0:
854853
* implementations: Link to mrunalp/ocitools
855854
* lifecycle: Don't require /run/opencontainer/<runtime>/containers
856855
* lifecycle: Mention runtime.json
857-
* lifecycle: no hypens
856+
* lifecycle: no hyphens
858857
* MAINTAINERS: add tianon per the charter
859858
* MAINTAINERS: correct Vish's github account
860859
* Makefile: Add glossary to DOC_FILES

config-vm.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ This image contains the root filesystem that the virtual machine **`kernel`** wi
7575
* **`nrMFNs`** (int REQUIRED) Number of pages to be mapped, see [Xen Config][xl-config-format] for the details.
7676
* **`irqs`** (array OPTIONAL) Allows VM to access specific physical IRQs, see [Xen Config][xl-config-format] for the details.
7777

78-
This hwConfig object contains the description of the hardware that can be safely passed through to the VM. Where **`deviceTree`** is the path to the device-tree blob, which conains description of the isolated hardware and paravirtualized hardware that should be used by VM. **`dtdevs`**, **`iomems`** and **`irqs`** parameters describing the minimun set of the parameters, needed for VM to access the hardware.
78+
This hwConfig object contains the description of the hardware that can be safely passed through to the VM. Where **`deviceTree`** is the path to the device-tree blob, which contains description of the isolated hardware and paravirtualized hardware that should be used by VM. **`dtdevs`**, **`iomems`** and **`irqs`** parameters describing the minimal set of the parameters, needed for VM to access the hardware.
7979

8080
### Example
8181

@@ -111,4 +111,4 @@ This hwConfig object contains the description of the hardware that can be safely
111111
[vdi-image-format]: https://forensicswiki.org/wiki/Virtual_Disk_Image_(VDI)
112112
[vmdk-image-format]: http://www.vmware.com/app/vmdk/?src=vmdk
113113
[vhd-image-format]: https://github.com/libyal/libvhdi/blob/master/documentation/Virtual%20Hard%20Disk%20(VHD)%20image%20format.asciidoc
114-
[xl-config-format]: https://xenbits.xen.org/docs/4.10-testing/man/xl.cfg.5.html
114+
[xl-config-format]: https://xenbits.xen.org/docs/4.10-testing/man/xl.cfg.5.html

specs-go/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ type WindowsHyperV struct {
688688
UtilityVMPath string `json:"utilityVMPath,omitempty"`
689689
}
690690

691-
// IOMems containes information about iomem addresses that should be passed to the VM.
691+
// IOMems contains information about iomem addresses that should be passed to the VM.
692692
type IOMems struct {
693693
// Guest Frame Number to map the iomem range. If GFN is not specified, the mapping will be done to the same Frame Number as was provided in FirstMFN.
694694
FirstGFN *uint64 `json:"firstGFN,omitempty"`

0 commit comments

Comments
 (0)