From f394ab4d2c3f768c325d9d095d740da3125a6ad7 Mon Sep 17 00:00:00 2001 From: Ward Wouts Date: Wed, 28 May 2025 08:43:21 +0200 Subject: [PATCH 01/17] add config --- .mega-linter.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .mega-linter.yml diff --git a/.mega-linter.yml b/.mega-linter.yml new file mode 100644 index 0000000..42ee473 --- /dev/null +++ b/.mega-linter.yml @@ -0,0 +1,17 @@ +--- +APPLY_FIXES: none +DISABLE: + - ACTION + - BASH + - COPYPASTE + - DOCKERFILE + - GO + - JAVASCRIPT + - SPELL +DISABLE_LINTERS: + - YAML_YAMLLINT + - MARKDOWN_MARKDOWN_TABLE_FORMATTER + - MARKDOWN_MARKDOWN_LINK_CHECK +FILTER_REGEX_EXCLUDE: .*testdata/* +PARALLEL: false +PRINT_ALPACA: false From b891918d6f822a8ec5f645bb8cdb1e2f9a6069ab Mon Sep 17 00:00:00 2001 From: Ward Wouts Date: Wed, 28 May 2025 08:47:44 +0200 Subject: [PATCH 02/17] also check bash --- .mega-linter.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.mega-linter.yml b/.mega-linter.yml index 42ee473..1624541 100644 --- a/.mega-linter.yml +++ b/.mega-linter.yml @@ -2,7 +2,6 @@ APPLY_FIXES: none DISABLE: - ACTION - - BASH - COPYPASTE - DOCKERFILE - GO From 4798115af24e849e6fcb0d4fcaad307853a0e2c3 Mon Sep 17 00:00:00 2001 From: Ward Wouts Date: Wed, 28 May 2025 09:10:00 +0200 Subject: [PATCH 03/17] tuning --- .forgejo/workflows/ci.yml | 2 +- README.md | 4 ++-- renovate.json | 14 +++++++++++- setup.sh | 48 --------------------------------------- 4 files changed, 16 insertions(+), 52 deletions(-) diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index 564ff95..89e2fd5 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: https://github.com/oxsecurity/megalinter@v8 + - uses: https://github.com/oxsecurity/megalinter/flavors/cupcake@v8.7.0 - uses: https://github.com/wackbyte/rust-toolchain@trunk with: diff --git a/README.md b/README.md index 7668327..28c0c29 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,6 @@ `mvw` is a reimplementation of my old `mvwrap` Perl script. The goal is to be much faster and not need Perl anymore. Building can be done with: -``` -$ cargo build --release +```bash +cargo build --release ``` diff --git a/renovate.json b/renovate.json index bd36a9d..5ef9b55 100644 --- a/renovate.json +++ b/renovate.json @@ -11,7 +11,19 @@ "digest" ], "automerge": false - } + }, + { + "matchPackagePatterns": ["^actions/checkout"], + "ignoreVersions": ["v4"] + }, + { + "matchPackagePatterns": ["^https://github.com/oxsecurity/megalinter"], + "ignoreVersions": [">=8.7.0"] + }, + { + "matchPackagePatterns": ["^https://github.com/wackbyte/rust-toolchain"], + "ignoreVersions": ["trunk"] + }, ], "osvVulnerabilityAlerts": true } diff --git a/setup.sh b/setup.sh index 178c540..a466da5 100755 --- a/setup.sh +++ b/setup.sh @@ -4,54 +4,6 @@ set -u # Throw errors when unset variables are used set -e # Exit on error #set -o pipefail # Bash specific -usage() { - echo "Tool to BLAH BLAH BLAH" - echo - echo "Usage:" - echo "$0 [-eh] [-a ] " - echo - echo "-a Option with argument" - echo "-e Example option" - echo "-h This help message" - exit -} - -askyn() { - while true; do - printf '%s ' "$1 " - read -r yn - case $yn in - [Yy]* ) return 0;; - [Nn]* ) return 1;; - * ) echo "Please answer [y]es or [n]o.";; - esac - done -} - -# A POSIX variable -OPTIND=1 # Reset in case getopts has been used previously in the shell. - -# Initialize our own variables: -ARGUMENT="" -EXAMPLE="" - -# getopts only allows single letter options (but is apparently the most -# portable). If you want multi letter options (eg --help) use getopt. -while getopts "hea:" opt; do - case "$opt" in - a) ARGUMENT="$OPTARG";; - h) - usage - ;; - e) EXAMPLE="-e" ;; - ?) exit 1 ;; # message provided by getopts - esac -done - -shift $((OPTIND-1)) - -[ $# -ge 1 ] && [ "$1" = "--" ] && shift - MYDIR=$(dirname "$(realpath "$0")") TESTDIR="${MYDIR}/test" From 5994c0a4363bca5a68baa80ee7198fe685815c26 Mon Sep 17 00:00:00 2001 From: Ward Wouts Date: Wed, 28 May 2025 09:36:12 +0200 Subject: [PATCH 04/17] cupcake? --- .forgejo/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index 89e2fd5..ef9ad9c 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -10,7 +10,9 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: https://github.com/oxsecurity/megalinter/flavors/cupcake@v8.7.0 + - uses: https://github.com/oxsecurity/megalinter@v8 + env: + MEGALINTER_FLAVOR: cupcake - uses: https://github.com/wackbyte/rust-toolchain@trunk with: From 7996f6e1b385546f5ddb2c77cfd889012efd8e9b Mon Sep 17 00:00:00 2001 From: Ward Wouts Date: Wed, 28 May 2025 09:43:07 +0200 Subject: [PATCH 05/17] tuning --- .mega-linter.yml | 2 ++ renovate.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.mega-linter.yml b/.mega-linter.yml index 1624541..a30000e 100644 --- a/.mega-linter.yml +++ b/.mega-linter.yml @@ -6,6 +6,8 @@ DISABLE: - DOCKERFILE - GO - JAVASCRIPT + - KUBERNETES + - SALESFORCE - SPELL DISABLE_LINTERS: - YAML_YAMLLINT diff --git a/renovate.json b/renovate.json index 5ef9b55..e4a3933 100644 --- a/renovate.json +++ b/renovate.json @@ -24,6 +24,6 @@ "matchPackagePatterns": ["^https://github.com/wackbyte/rust-toolchain"], "ignoreVersions": ["trunk"] }, - ], + ] "osvVulnerabilityAlerts": true } From f13f9137e75c53c4b9aa6c1f748fb78871220f16 Mon Sep 17 00:00:00 2001 From: Ward Wouts Date: Wed, 28 May 2025 09:46:16 +0200 Subject: [PATCH 06/17] tuning --- .mega-linter.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.mega-linter.yml b/.mega-linter.yml index a30000e..97a61e8 100644 --- a/.mega-linter.yml +++ b/.mega-linter.yml @@ -13,6 +13,7 @@ DISABLE_LINTERS: - YAML_YAMLLINT - MARKDOWN_MARKDOWN_TABLE_FORMATTER - MARKDOWN_MARKDOWN_LINK_CHECK + - REPOSITORY_KICS FILTER_REGEX_EXCLUDE: .*testdata/* PARALLEL: false PRINT_ALPACA: false From 8af945e4b47429bc4740308797c72fb9cffec1c0 Mon Sep 17 00:00:00 2001 From: Ward Wouts Date: Wed, 28 May 2025 09:50:55 +0200 Subject: [PATCH 07/17] tuning --- renovate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renovate.json b/renovate.json index e4a3933..d1a3a0d 100644 --- a/renovate.json +++ b/renovate.json @@ -23,7 +23,7 @@ { "matchPackagePatterns": ["^https://github.com/wackbyte/rust-toolchain"], "ignoreVersions": ["trunk"] - }, - ] + } + ], "osvVulnerabilityAlerts": true } From 62e3ae0b52a133439d67c129956975ce505c0777 Mon Sep 17 00:00:00 2001 From: Ward Wouts Date: Wed, 28 May 2025 10:17:10 +0200 Subject: [PATCH 08/17] ? --- .forgejo/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index ef9ad9c..46ca4f4 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -8,11 +8,12 @@ jobs: name: cargo test runs-on: docker steps: - - uses: actions/checkout@v4 + - uses: https://code.forgejo.org/actions/checkout@v4 - uses: https://github.com/oxsecurity/megalinter@v8 env: MEGALINTER_FLAVOR: cupcake + GITHUB_SERVER_URL: https://forgejo.wizeazz.nl - uses: https://github.com/wackbyte/rust-toolchain@trunk with: From 44047af197691365bff95ba9881f866d100cadbc Mon Sep 17 00:00:00 2001 From: Ward Wouts Date: Wed, 28 May 2025 10:28:28 +0200 Subject: [PATCH 09/17] this help? --- .forgejo/workflows/ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index 46ca4f4..2451958 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -13,7 +13,12 @@ jobs: - uses: https://github.com/oxsecurity/megalinter@v8 env: MEGALINTER_FLAVOR: cupcake - GITHUB_SERVER_URL: https://forgejo.wizeazz.nl + #GITHUB_SERVER_URL: https://forgejo.wizeazz.nl + DEFAULT_BRANCH: master + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + VALIDATE_ALL_CODEBASE: false + GITHUB_STATUS_REPORTER: ${{ !env.ACT }} + GITHUB_COMMENT_REPORTER: ${{ !env.ACT }} - uses: https://github.com/wackbyte/rust-toolchain@trunk with: From a0a2b842e2eee4aabe94051785d5d9acba8a20ed Mon Sep 17 00:00:00 2001 From: Ward Wouts Date: Wed, 28 May 2025 10:30:18 +0200 Subject: [PATCH 10/17] speedup for test sake --- .mega-linter.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.mega-linter.yml b/.mega-linter.yml index 97a61e8..141f819 100644 --- a/.mega-linter.yml +++ b/.mega-linter.yml @@ -9,6 +9,9 @@ DISABLE: - KUBERNETES - SALESFORCE - SPELL + - BASH + - REPOSITORY + - YAML DISABLE_LINTERS: - YAML_YAMLLINT - MARKDOWN_MARKDOWN_TABLE_FORMATTER From b19e780e588d9790c9bf89aface949ade6c47d3c Mon Sep 17 00:00:00 2001 From: Ward Wouts Date: Wed, 28 May 2025 10:34:09 +0200 Subject: [PATCH 11/17] try again --- .forgejo/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index 2451958..1541667 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -13,8 +13,7 @@ jobs: - uses: https://github.com/oxsecurity/megalinter@v8 env: MEGALINTER_FLAVOR: cupcake - #GITHUB_SERVER_URL: https://forgejo.wizeazz.nl - DEFAULT_BRANCH: master + GITHUB_SERVER_URL: https://forgejo.wizeazz.nl GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} VALIDATE_ALL_CODEBASE: false GITHUB_STATUS_REPORTER: ${{ !env.ACT }} From 135b531e35985256a5e8c78b3d393d8e88de2adc Mon Sep 17 00:00:00 2001 From: Ward Wouts Date: Wed, 28 May 2025 10:39:18 +0200 Subject: [PATCH 12/17] check again --- .mega-linter.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.mega-linter.yml b/.mega-linter.yml index 141f819..97a61e8 100644 --- a/.mega-linter.yml +++ b/.mega-linter.yml @@ -9,9 +9,6 @@ DISABLE: - KUBERNETES - SALESFORCE - SPELL - - BASH - - REPOSITORY - - YAML DISABLE_LINTERS: - YAML_YAMLLINT - MARKDOWN_MARKDOWN_TABLE_FORMATTER From 5c5a6b5f39894eed0ae7035c4a90979c730c4149 Mon Sep 17 00:00:00 2001 From: Ward Wouts Date: Wed, 28 May 2025 10:45:47 +0200 Subject: [PATCH 13/17] all the codes --- .forgejo/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index 1541667..696a224 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: MEGALINTER_FLAVOR: cupcake GITHUB_SERVER_URL: https://forgejo.wizeazz.nl GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - VALIDATE_ALL_CODEBASE: false +# VALIDATE_ALL_CODEBASE: false GITHUB_STATUS_REPORTER: ${{ !env.ACT }} GITHUB_COMMENT_REPORTER: ${{ !env.ACT }} From 763435b4b2d55b3cedca5f4f5358429bb1d0379d Mon Sep 17 00:00:00 2001 From: Ward Wouts Date: Wed, 28 May 2025 10:47:49 +0200 Subject: [PATCH 14/17] for now lint all code --- .forgejo/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index 696a224..5e84151 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -15,6 +15,7 @@ jobs: MEGALINTER_FLAVOR: cupcake GITHUB_SERVER_URL: https://forgejo.wizeazz.nl GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# set validate all codebase to false to only check new or edited files # VALIDATE_ALL_CODEBASE: false GITHUB_STATUS_REPORTER: ${{ !env.ACT }} GITHUB_COMMENT_REPORTER: ${{ !env.ACT }} From 9c58837c8c00b74be11e70e49fa2ea487f98f1a4 Mon Sep 17 00:00:00 2001 From: Ward Wouts Date: Wed, 28 May 2025 11:14:09 +0200 Subject: [PATCH 15/17] shut 'prettier' up --- .forgejo/workflows/ci.yml | 4 ++-- renovate.json | 11 ++--------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index 5e84151..03936c9 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -15,8 +15,8 @@ jobs: MEGALINTER_FLAVOR: cupcake GITHUB_SERVER_URL: https://forgejo.wizeazz.nl GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# set validate all codebase to false to only check new or edited files -# VALIDATE_ALL_CODEBASE: false + # set validate all codebase to false to only check new or edited files + # VALIDATE_ALL_CODEBASE: false GITHUB_STATUS_REPORTER: ${{ !env.ACT }} GITHUB_COMMENT_REPORTER: ${{ !env.ACT }} diff --git a/renovate.json b/renovate.json index d1a3a0d..b0a6d65 100644 --- a/renovate.json +++ b/renovate.json @@ -1,15 +1,8 @@ { - "extends": [ - "config:best-practices" - ], + "extends": ["config:best-practices"], "packageRules": [ { - "matchUpdateTypes": [ - "minor", - "patch", - "pin", - "digest" - ], + "matchUpdateTypes": ["minor", "patch", "pin", "digest"], "automerge": false }, { From c1c5e58c21dd52ab35051db19b4c6fb8dd0206a0 Mon Sep 17 00:00:00 2001 From: Ward Wouts Date: Wed, 28 May 2025 11:17:13 +0200 Subject: [PATCH 16/17] megalint happy, so limit checks to changes --- .forgejo/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index 03936c9..93ddbb1 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: GITHUB_SERVER_URL: https://forgejo.wizeazz.nl GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # set validate all codebase to false to only check new or edited files - # VALIDATE_ALL_CODEBASE: false + VALIDATE_ALL_CODEBASE: false GITHUB_STATUS_REPORTER: ${{ !env.ACT }} GITHUB_COMMENT_REPORTER: ${{ !env.ACT }} From ca7724a6ea4151038f39b00dea28be93d969cb33 Mon Sep 17 00:00:00 2001 From: Ward Wouts Date: Wed, 28 May 2025 15:30:39 +0200 Subject: [PATCH 17/17] fix AI slop --- renovate.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/renovate.json b/renovate.json index b0a6d65..b9cf179 100644 --- a/renovate.json +++ b/renovate.json @@ -7,15 +7,15 @@ }, { "matchPackagePatterns": ["^actions/checkout"], - "ignoreVersions": ["v4"] + "matchUpdateTypes": ["minor", "patch", "digest"], }, { "matchPackagePatterns": ["^https://github.com/oxsecurity/megalinter"], - "ignoreVersions": [">=8.7.0"] + "matchUpdateTypes": ["minor", "patch", "digest"], }, { "matchPackagePatterns": ["^https://github.com/wackbyte/rust-toolchain"], - "ignoreVersions": ["trunk"] + "matchUpdateTypes": ["minor", "patch", "digest"], } ], "osvVulnerabilityAlerts": true