Skip to content

Commit

Permalink
Merge branch 'main' into feat/add_devbox_install_tool
Browse files Browse the repository at this point in the history
  • Loading branch information
burritobill authored Oct 1, 2024
2 parents 03f6c9f + 072a0ad commit 87af517
Show file tree
Hide file tree
Showing 13 changed files with 127 additions and 190 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM ghcr.io/containerbase/devcontainer:11.11.27
FROM ghcr.io/containerbase/devcontainer:11.11.28
2 changes: 1 addition & 1 deletion .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ module.exports = {
],

'@typescript-eslint/unbound-method': [2, { ignoreStatic: true }],
'@typescript-eslint/ban-types': 2,
'@typescript-eslint/no-empty-object-type': 2,
// '@renovate/jest-root-describe': 2,

'typescript-enum/no-const-enum': 2,
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ jobs:
format: 'sarif'
output: 'trivy-results.sarif'

- uses: github/codeql-action/upload-sarif@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
- uses: github/codeql-action/upload-sarif@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
with:
sarif_file: trivy-results.sarif
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@
"@types/common-tags": "1.8.4",
"@types/global-agent": "2.1.3",
"@types/ini": "4.1.1",
"@types/node": "20.16.9",
"@types/node": "20.16.10",
"@types/semver": "7.5.8",
"@types/shelljs": "0.8.15",
"@typescript-eslint/eslint-plugin": "7.18.0",
"@typescript-eslint/parser": "7.18.0",
"@typescript-eslint/eslint-plugin": "8.7.0",
"@typescript-eslint/parser": "8.7.0",
"@vitest/coverage-v8": "2.1.1",
"@vitest/eslint-plugin": "1.1.4",
"@vitest/ui": "2.1.1",
Expand All @@ -95,7 +95,7 @@
"npm-run-all2": "6.2.3",
"prettier": "3.3.3",
"prettier-plugin-packagejson": "2.5.2",
"semantic-release": "24.1.1",
"semantic-release": "24.1.2",
"shelljs": "0.8.5",
"tsx": "4.19.1",
"type-fest": "4.26.1",
Expand Down
Loading

0 comments on commit 87af517

Please sign in to comment.