Skip to content

Commit

Permalink
Merge pull request #2 from projectsyn/modulesync-f6b57f4
Browse files Browse the repository at this point in the history
[ModuleSync] Update from projectsyn/modulesync-control@f6b57f4
  • Loading branch information
bastjan authored Dec 8, 2021
2 parents 5751143 + 6664d7c commit 45cca39
Show file tree
Hide file tree
Showing 11 changed files with 55 additions and 20 deletions.
8 changes: 7 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
;
; File managed by ModuleSync - Do Not Edit
;
; This file is for unifying the coding style for different editors and IDEs.
; More information at https://editorconfig.org

Expand Down Expand Up @@ -25,6 +28,9 @@ insert_final_newline = false
[Makefile]
indent_style = tab

# Don't check for trailing newlines in golden tests output
; Ignore generated files
[tests/golden/**]
indent_style = unset
indent_size = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
23 changes: 11 additions & 12 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
<!--
Thank you for your pull request. Please provide a description above and
review the checklist below.

Contributors guide: ./CONTRIBUTING.md
-->


## Checklist
<!--
Remove items that do not apply. For completed items, change [ ] to [x].
-->

- [ ] Keep pull requests small so they can be easily reviewed.
- [ ] PR contains a single logical change (to build a better changelog).
- [ ] Update the documentation.
- [ ] Categorize the PR by setting a good title and adding one of the labels:
`bug`, `enhancement`, `documentation`, `change`, `breaking`, `dependency`
as they show up in the changelog
- [ ] Link this PR to related issues.
as they show up in the changelog.
- [ ] Link this PR to related issues or PRs.

<!--
NOTE: these things are not required to open a PR and can be done afterwards,
Thank you for your pull request. Please provide a description above and
review the checklist.
Contributors guide: ./CONTRIBUTING.md
Remove items that do not apply. For completed items, change [ ] to [x].
These things are not required to open a PR and can be done afterwards,
while the PR is open.
-->
2 changes: 0 additions & 2 deletions .github/changelog-configuration.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

{
"pr_template": "- ${{TITLE}} (#${{NUMBER}})",
"categories": [
Expand Down Expand Up @@ -29,4 +28,3 @@
],
"template": "${{CATEGORIZED_COUNT}} changes since ${{FROM_TAG}}\n\n${{CHANGELOG}}"
}

2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
- v*

jobs:
build:
dist:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
with:
path: ${{ env.COMPONENT_NAME }}
- name: Compile component
run: make test -e instance=${{ matrix.instance }}
run: make test
golden:
runs-on: ubuntu-latest
strategy:
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
#
# File managed by ModuleSync - Do Not Edit
#
# Additional entries can be added to `.sync.yml` in '.gitignore.additionalEntries'
#

# Commodore
.cache/
helmcharts/
Expand Down
5 changes: 5 additions & 0 deletions .yamllint.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#
# File managed by ModuleSync - Do Not Edit
#

extends: default

rules:
Expand All @@ -12,3 +16,4 @@ ignore: |
manifests/
vendor/
compiled/
tests/golden/
11 changes: 9 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
#
# File managed by ModuleSync - Do Not Edit
#
# Additional Makefiles can be added to `.sync.yml` in 'Makefile.includes'
#

MAKEFLAGS += --warn-undefined-variables
SHELL := bash
.SHELLFLAGS := -eu -o pipefail -c
Expand Down Expand Up @@ -48,16 +54,17 @@ docs-serve: ## Preview the documentation
.PHONY: test
test: commodore_args += -f tests/$(instance).yml
test: .compile ## Compile the component

.PHONY: gen-golden
gen-golden: commodore_args += -f tests/$(instance).yml
gen-golden: .compile ## Update the reference version for target `golden-diff`.
gen-golden: clean .compile ## Update the reference version for target `golden-diff`.
@rm -rf tests/golden/$(instance)
@mkdir -p tests/golden/$(instance)
@cp -R compiled/. tests/golden/$(instance)/.

.PHONY: golden-diff
golden-diff: commodore_args += -f tests/$(instance).yml
golden-diff: .compile ## Diff compile output against the reference version. Review output and run `make gen-golden golden-diff` if this target fails.
golden-diff: clean .compile ## Diff compile output against the reference version. Review output and run `make gen-golden golden-diff` if this target fails.
@git diff --exit-code --minimal --no-index -- tests/golden/$(instance) compiled/

.PHONY: clean
Expand Down
6 changes: 6 additions & 0 deletions Makefile.vars.mk
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
#
# File managed by ModuleSync - Do Not Edit
#
# Additional Makefiles can be added to `.sync.yml` in 'Makefile.includes'
#

# Commodore takes the root dir name as the component name
COMPONENT_NAME ?= $(shell basename ${PWD} | sed s/component-//)

Expand Down
6 changes: 6 additions & 0 deletions docs/antora.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
#
# File managed by ModuleSync - Do Not Edit
#
# The name and title can be customized in `.sync.yml` with `'docs/antora.yml'.title`, `'docs/antora.yml'.name`
#

name: vcluster
title: vcluster
version: master
Expand Down
4 changes: 3 additions & 1 deletion renovate.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"extends": [
"config:base"
"config:base",
":gitSignOff",
":disableDependencyDashboard"
],
"labels": [
"dependency"
Expand Down

0 comments on commit 45cca39

Please sign in to comment.