Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: twpayne/chezmoi
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.46.0
Choose a base ref
...
head repository: twpayne/chezmoi
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.46.1
Choose a head ref
4 contributors

Commits on Jan 28, 2024

  1. feat: Set CHEZMOI_SOURCE_FILE env var for scripts

    @twpayne
    twpayne committed Jan 28, 2024
    Copy the full SHA
    431ec39 View commit details

Commits on Jan 29, 2024

  1. docs: typo

    @dpprdan @twpayne
    dpprdan authored and twpayne committed Jan 29, 2024
    Copy the full SHA
    baeaf6b View commit details

Commits on Feb 1, 2024

  1. chore(deps): bump github/codeql-action from 3.22.12 to 3.23.2 

    Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.22.12 to 3.23.2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@012739e...b7bf0a3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot @twpayne
    dependabot[bot] authored and twpayne committed Feb 1, 2024
    Copy the full SHA
    6e3d06b View commit details

  2. chore(deps): bump sigstore/cosign-installer from 3.3.0 to 3.4.0 

    Bumps [sigstore/cosign-installer](https://github.com/sigstore/cosign-installer) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/sigstore/cosign-installer/releases)
- [Commits](sigstore/cosign-installer@9614fae...e1523de)

---
updated-dependencies:
- dependency-name: sigstore/cosign-installer
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot @twpayne
    dependabot[bot] authored and twpayne committed Feb 1, 2024
    Copy the full SHA
    5c152fe View commit details

  3. chore(deps): bump mkdocs-material from 9.5.3 to 9.5.6 in /assets 

    Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.5.3 to 9.5.6.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases)
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG)
- [Commits](squidfunk/mkdocs-material@9.5.3...9.5.6)

