From 1abaf51dac0b4605d7d99d17a0dd02ebabc3ccd9 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sat, 17 May 2025 09:08:41 -0700
Subject: [PATCH 01/11] Attempting to fix the linting
---
.ci-scripts/lint.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.ci-scripts/lint.sh b/.ci-scripts/lint.sh
index 682abc3..e351356 100644
--- a/.ci-scripts/lint.sh
+++ b/.ci-scripts/lint.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-jq --null-input --arg yaml "$1" '.content=$yaml' \
- | curl "https://git.ethitter.com/api/v4/ci/lint?include_merged_yaml=true" \
+jq --null-input --arg yaml "$(<$1)" '.content=$yaml' \
+ | curl "https://git.ethitter.com/api/v4/projects/:id/ci/lint?include_merged_yaml=true" \
--silent \
--header 'Content-Type: application/json' \
--header "PRIVATE-TOKEN: $GITLAB_API_PAT" \
--
GitLab
From 3c81400a08abd838d7ebd0973eba8b2292e61f53 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sat, 17 May 2025 09:09:57 -0700
Subject: [PATCH 02/11] Attempting to fix the linting
---
.ci-scripts/lint.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.ci-scripts/lint.sh b/.ci-scripts/lint.sh
index e351356..2bab553 100644
--- a/.ci-scripts/lint.sh
+++ b/.ci-scripts/lint.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-jq --null-input --arg yaml "$(<$1)" '.content=$yaml' \
+jq --null-input --arg yaml "$1" '.content=$yaml' \
| curl "https://git.ethitter.com/api/v4/projects/:id/ci/lint?include_merged_yaml=true" \
--silent \
--header 'Content-Type: application/json' \
--
GitLab
From 94dfde221948051df1b46299b60deffbf4ed2c26 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sat, 17 May 2025 09:10:46 -0700
Subject: [PATCH 03/11] Attempting to fix the linting
---
.ci-scripts/lint.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.ci-scripts/lint.sh b/.ci-scripts/lint.sh
index 2bab553..a3c5100 100644
--- a/.ci-scripts/lint.sh
+++ b/.ci-scripts/lint.sh
@@ -8,6 +8,8 @@ jq --null-input --arg yaml "$1" '.content=$yaml' \
--data @- \
-o result.json
+jq < result.json
+
echo "**********************************************************"
echo "MERGED YAML:"
jq --raw-output '.merged_yaml' < result.json
--
GitLab
From ec4b1326bbf62614b475c64ef43355a1e8a8e0ca Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sat, 17 May 2025 09:12:02 -0700
Subject: [PATCH 04/11] Attempting to fix the linting
---
.ci-scripts/lint.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.ci-scripts/lint.sh b/.ci-scripts/lint.sh
index a3c5100..1353ad1 100644
--- a/.ci-scripts/lint.sh
+++ b/.ci-scripts/lint.sh
@@ -1,7 +1,7 @@
#!/bin/bash
jq --null-input --arg yaml "$1" '.content=$yaml' \
- | curl "https://git.ethitter.com/api/v4/projects/:id/ci/lint?include_merged_yaml=true" \
+ | curl "https://git.ethitter.com/api/v4/projects/${CI_JOB_ID}/ci/lint?include_merged_yaml=true" \
--silent \
--header 'Content-Type: application/json' \
--header "PRIVATE-TOKEN: $GITLAB_API_PAT" \
--
GitLab
From dd27bf3f79f93eee373d5d41bde78fea1cdf6eb2 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sat, 17 May 2025 09:12:54 -0700
Subject: [PATCH 05/11] Attempting to fix the linting
---
.ci-scripts/lint.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.ci-scripts/lint.sh b/.ci-scripts/lint.sh
index 1353ad1..156fd15 100644
--- a/.ci-scripts/lint.sh
+++ b/.ci-scripts/lint.sh
@@ -2,7 +2,7 @@
jq --null-input --arg yaml "$1" '.content=$yaml' \
| curl "https://git.ethitter.com/api/v4/projects/${CI_JOB_ID}/ci/lint?include_merged_yaml=true" \
- --silent \
+# --silent \
--header 'Content-Type: application/json' \
--header "PRIVATE-TOKEN: $GITLAB_API_PAT" \
--data @- \
--
GitLab
From 39e60e55eadb595d378be974e2809788352f0358 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sat, 17 May 2025 09:14:08 -0700
Subject: [PATCH 06/11] Attempting to fix the linting
---
.ci-scripts/lint.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/.ci-scripts/lint.sh b/.ci-scripts/lint.sh
index 156fd15..9297514 100644
--- a/.ci-scripts/lint.sh
+++ b/.ci-scripts/lint.sh
@@ -3,6 +3,7 @@
jq --null-input --arg yaml "$1" '.content=$yaml' \
| curl "https://git.ethitter.com/api/v4/projects/${CI_JOB_ID}/ci/lint?include_merged_yaml=true" \
# --silent \
+ -vvv \
--header 'Content-Type: application/json' \
--header "PRIVATE-TOKEN: $GITLAB_API_PAT" \
--data @- \
--
GitLab
From feffef94144b80e6ca8ee0137529257309597c4f Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sat, 17 May 2025 09:15:14 -0700
Subject: [PATCH 07/11] Attempting to fix the linting
---
.ci-scripts/lint.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.ci-scripts/lint.sh b/.ci-scripts/lint.sh
index 9297514..1e61d8a 100644
--- a/.ci-scripts/lint.sh
+++ b/.ci-scripts/lint.sh
@@ -1,9 +1,8 @@
#!/bin/bash
jq --null-input --arg yaml "$1" '.content=$yaml' \
- | curl "https://git.ethitter.com/api/v4/projects/${CI_JOB_ID}/ci/lint?include_merged_yaml=true" \
+ | curl -vvv "https://git.ethitter.com/api/v4/projects/${CI_JOB_ID}/ci/lint?include_merged_yaml=true" \
# --silent \
- -vvv \
--header 'Content-Type: application/json' \
--header "PRIVATE-TOKEN: $GITLAB_API_PAT" \
--data @- \
--
GitLab
From a0ee7ad46a256cad31bdcb08e94a75f6129eb15e Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sat, 17 May 2025 09:16:29 -0700
Subject: [PATCH 08/11] Attempting to fix the linting
---
.ci-scripts/lint.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.ci-scripts/lint.sh b/.ci-scripts/lint.sh
index 1e61d8a..553d454 100644
--- a/.ci-scripts/lint.sh
+++ b/.ci-scripts/lint.sh
@@ -1,7 +1,7 @@
#!/bin/bash
jq --null-input --arg yaml "$1" '.content=$yaml' \
- | curl -vvv "https://git.ethitter.com/api/v4/projects/${CI_JOB_ID}/ci/lint?include_merged_yaml=true" \
+ | curl -vvv "https://git.ethitter.com/api/v4/projects/${CI_PROJECT_ID}/ci/lint?include_merged_yaml=true" \
# --silent \
--header 'Content-Type: application/json' \
--header "PRIVATE-TOKEN: $GITLAB_API_PAT" \
--
GitLab
From 5d4d11bce83a9c629fbfd90582efb20ee2479dd6 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sat, 17 May 2025 09:18:22 -0700
Subject: [PATCH 09/11] Attempting to fix the linting
---
.ci-scripts/lint.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.ci-scripts/lint.sh b/.ci-scripts/lint.sh
index 553d454..39960a5 100644
--- a/.ci-scripts/lint.sh
+++ b/.ci-scripts/lint.sh
@@ -1,8 +1,9 @@
#!/bin/bash
jq --null-input --arg yaml "$1" '.content=$yaml' \
- | curl -vvv "https://git.ethitter.com/api/v4/projects/${CI_PROJECT_ID}/ci/lint?include_merged_yaml=true" \
-# --silent \
+ | curl "https://git.ethitter.com/api/v4/projects/${CI_PROJECT_ID}/ci/lint?include_merged_yaml=true" \
+ --silent \
+ -vvv \
--header 'Content-Type: application/json' \
--header "PRIVATE-TOKEN: $GITLAB_API_PAT" \
--data @- \
--
GitLab
From d412a711031ec69caad1310f49315f83ff645246 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sat, 17 May 2025 09:20:34 -0700
Subject: [PATCH 10/11] Attempting to fix the linting
---
.ci-scripts/lint.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.ci-scripts/lint.sh b/.ci-scripts/lint.sh
index 39960a5..fb84abe 100644
--- a/.ci-scripts/lint.sh
+++ b/.ci-scripts/lint.sh
@@ -3,13 +3,12 @@
jq --null-input --arg yaml "$1" '.content=$yaml' \
| curl "https://git.ethitter.com/api/v4/projects/${CI_PROJECT_ID}/ci/lint?include_merged_yaml=true" \
--silent \
- -vvv \
--header 'Content-Type: application/json' \
--header "PRIVATE-TOKEN: $GITLAB_API_PAT" \
--data @- \
-o result.json
-jq < result.json
+# TODO: save the `result.json` as an artifact.
echo "**********************************************************"
echo "MERGED YAML:"
--
GitLab
From d7817f787c03b939314fa267a4baeeb6d2816309 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sun, 18 May 2025 12:43:02 -0700
Subject: [PATCH 11/11] Capture `result.json` in artifacts
---
.gitlab-ci.yml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 838bbf3..b3b5273 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,9 +10,15 @@ lint:plugins:default:
image: containers.ethitter.com:443/docker/images/debian:bullseye
script:
- sh ./.ci-scripts/lint.sh "$(<./plugins/default.yml)"
+ artifacts:
+ paths:
+ - result.json
lint:plugins:default-redis:
stage: test
image: containers.ethitter.com:443/docker/images/debian:bullseye
script:
- sh ./.ci-scripts/lint.sh "$(<./plugins/default-redis.yml)"
+ artifacts:
+ paths:
+ - result.json
\ No newline at end of file
--
GitLab