Skip to content

Commit

Permalink
Merge branch 'main' of github.com:toboshii/hajimari
Browse files Browse the repository at this point in the history
  • Loading branch information
toboshii committed Oct 4, 2022
2 parents 2bdc6ea + 829c124 commit 8de3da1
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 29 deletions.
3 changes: 2 additions & 1 deletion .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
":automergeBranchPush",
"github>toboshii/home-ops//.github/renovate/commitMessage.json5",
"github>toboshii/home-ops//.github/renovate/labels.json5",
"github>toboshii/home-ops//.github/renovate/semanticCommits.json5"
"github>toboshii/home-ops//.github/renovate/semanticCommits.json5",
"github>toboshii/home-ops//.github/renovate/allowedVersions.json5"
],
"platform": "github",
"username": "chii-bot[bot]",
Expand Down
12 changes: 12 additions & 0 deletions .github/renovate/allowedVersions.json5
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"packageRules": [
{
"matchPackageNames": ["k8s.io/client-go"],
"allowedVersions": "!/1\\.(4\\.0|5\\.0|5\\.1|5\\.2)$/"
},
{
"matchPackageNames": ["codemirror"],
"allowedVersions": "< 6.0.0"
}
]
}
2 changes: 1 addition & 1 deletion .github/workflows/lint-test-chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
run: ct lint

- name: Create Kind cluster
uses: helm/kind-action@v1.2.0
uses: helm/kind-action@v1.4.0
with:
wait: 120s
if: steps.list-changed.outputs.changed == 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
version: v3.6.3

- name: Run chart-releaser
uses: helm/chart-releaser-action@v1.2.1
uses: helm/chart-releaser-action@v1.4.1
env:
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
CR_RELEASE_NAME_TEMPLATE: "hajimari-helm-chart-{{ .Version }}"
26 changes: 13 additions & 13 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch"
},
"devDependencies": {
"@iconify/svelte": "^3.0.0",
"@iconify/svelte": "3.0.0",
"@sveltejs/adapter-static": "1.0.0-next.44",
"@sveltejs/kit": "1.0.0-next.507",
"@types/codemirror": "^5.60.5",
"@types/js-yaml": "^4.0.5",
"svelte": "^3.46.0",
"svelte-check": "^2.7.1",
"svelte-preprocess": "^4.10.6",
"tslib": "^2.3.1",
"typescript": "^4.7.4",
"vite": "^3.1.4"
"@types/codemirror": "5.60.5",
"@types/js-yaml": "4.0.5",
"svelte": "3.50.1",
"svelte-check": "2.9.1",
"svelte-preprocess": "4.10.7",
"tslib": "2.4.0",
"typescript": "4.8.4",
"vite": "3.1.4"
},
"type": "module",
"dependencies": {
"@fontsource/roboto": "^4.5.8",
"codemirror": "^5.65.9",
"js-yaml": "^4.1.0",
"svelte-portal": "^2.2.0"
"@fontsource/roboto": "4.5.8",
"codemirror": "5.65.9",
"js-yaml": "4.1.0",
"svelte-portal": "2.2.0"
}
}

0 comments on commit 8de3da1

Please sign in to comment.