---
updated-dependencies:
- dependency-name: mkdocs-material
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot @twpayne
    dependabot[bot] authored and twpayne committed Feb 1, 2024
    Copy the full SHA
    4708692 View commit details

  4. chore(deps-dev): bump ruff from 0.1.9 to 0.1.15 in /assets 

    Bumps [ruff](https://github.com/astral-sh/ruff) from 0.1.9 to 0.1.15.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](astral-sh/ruff@v0.1.9...v0.1.15)

---
updated-dependencies:
- dependency-name: ruff
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot @twpayne
    dependabot[bot] authored and twpayne committed Feb 1, 2024
    Copy the full SHA
    deb5adf View commit details

Commits on Feb 2, 2024

  1. chore: Remove outdated documentation on 1Password CLI v1

    @twpayne
    twpayne committed Feb 2, 2024
    Copy the full SHA
    d2895b5 View commit details

  2. chore: Use slices.Clone

    @twpayne
    twpayne committed Feb 2, 2024
    Copy the full SHA
    ffae4ec View commit details

Commits on Feb 5, 2024

  1. chore: Skip building Chocolatey packages in local release tests

    @twpayne
    twpayne committed Feb 5, 2024
    Copy the full SHA
    4443acf View commit details

  2. feat: Add update.apply configuration variable

    @twpayne
    twpayne committed Feb 5, 2024
    Copy the full SHA
    8a20f91 View commit details

  3. chore: Update dependencies

    @twpayne
    twpayne committed Feb 5, 2024
    Copy the full SHA
    1743224 View commit details

Commits on Feb 6, 2024

  1. chore: Use per-job permissions for GitHub Actions

    @twpayne
    twpayne committed Feb 6, 2024
    Copy the full SHA
    3697fc9 View commit details

  2. chore: Update GitHub Actions

    @twpayne
    twpayne committed Feb 6, 2024
    Copy the full SHA
    e4f462a View commit details

  3. chore: Run actions on later version of Ubuntu, where possible

    @twpayne
    twpayne committed Feb 6, 2024
    Copy the full SHA
    42aae14 View commit details

  4. chore: Run main action daily

    @twpayne
    twpayne committed Feb 6, 2024
    Copy the full SHA
    86ebd27 View commit details

Commits on Feb 7, 2024

  1. chore: Rename internal module

    @twpayne
    twpayne committed Feb 7, 2024
    Copy the full SHA
    df18930 View commit details

  2. chore: Make Go 1.21 the required minimum version of Go

    @twpayne
    twpayne committed Feb 7, 2024
    Copy the full SHA
    d8177e7 View commit details

  3. chore: Use standard maps and slices packages

    @twpayne
    twpayne committed Feb 7, 2024
    Copy the full SHA
    a846e2c View commit details

  4. chore: Build with Go 1.22

    @twpayne
    twpayne committed Feb 7, 2024
    Copy the full SHA
    b366e6e View commit details

  5. chore: Bump golangci-lint to v1.56.0

    @twpayne
    twpayne committed Feb 7, 2024
    Copy the full SHA
    111553c View commit details

Commits on Feb 11, 2024

  1. chore: Switch to log/slog for logging

    @twpayne
    twpayne committed Feb 11, 2024
    Copy the full SHA
    e40dc13 View commit details

  2. chore: Improve context handling

    @twpayne
    twpayne committed Feb 11, 2024
    Copy the full SHA
    5a20eeb View commit details

  3. fix: Fix age/rage check in doctor command

    @razvanazamfirei @twpayne
    razvanazamfirei authored and twpayne committed Feb 11, 2024
    Copy the full SHA
    0eb98a9 View commit details

  4. chore: Update GitHub Actions

    @twpayne
    twpayne committed Feb 11, 2024
    Copy the full SHA
    a22c53e View commit details

  5. chore: Update dependencies

    @twpayne
    twpayne committed Feb 11, 2024
    Copy the full SHA
    04e8929 View commit details

  6. chore: Update tools

    @twpayne
    twpayne committed Feb 11, 2024
    Copy the full SHA
    c65f66a View commit details
Showing with 804 additions and 777 deletions.
  1. +2 −0 .github/workflows/govulncheck.yml
  2. +3 −0 .github/workflows/lock.yml
  3. +57 −27 .github/workflows/main.yml
  4. +6 −4 .golangci.yml
  5. +1 −1 Makefile
  6. +1 −10 assets/chezmoi.io/docs/developer/developing-locally.md
  7. +1 −1 assets/chezmoi.io/docs/developer/testing.md
  8. +2 −2 assets/chezmoi.io/docs/install.md.tmpl
  9. +4 −0 assets/chezmoi.io/docs/reference/configuration-file/variables.md.yaml
  10. +0 −5 assets/chezmoi.io/docs/reference/templates/1password-functions/index.md
  11. +1 −1 assets/chezmoi.io/docs/reference/templates/init-functions/promptStringOnce.md
  12. +1 −1 assets/chezmoi.io/requirements.txt
  13. +1 −1 assets/requirements.dev.txt
  14. +1 −0 assets/scripts/install-local-bin.sh
  15. +1 −0 assets/scripts/install.sh
  16. +20 −21 go.mod
  17. +42 −44 go.sum
  18. +5 −4 internal/chezmoi/ageencryption.go
  19. +25 −24 internal/chezmoi/attr.go
  20. +1 −2 internal/chezmoi/autotemplate.go
  21. +1 −1 internal/chezmoi/boltpersistentstate.go
  22. +0 −12 internal/chezmoi/chezmoi_test.go
  23. +1 −2 internal/chezmoi/chezmoi_windows.go
  24. +19 −19 internal/chezmoi/debugencryption.go
  25. +35 −35 internal/chezmoi/debugpersistentstate.go
  26. +78 −75 internal/chezmoi/debugsystem.go
  27. +17 −16 internal/chezmoi/entrystate.go
  28. +2 −1 internal/chezmoi/externaldiffsystem.go
  29. +1 −1 internal/chezmoi/github.go
  30. +2 −1 internal/chezmoi/gpgencryption.go
  31. +7 −10 internal/chezmoi/interpreter.go
  32. +9 −8 internal/chezmoi/patternset.go
  33. +5 −1 internal/chezmoi/realsystem.go
  34. +2 −2 internal/chezmoi/refreshexternals.go
  35. +14 −11 internal/chezmoi/sourcestate.go
  36. +2 −0 internal/chezmoi/sourcestate_test.go
  37. +33 −29 internal/chezmoi/sourcestateentry.go
  38. +2 −2 internal/chezmoi/sourcestatetreenode.go
  39. +3 −2 internal/chezmoi/system.go
  40. +8 −6 internal/chezmoi/targetstateentry.go
  41. +2 −0 internal/chezmoigit/chezmoigit.go
  42. +1 −1 internal/{git → chezmoigit}/status.go
  43. +1 −1 internal/{git → chezmoigit}/status_test.go
  44. +161 −114 internal/chezmoilog/chezmoilog.go
  45. +0 −66 internal/chezmoilog/chezmoilog_test.go
  46. +14 −0 internal/chezmoilog/nullhandler.go
  47. +5 −0 internal/chezmoilog/nullhandler_test.go
  48. +13 −5 internal/chezmoimaps/chezmoimaps.go
  49. +3 −2 internal/chezmoitest/chezmoitest.go
  50. +1 −1 internal/cmd/annotation.go
  51. +1 −1 internal/cmd/azurekeyvaulttemplatefuncs.go
  52. +1 −1 internal/cmd/bitwardensecretstemplatefuncs.go
  53. +1 −1 internal/cmd/bitwardentemplatefuncs.go
  54. +8 −8 internal/cmd/cmd.go
  55. +54 −80 internal/cmd/config.go
  56. +2 −3 internal/cmd/dashlanetemplatefuncs.go
  57. +1 −1 internal/cmd/datacmd_test.go
  58. +6 −5 internal/cmd/doctorcmd.go
  59. +2 −1 internal/cmd/doctorcmd_unix.go
  60. +2 −1 internal/cmd/doctorcmd_windows.go
  61. +2 −3 internal/cmd/dopplertemplatefuncs.go
  62. +5 −9 internal/cmd/editcmd.go
  63. +1 −1 internal/cmd/executetemplatecmd.go
  64. +2 −2 internal/cmd/generatecmd.go
  65. +1 −1 internal/cmd/githubtemplatefuncs.go
  66. +1 −1 internal/cmd/gopasstemplatefuncs.go
  67. +2 −2 internal/cmd/hcpvaultsecretsttemplatefuncs.go
  68. +29 −30 internal/cmd/initcmd.go
  69. +4 −4 internal/cmd/keepassxctemplatefuncs.go
  70. +1 −1 internal/cmd/keepertemplatefuncs.go
  71. +1 −1 internal/cmd/lastpasstemplatefuncs.go
  72. +2 −2 internal/cmd/onepasswordtemplatefuncs.go
  73. +2 −2 internal/cmd/passholetemplatefuncs.go
  74. +1 −1 internal/cmd/passtemplatefuncs.go
  75. +1 −1 internal/cmd/pinentry.go
  76. +1 −1 internal/cmd/prompt.go
  77. +1 −1 internal/cmd/rbwtemplatefuncs.go
  78. +2 −3 internal/cmd/secrettemplatefuncs.go
  79. +8 −6 internal/cmd/statuscmd.go
  80. +4 −3 internal/cmd/templatefuncs.go
  81. +18 −4 internal/cmd/testdata/scripts/issue2934.txtar
  82. +2 −1 internal/cmd/textconv.go
  83. +2 −2 internal/cmd/unmanagedcmd.go
  84. +3 −3 internal/cmd/updatecmd.go
  85. +5 −7 internal/cmd/upgradecmd.go
  86. +4 −3 internal/cmd/upgradecmd_unix.go
  87. +1 −1 internal/cmd/upgradecmd_windows.go
  88. +1 −1 internal/cmd/vaulttemplatefuncs.go
  89. +1 −1 internal/cmds/execute-template/main.go
  90. +1 −1 internal/cmds/lint-txtar/main.go
  91. +0 −2 internal/git/git.go
  92. +0 −2 main.go
2 changes: 2 additions & 0 deletions .github/workflows/govulncheck.yml
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,8 @@ on:
jobs:
govulncheck:
runs-on: ubuntu-22.04
permissions:
contents: read
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- name: go-version
3 changes: 3 additions & 0 deletions .github/workflows/lock.yml
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,9 @@ concurrency:
jobs:
action:
runs-on: ubuntu-22.04
permissions:
issues: write
pull-requests: write
steps:
- uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771
with:
84 changes: 57 additions & 27 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
@@ -8,23 +8,27 @@ on:
- master
tags:
- v*
schedule:
- cron: 22 2 * * *
env:
ACTIONLINT_VERSION: 1.6.26
AGE_VERSION: 1.1.1
CHOCOLATEY_VERSION: 2.2.2
EDITORCONFIG_CHECKER_VERSION: 2.7.2
EDITORCONFIG_CHECKER_VERSION: 2.8.0
FIND_TYPOS_VERSION: 0.0.3
GO_VERSION: 1.21.6
GOFUMPT_VERSION: 0.5.0
GOLANGCI_LINT_VERSION: 1.55.2
GOLINES_VERSION: 0.11.0
GO_VERSION: 1.22.0
GOFUMPT_VERSION: 0.6.0
GOLANGCI_LINT_VERSION: 1.56.1
GOLINES_VERSION: 0.12.2
GOVERSIONINFO_VERSION: 1.4.0
RAGE_VERSION: 0.9.2
RAGE_VERSION: 0.10.0
jobs:
changes:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
outputs:
code: ${{ steps.filter.outputs.code }}
permissions:
contents: read
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- id: filter
@@ -46,19 +50,21 @@ jobs:
codeql:
needs: changes
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
permissions:
security-events: write
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with:
fetch-depth: 1
- uses: github/codeql-action/init@012739e5082ff0c22ca6d6ab32e07c36df03c4a4
- uses: github/codeql-action/init@b7bf0a3ed3ecfa44160715d7c442788f65f0f923
with:
languages: go
- uses: github/codeql-action/analyze@012739e5082ff0c22ca6d6ab32e07c36df03c4a4
- uses: github/codeql-action/analyze@b7bf0a3ed3ecfa44160715d7c442788f65f0f923
misspell:
runs-on: ubuntu-22.04
permissions:
contents: read
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- uses: reviewdog/action-misspell@06d6a480724fa783c220081bbc22336a78dbbe82
@@ -67,7 +73,9 @@ jobs:
test-alpine:
needs: changes
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
permissions:
contents: read
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- name: test
@@ -78,7 +86,9 @@ jobs:
test-archlinux:
needs: changes
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
permissions:
contents: read
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- name: test
@@ -90,6 +100,8 @@ jobs:
needs: changes
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: macos-11
permissions:
contents: read
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
@@ -126,7 +138,9 @@ jobs:
test-oldstable-go:
needs: changes
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
permissions:
contents: read
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
@@ -157,7 +171,9 @@ jobs:
go test ./...
test-release:
needs: changes
runs-on: ubuntu-20.04
runs-on: ubuntu-20.04 # use older Ubuntu for older glibc
permissions:
contents: read
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with:
@@ -190,37 +206,39 @@ jobs:
args: release --skip=sign --snapshot --timeout=1h
- name: upload-artifact-chezmoi-darwin-amd64
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
with:
name: chezmoi-darwin-amd64
path: dist/chezmoi-nocgo_darwin_amd64_v1/chezmoi
- name: upload-artifact-chezmoi-darwin-arm64
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
with:
name: chezmoi-darwin-arm64
path: dist/chezmoi-nocgo_darwin_arm64/chezmoi
- name: upload-artifact-chezmoi-linux-amd64
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
with:
name: chezmoi-linux-amd64
path: dist/chezmoi-cgo-glibc_linux_amd64_v1/chezmoi
- name: upload-artifact-chezmoi-linux-musl-amd64
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
with:
name: chezmoi-linux-amd64-musl
path: dist/chezmoi-cgo-musl_linux_amd64_v1/chezmoi
- name: upload-artifact-chezmoi-windows-amd64.exe
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
with:
name: chezmoi-windows-amd64
path: dist/chezmoi-nocgo_windows_amd64_v1/chezmoi.exe
test-ubuntu:
needs: changes
runs-on: ubuntu-20.04
runs-on: ubuntu-20.04 # use older Ubuntu for older glibc
permissions:
contents: read
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with:
@@ -266,7 +284,9 @@ jobs:
sh assets/scripts/install.sh
bin/chezmoi --version
test-website:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
permissions:
contents: read
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
@@ -283,6 +303,8 @@ jobs:
needs: changes
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: windows-2022
permissions:
contents: read
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
@@ -321,7 +343,9 @@ jobs:
(iwr -useb https://get.chezmoi.io/ps1).ToString() | powershell -c -
bin/chezmoi.exe --version
check:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
permissions:
contents: read
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with:
@@ -367,13 +391,15 @@ jobs:
lint:
needs: changes
if: github.event_name == 'push' || needs.changes.outputs.code == 'true'
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
permissions:
contents: read
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
with:
go-version: ${{ env.GO_VERSION }}
- uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc
- uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804
with:
version: v${{ env.GOLANGCI_LINT_VERSION }}
args: --timeout=5m
@@ -390,7 +416,9 @@ jobs:
- test-ubuntu
- test-website
- test-windows
runs-on: ubuntu-20.04
runs-on: ubuntu-20.04 # use older Ubuntu for older glibc
permissions:
contents: write
steps:
- name: install-build-dependencies
run: |
@@ -415,7 +443,7 @@ jobs:
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
with:
go-version: ${{ env.GO_VERSION }}
- uses: sigstore/cosign-installer@9614fae9e5c5eddabb09f90a270fcb487c9f7149
- uses: sigstore/cosign-installer@e1523de7571e31dbe865fd2e80c5c7c23ae71eb4
- name: create-syso
run: |
make create-syso
@@ -433,7 +461,9 @@ jobs:
deploy-website:
needs:
- release
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
permissions:
contents: read
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with:
10 changes: 6 additions & 4 deletions .golangci.yml
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
run:
go: '1.19'
go: '1.21'

linters:
enable:
- asciicheck
- bidichk
- bodyclose
- containedctx
- contextcheck
- decorder
- dogsled
- dupl
- dupword
- durationcheck
- errcheck
@@ -59,12 +57,15 @@ linters:
- revive
- rowserrcheck
- sloglint
- spancheck
- sqlclosecheck
- staticcheck
- stylecheck
- tagalign
- tagliatelle
- tenv
- testableexamples
- testifylint
- thelper
- typecheck
- unconvert
@@ -76,8 +77,10 @@ linters:
- zerologlint
disable:
- asasalint
- contextcheck
- cyclop
- depguard
- dupl
- exhaustive
- exhaustruct
- funlen
@@ -100,7 +103,6 @@ linters:
- nlreturn
- nonamedreturns
- paralleltest
- tagalign
- testpackage
- tparallel
- varnamelen
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -200,6 +200,6 @@ shellcheck:
test-release:
goreleaser release \
--clean \
--skip=sign \
--skip=chocolatey,sign \
--snapshot \
${GORELEASER_FLAGS}
11 changes: 1 addition & 10 deletions assets/chezmoi.io/docs/developer/developing-locally.md
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

chezmoi is written in [Go](https://golang.org) and development happens on
[GitHub](https://github.com). chezmoi is a standard Go project, using standard
Go tooling. chezmoi requires Go 1.20 or later.
Go tooling. chezmoi requires Go 1.21 or later.

Checkout chezmoi:

@@ -17,15 +17,6 @@ Build chezmoi:
$ go build
```

!!! hint

If you try to build chezmoi with an unsupported version of Go you will get
the error:

```
package github.com/twpayne/chezmoi/v2: build constraints exclude all Go files in /home/twp/src/github.com/twpayne/chezmoi
```

Run all tests:

```console
2 changes: 1 addition & 1 deletion assets/chezmoi.io/docs/developer/testing.md
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ chezmoi uses multiple levels of testing:
`internal/chezmoi/*_test.go`.

2. Filesystem integration tests, using `testing` and
[`github.com/twpayne/go-vfs/v5`](https://pkg.go.dev/github.com/twpayne/go-vfs/v4),
[`github.com/twpayne/go-vfs/v5`](https://pkg.go.dev/github.com/twpayne/go-vfs/v5),
test chezmoi's effects on the filesystem. This include some tests in
`internal/chezmoi/*_test.go`, and higher level command tests in
`internal/cmd/*cmd_test.go`.
4 changes: 2 additions & 2 deletions assets/chezmoi.io/docs/install.md.tmpl
View file
Original file line number Diff line number Diff line change
@@ -244,13 +244,13 @@ pre-built binary and shell completions.

=== "OpenBSD"

{{ range $arch := list "amd64" "arm" "arm64" "i386" }}
{{ range $arch := list "amd64" "arm" "arm64" "i386" "ppc64" }}
[`{{ $arch }}`](https://github.com/twpayne/chezmoi/releases/download/v{{ $version }}/chezmoi_{{ $version }}_openbsd_{{ $arch }}.tar.gz)
{{- end }}

## Install from source

Download, build, and install chezmoi for your system with Go 1.20 or later:
Download, build, and install chezmoi for your system with Go 1.21 or later:

```console
$ git clone https://github.com/twpayne/chezmoi.git
4 changes: 4 additions & 0 deletions assets/chezmoi.io/docs/reference/configuration-file/variables.md.yaml
View file
Original file line number Diff line number Diff line change
@@ -386,6 +386,10 @@ sections:
default: '`vault`'
description: Vault CLI command
update:
apply:
type: 'bool'
default: '`true`'
description: Apply after pulling
args:
type: '[]string'
description: Extra args to update command
5 changes: 0 additions & 5 deletions assets/chezmoi.io/docs/reference/templates/1password-functions/index.md
View file
Original file line number Diff line number Diff line change
@@ -44,8 +44,3 @@ CLI](https://developer.1password.com/docs/cli) (`op`).
`account1.1password.ca` will not be a valid lookup value, but `my@account1`,
`my@account1.1password.ca`, `your@account1`, and
`your@account1.1password.ca` would all be valid lookups.

!!! warning

Support for 1Password CLI v1 will be removed with the next major release of
chezmoi.
2 changes: 1 addition & 1 deletion assets/chezmoi.io/docs/reference/templates/init-functions/promptStringOnce.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# `promptStringOnce` *map* *path* *prompt* [*default*]

`promptStringOnce` returns the value of *map* at *path* if it exists and is an
`promptStringOnce` returns the value of *map* at *path* if it exists and is a
string value, otherwise it prompts the user for a string value with *prompt* and
an optional *default* using `promptString`.

Loading