Skip to content

Commit

Permalink
Merge pull request #12 from appuio/modulesync-6543e31
Browse files Browse the repository at this point in the history
[ModuleSync] Update from projectsyn/modulesync-control@6543e31
  • Loading branch information
bastjan authored Nov 24, 2021
2 parents ba58ea8 + 6a4f86f commit 188aa59
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 21 deletions.
2 changes: 0 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
;
; File managed by ModuleSync - Do Not Edit
;
; Additional Makefiles can be added to `.sync.yml` in 'Makefile.includes'
;
; This file is for unifying the coding style for different editors and IDEs.
; More information at https://editorconfig.org

Expand Down
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.
-->
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ jsonnetfile.lock.json
crds/
compiled/

# Editors
.vscode/
.idea/

# Antora
_archive/
_public/
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ 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
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 188aa59

Please sign in to comment.