Skip to content

Commit

Permalink
chore(deps): bump version & tooling (#53)
Browse files Browse the repository at this point in the history
Bump tooling using npx npm-check-updates -u
Add version bump with changie, so now it updates the package.json and task.json automatically on running changie merge.
  • Loading branch information
sheldonhull authored Jan 18, 2024
1 parent 400b337 commit e604b49
Show file tree
Hide file tree
Showing 12 changed files with 84 additions and 34 deletions.
6 changes: 3 additions & 3 deletions aqua.yaml → .aqua/aqua.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
# https://aquaproj.github.io/
registries:
- type: standard
ref: v4.119.0 # renovate: depName=aquaproj/aqua-registry
ref: v4.121.0 # renovate: depName=aquaproj/aqua-registry
packages:
- name: miniscruff/[email protected]
- name: golang/[email protected]
- name: direnv/[email protected]
- name: magefile/[email protected]
- name: charmbracelet/[email protected]
- name: mvdan/[email protected]
- name: golang.org/x/tools/[email protected]
- name: golang.org/x/tools/gopls@gopls/v0.14.2
- name: golang/tools/[email protected]
- name: golang/tools/[email protected]
- name: golang/tools/[email protected]
- name: golang/tools/[email protected]
- name: golang/tools/[email protected]
- name: anchore/syft@v0.100.0
- name: anchore/syft@v0.101.0
- name: thycotic/[email protected]
- name: Schniz/[email protected]
5 changes: 5 additions & 0 deletions .changes/v0.0.2.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## v0.0.2 - 2024-01-16

### ⬆️ Dependencies

- Update dependent libraries and go version. No user facing changes, just continued maintenance for improved security & stability.
32 changes: 29 additions & 3 deletions .changie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,26 @@ footerFormat: |
{{ end }}
{{ end }}
kinds:
- label: 🎉 Feature
- label: 🔨 Refactor
- label: 🤖 CI & Build
auto: patch
- label: 🎉 New Product Feature
auto: minor
- label: ⬇️ Deprecated
auto: minor
- label: 🧪 Tests
auto: patch
- label: 🔨 Refactor
auto: patch
- label: 🐛 Bug Fix
auto: patch
- label: 🔥 Breaking Change
auto: minor
- label: 🔒 Security
auto: patch
- label: ⬆️ Dependencies
- label: 🤖 Development
auto: patch
- label: 🔥 Major Version Change (Breaking Changes)
auto: major
newlines:
afterChange: 0
afterChangelogHeader: 1
Expand Down Expand Up @@ -81,3 +93,17 @@ custom:
type: int
minLength: 6
optional: true
replacements:
# chart versions align with the release and get bumped by changie for us on `changie merge`.
- path: 'dsv/package.json'
find: ' "version": ".*",'
replace: ' "version": "{{.VersionNoPrefix}}",'
- path: dsv/task.json
find: ' "Major": .*,'
replace: ' "Major": {{.Major}},'
- path: dsv/task.json
find: ' "Minor": .*,'
replace: ' "Minor": {{.Minor}},'
- path: dsv/task.json
find: ' "Patch": .*'
replace: ' "Patch": {{.Patch}}'
4 changes: 4 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ on:
pull_request:
workflow_dispatch:
workflow_call: # so composite actions can use this
permissions:
pull-requests: read
contents: read
checks: write
jobs:
lint:
uses: delineaxpm/github-workflows/.github/workflows/lint.yml@main
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.17.1
20.11.0
2 changes: 2 additions & 0 deletions .trunk/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
*logs
*actions
*notifications
*tools
plugins
user_trunk.yaml
user.yaml
tmp
39 changes: 23 additions & 16 deletions .trunk/trunk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,30 @@ actions:
- files: [go.mod]
runtimes:
enabled:
- go@1.18.3
- node@16.14.2
- [email protected].3
- go@1.21.6
- node@20.11.0
- [email protected].8
lint:
enabled:
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- git-diff-check
- gitleaks@8.15.0
- gofmt@1.16.7
- golangci-lint@1.50.1
- hadolint@2.10.0
- markdownlint@0.32.2
- prettier@2.7.1
- shellcheck@0.8.0
- shfmt@3.5.0
- taplo@release-taplo-cli-0.7.0
- yamllint@1.28.0
- gitleaks@8.18.1
- gofmt@1.20.4
- golangci-lint@1.55.2
- hadolint@2.12.0
- markdownlint@0.38.0
- prettier@3.2.2
- shellcheck@0.9.0
- shfmt@3.6.0
- taplo@0.8.1
- yamllint@1.33.0
threshold:
- linters: [markdownlint]
level: high
Expand All @@ -50,9 +57,9 @@ lint:
- .changes/unreleased/*.yaml

cli:
version: 1.0.1
version: 1.19.0
plugins:
sources:
- id: trunk
ref: v0.0.5
ref: v1.2.1
uri: https://github.com/trunk-io/plugins
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"[go]": {
"debug.saveBeforeStart": "allEditorsInActiveGroup",
"editor.codeActionsOnSave": {
"source.fixAll": true,
"source.organizeImports": false
"source.fixAll": "explicit",
"source.organizeImports": "never"
},
"editor.defaultFormatter": "trunk.io",
"editor.formatOnSave": true
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
and is generated by [Changie](https://github.com/miniscruff/changie).

No releases yet, this file will be updated when generating your first release.
## v0.0.2 - 2024-01-16

### ⬆️ Dependencies

- Update dependent libraries and go version. No user facing changes, just continued maintenance for improved security & stability.
4 changes: 3 additions & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,16 @@ This project uses an different approach to release, driving it from changelog an
### Creating New Notes

- During development, new changes of note get tracked via `changie new`. This can span many pull requests, whatever makes sense as version to ship as changes to users.
- To release the changes into a version, `changie batch <major|minor|patch>` (unless breaking changes occur, you'll want to stick with minor for feature additions, and patch for fixes or non app work.
- To release the changes into a version, `changie batch auto` (unless breaking changes occur, you'll want to stick with minor for feature additions, and patch for fixes or non app work.

Keep your summary of changes that users would care about in the `.changes/` files it will create.

### Release

Update [CHANGELOG.md](CHANGELOG.md) by running `changie merge` which will rebuild the changelog file with all the documented notes.

> This will bump the version automatically in the `task.json` and `package.json`.
### Format & Lint

- Run `trunk fmt --all; trunk check --all` to finalize run through.
Expand Down
12 changes: 6 additions & 6 deletions dsv/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "DelineaDSV",
"version": "1.0.0",
"version": "0.0.2",
"description": "",
"main": "index.js",
"scripts": {
Expand All @@ -9,15 +9,15 @@
"author": "",
"license": "ISC",
"dependencies": {
"azure-pipelines-task-lib": "4.4.0",
"azure-pipelines-task-lib": "4.8.0",
"typed-rest-client": "1.8.11"
},
"devDependencies": {
"@types/mocha": "10.0.1",
"@types/node": "18.17.4",
"@types/q": "1.5.5",
"@types/mocha": "10.0.6",
"@types/node": "20.11.4",
"@types/q": "1.5.8",
"mocha": "10.2.0",
"sync-request": "6.1.0",
"typescript": "4.9.5"
"typescript": "5.3.3"
}
}
2 changes: 1 addition & 1 deletion dsv/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"version": {
"Major": 0,
"Minor": 0,
"Patch": 1
"Patch": 2
},
"instanceNameFormat": "Retrieve $(SecretPath) from Delinea DevOps Secrets Vault",
"inputs": [
Expand Down

0 comments on commit e604b49

Please sign in to comment.