From 361f8ca67e9b55deb8e39eb26228f1a64c72fe3d Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 16 May 2024 07:29:43 +0200 Subject: [PATCH 01/12] add renovate template setup --- renovate.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..aa311e2 --- /dev/null +++ b/renovate.json @@ -0,0 +1,12 @@ +{ + "dependencyDashboard": true, + "docker": { + "enabled": true + }, + "woodpecker": { + "enabled": true, + "fileMatch": [ + "^.woodpecker\/.*.yml$" + ] + } +} -- 2.45.2 From 35d833c0551d1914486befa28179829a04e22d08 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 16 May 2024 11:24:50 +0200 Subject: [PATCH 02/12] add linters --- .woodpecker/ci.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.woodpecker/ci.yml b/.woodpecker/ci.yml index 332df7a..51711f4 100644 --- a/.woodpecker/ci.yml +++ b/.woodpecker/ci.yml @@ -26,6 +26,26 @@ variables: from_secret: gitea_passwd steps: + lint-dockerfile: + image: hadolint/hadolint:v2.12.1-beta-alpine + commands: + - hadolint --ignore DL3003 --ignore DL3018 Dockerfile + when: + path: "Dockerfile" + + lint-markdown: + image: davidanson/markdownlint-cli2:v0.13.0 + commands: + - "markdownlint-cli2 *.{md,markdown}" + when: + path: "*.{md,markdown}" + + lint-editorconfig: + depends_on: [] + image: docker.io/mstruebing/editorconfig-checker:v3.0.1 + when: + event: pull_request + test: image: *build_plugin settings: -- 2.45.2 From 6f7bc9c578909f171cd195137525a3e8f21ce182 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 16 May 2024 11:34:52 +0200 Subject: [PATCH 03/12] setup linters in vscode --- .vscode/dictionaries/project-words.txt | 2 ++ .vscode/extensions.json | 3 ++- .vscode/settings.json | 19 +++++-------------- README.md | 6 ++++-- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/.vscode/dictionaries/project-words.txt b/.vscode/dictionaries/project-words.txt index 0601a09..aa916c9 100644 --- a/.vscode/dictionaries/project-words.txt +++ b/.vscode/dictionaries/project-words.txt @@ -1 +1,3 @@ +gitea +Gitea tbd diff --git a/.vscode/extensions.json b/.vscode/extensions.json index bb7dca0..e4dfc4c 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -5,6 +5,7 @@ "streetsidesoftware.code-spell-checker", "streetsidesoftware.code-spell-checker-german", "bierner.emojisense", - "ryanluker.vscode-coverage-gutters" + "ryanluker.vscode-coverage-gutters", + "davidanson.vscode-markdownlint" ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index ed6e551..fb63d46 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,20 +9,6 @@ "editor.rulers": [ 116 ], - // powershell general - "powershell.startAutomatically": true, - "powershell.enableProfileLoading": true, - "powershell.scriptAnalysis.enable": true, - // powershell code Formatting - "powershell.codeFormatting.openBraceOnSameLine": true, - "powershell.codeFormatting.newLineAfterOpenBrace": true, - "powershell.codeFormatting.newLineAfterCloseBrace": true, - "powershell.codeFormatting.whitespaceBeforeOpenBrace": true, - "powershell.codeFormatting.whitespaceBeforeOpenParen": true, - "powershell.codeFormatting.whitespaceAroundOperator": true, - "powershell.codeFormatting.whitespaceAfterSeparator": true, - "powershell.codeFormatting.ignoreOneLineBlock": true, - "powershell.codeFormatting.alignPropertyValuePairs": true, // cSpell settings for custom dictionary "cSpell.enabled": true, "cSpell.caseSensitive": false, @@ -67,5 +53,10 @@ "addWords": true }, "custom": true + }, + "[markdown]": { + "editor.defaultFormatter": "DavidAnson.vscode-markdownlint", + "editor.formatOnSave": true, + "editor.formatOnPaste": true, } } diff --git a/README.md b/README.md index 1574e39..ad9a614 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ + +

- - + built-with-love + for-you

