Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .cruft.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"template": "https://github.com/projectsyn/commodore-component-template.git",
"commit": "8f2273cd8ab13c55eb0f6dd621c70c4c9e4786fd",
"commit": "5ae57721558399419f867334e31d23a7f7a892ba",
"checkout": "main",
"context": {
"cookiecutter": {
Expand All @@ -25,7 +25,7 @@
"github_name": "component-cloudscale-cloud-controller-manager",
"github_url": "https://github.com/projectsyn/component-cloudscale-cloud-controller-manager",
"_template": "https://github.com/projectsyn/commodore-component-template.git",
"_commit": "8f2273cd8ab13c55eb0f6dd621c70c4c9e4786fd"
"_commit": "5ae57721558399419f867334e31d23a7f7a892ba"
}
},
"directory": null
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
with:
fetch-depth: "0"
- name: Build changelog from PRs with labels
id: build_changelog
uses: mikepenz/release-changelog-builder-action@v5
uses: mikepenz/release-changelog-builder-action@v6
with:
configuration: ".github/changelog-configuration.json"
# PreReleases still get a changelog, but the next full release gets a diff since the last full release,
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
- lint_yaml
- lint_adoc
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Run ${{ matrix.command }}
run: make ${{ matrix.command }}
editorconfig:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- uses: snow-actions/eclint@v1.0.1
with:
args: 'check'
Expand All @@ -38,7 +38,7 @@ jobs:
run:
working-directory: ${{ env.COMPONENT_NAME }}
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
with:
path: ${{ env.COMPONENT_NAME }}
- name: Compile component
Expand All @@ -54,7 +54,7 @@ jobs:
run:
working-directory: ${{ env.COMPONENT_NAME }}
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
with:
path: ${{ env.COMPONENT_NAME }}
- name: Golden diff
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ format: format_jsonnet ## All-in-one formatting

.PHONY: format_jsonnet
format_jsonnet: $(JSONNET_FILES) ## Format jsonnet files
$(JSONNET_DOCKER) $(JSONNETFMT_ARGS) -- $?
$(JSONNET_DOCKER) $(JSONNETFMT_ARGS) --in-place -- $?

.PHONY: docs-serve
docs-serve: ## Preview the documentation
Expand Down
2 changes: 1 addition & 1 deletion Makefile.vars.mk
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ endif
DOCKER_ARGS ?= run --rm -u "$$(id -u):$$(id -g)" --userns=$(DOCKER_USERNS) -w /$(COMPONENT_NAME) -e HOME="/$(COMPONENT_NAME)"

JSONNET_FILES ?= $(shell find . -type f -not -path './vendor/*' \( -name '*.*jsonnet' -or -name '*.libsonnet' \))
JSONNETFMT_ARGS ?= --in-place --pad-arrays
JSONNETFMT_ARGS ?= --pad-arrays
JSONNET_IMAGE ?= ghcr.io/projectsyn/jsonnet:latest
JSONNET_DOCKER ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) --entrypoint=jsonnetfmt $(JSONNET_IMAGE)

Expand Down
Loading