-- 2.45.2 From 755749ff97f22c99a8c53cc60df86f19fe78e912 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 16 May 2024 11:51:29 +0200 Subject: [PATCH 04/12] adjust markdownlint --- .markdownlint.json | 8 ++++++++ .vscode/tasks.json | 3 ++- CHANGELOG.md | 2 +- README.md | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 .markdownlint.json diff --git a/.markdownlint.json b/.markdownlint.json new file mode 100644 index 0000000..ff8c952 --- /dev/null +++ b/.markdownlint.json @@ -0,0 +1,8 @@ +{ + "default": true, + "MD013": { + "line_length": 116, + "code_block_line_length": 116, + "tables": false + } +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json index b72665a..3271576 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -6,7 +6,8 @@ "type": "shell", "command": [ "mv 'CHANGELOG.md' 'CHANGELOG.back' &&", - "changelog -m '${input:Milestone}' --token '${input:GiteaToken}' -c .changelog.yml generate > CHANGELOG.md &&", + "echo '' > CHANGELOG.md &&", + "changelog -m '${input:Milestone}' --token '${input:GiteaToken}' -c .changelog.yml generate >> CHANGELOG.md &&", "echo '' >> CHANGELOG.md &&", "cat CHANGELOG.back >> CHANGELOG.md &&", "rm CHANGELOG.back" diff --git a/CHANGELOG.md b/CHANGELOG.md index c826aa3..ecccf66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ + ## [v0.1.0](https://gitea.ocram85.com/plugins/gitea-package/releases/tag/v0.1.0) - 2024-05-14 * 🐛 BUGFIXES @@ -7,4 +8,3 @@ * Migrate content (#1) * ⚙️ META * Update Gitea meta files (#2) - diff --git a/README.md b/README.md index ad9a614..0025edf 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - +

built-with-love -- 2.45.2 From 60a20669a3bf0d9e94c2971d4969af2ae7951a77 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 16 May 2024 11:53:01 +0200 Subject: [PATCH 05/12] fix linter issues --- .editorconfig | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.editorconfig b/.editorconfig index fd2fc3f..3c97bf3 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,14 +1,14 @@ -root = true - -[*] -indent_style = space -indent_size = 2 -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - - -[*.go] -indent_style = tab -indent_size = 4 +root = true + +[*] +indent_style = space +indent_size = 2 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + + +[*.go] +indent_style = tab +indent_size = 4 -- 2.45.2 From f2a68b0de85fcb1f9b73e904c8c1e40e4a581e9a Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 16 May 2024 12:00:45 +0200 Subject: [PATCH 06/12] add hadolint config file --- .hadolint.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .hadolint.yml diff --git a/.hadolint.yml b/.hadolint.yml new file mode 100644 index 0000000..8437155 --- /dev/null +++ b/.hadolint.yml @@ -0,0 +1,3 @@ +ignored: + - DL3018 # pin versions in Dockerfile + - DL3013 # pin pip versions in Dockerfile -- 2.45.2 From 4bd73f2dad397f3b9e5da7a1964f0b5e60e46fce Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 16 May 2024 12:01:27 +0200 Subject: [PATCH 07/12] debug path for dockerlint --- .woodpecker/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/ci.yml b/.woodpecker/ci.yml index 51711f4..896fc18 100644 --- a/.woodpecker/ci.yml +++ b/.woodpecker/ci.yml @@ -30,8 +30,8 @@ steps: image: hadolint/hadolint:v2.12.1-beta-alpine commands: - hadolint --ignore DL3003 --ignore DL3018 Dockerfile - when: - path: "Dockerfile" + #when: + # path: "Dockerfile" lint-markdown: image: davidanson/markdownlint-cli2:v0.13.0 -- 2.45.2 From 327d542e04b7eca0c7cf391129f5f7eb610b973b Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 16 May 2024 12:05:57 +0200 Subject: [PATCH 08/12] test hadolint verbose --- .woodpecker/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/ci.yml b/.woodpecker/ci.yml index 896fc18..1707d00 100644 --- a/.woodpecker/ci.yml +++ b/.woodpecker/ci.yml @@ -29,7 +29,7 @@ steps: lint-dockerfile: image: hadolint/hadolint:v2.12.1-beta-alpine commands: - - hadolint --ignore DL3003 --ignore DL3018 Dockerfile + - hadolint --verbose --ignore DL3003 --ignore DL3018 Dockerfile #when: # path: "Dockerfile" -- 2.45.2 From 2820cd43ddf7864ff32d1fbbd142065af490381c Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 16 May 2024 12:06:39 +0200 Subject: [PATCH 09/12] debug --- .woodpecker/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker/ci.yml b/.woodpecker/ci.yml index 1707d00..5489da6 100644 --- a/.woodpecker/ci.yml +++ b/.woodpecker/ci.yml @@ -29,6 +29,7 @@ steps: lint-dockerfile: image: hadolint/hadolint:v2.12.1-beta-alpine commands: + - la -la - hadolint --verbose --ignore DL3003 --ignore DL3018 Dockerfile #when: # path: "Dockerfile" -- 2.45.2 From c5cdee3d9c61d06c908311c3bedfcff268a77be2 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 16 May 2024 12:06:59 +0200 Subject: [PATCH 10/12] typo --- .woodpecker/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/ci.yml b/.woodpecker/ci.yml index 5489da6..3a423fa 100644 --- a/.woodpecker/ci.yml +++ b/.woodpecker/ci.yml @@ -29,7 +29,7 @@ steps: lint-dockerfile: image: hadolint/hadolint:v2.12.1-beta-alpine commands: - - la -la + - ls -la - hadolint --verbose --ignore DL3003 --ignore DL3018 Dockerfile #when: # path: "Dockerfile" -- 2.45.2 From 75ffda40f30b2015c620ece4aa2bcc901f2569b6 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 16 May 2024 12:07:52 +0200 Subject: [PATCH 11/12] debug --- .woodpecker/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/ci.yml b/.woodpecker/ci.yml index 3a423fa..386b779 100644 --- a/.woodpecker/ci.yml +++ b/.woodpecker/ci.yml @@ -29,7 +29,7 @@ steps: lint-dockerfile: image: hadolint/hadolint:v2.12.1-beta-alpine commands: - - ls -la + - cat Dockerfile - hadolint --verbose --ignore DL3003 --ignore DL3018 Dockerfile #when: # path: "Dockerfile" -- 2.45.2 From 22636cbc2806ea82c9c520e00aa8060c56e118e9 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 16 May 2024 12:08:45 +0200 Subject: [PATCH 12/12] remove debug output --- .woodpecker/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.woodpecker/ci.yml b/.woodpecker/ci.yml index 386b779..f2686a1 100644 --- a/.woodpecker/ci.yml +++ b/.woodpecker/ci.yml @@ -29,8 +29,9 @@ steps: lint-dockerfile: image: hadolint/hadolint:v2.12.1-beta-alpine commands: - - cat Dockerfile - - hadolint --verbose --ignore DL3003 --ignore DL3018 Dockerfile + #- cat Dockerfile + #- hadolint --verbose --ignore DL3003 --ignore DL3018 Dockerfile + - hadolint --ignore DL3003 --ignore DL3018 Dockerfile #when: # path: "Dockerfile" -- 2.45.2