From 4079ec59d99b2be9be6179ee2f72e668d267bba6 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Wed, 2 Oct 2024 14:14:49 +0200 Subject: [PATCH 1/4] update to csdiff 3.5.0 --- Dockerfile | 2 +- docs/CHANGELOG.md | 2 ++ test/Dockerfile | 2 +- test/show_versions.bats | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e482fe0..90ea093 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ FROM fedora@sha256:5ce8497aeea599bf6b54ab3979133923d82aaa4f6ca5ced1812611b197c79 ARG fedora="40" ARG arch="x86_64" -ARG version_csdiff="3.4.0-1" +ARG version_csdiff="3.5.0-1" ARG version_shellcheck="0.9.0-6" ARG rpm_csdiff="csdiff-${version_csdiff}.fc${fedora}.${arch}.rpm" diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index e82a096..c5c6a96 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -2,6 +2,8 @@ ## Next release +* Update `csutils` (`csdiff`) to 3.5.0 + ## v5.4.0 * Native support for `merge_group` trigger event diff --git a/test/Dockerfile b/test/Dockerfile index e834ce8..4bf2d33 100644 --- a/test/Dockerfile +++ b/test/Dockerfile @@ -7,7 +7,7 @@ FROM fedora@sha256:5ce8497aeea599bf6b54ab3979133923d82aaa4f6ca5ced1812611b197c79 ARG fedora="40" ARG arch="x86_64" -ARG version_csdiff="3.4.0-1" +ARG version_csdiff="3.5.0-1" ARG version_shellcheck="0.9.0-6" ARG rpm_csdiff="csdiff-${version_csdiff}.fc${fedora}.${arch}.rpm" diff --git a/test/show_versions.bats b/test/show_versions.bats index dd9c393..18a44d7 100644 --- a/test/show_versions.bats +++ b/test/show_versions.bats @@ -17,5 +17,5 @@ setup () { assert_success assert_output \ "ShellCheck: 0.9.0 -csutils: 3.4.0" +csutils: 3.5.0" } From 158b709657f0e3b806346a0ba50d8f3a4c6dee8a Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Wed, 2 Oct 2024 14:23:44 +0200 Subject: [PATCH 2/4] deps: update fedora container --- Dockerfile | 2 +- test/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 90ea093..3a820cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later -FROM fedora@sha256:5ce8497aeea599bf6b54ab3979133923d82aaa4f6ca5ced1812611b197c79eb0 +FROM fedora@sha256:d0207dbb078ee261852590b9a8f1ab1f8320547be79a2f39af9f3d23db33735e # --- Version Pinning --- # diff --git a/test/Dockerfile b/test/Dockerfile index 4bf2d33..140316d 100644 --- a/test/Dockerfile +++ b/test/Dockerfile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later -FROM fedora@sha256:5ce8497aeea599bf6b54ab3979133923d82aaa4f6ca5ced1812611b197c79eb0 +FROM fedora@sha256:d0207dbb078ee261852590b9a8f1ab1f8320547be79a2f39af9f3d23db33735e # --- Version Pinning --- # From 5b3a259c4685410c639bb0ba21376f9d281266fe Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Wed, 2 Oct 2024 14:39:00 +0200 Subject: [PATCH 3/4] ci: disable `VALIDATE_YAML_PRETTIER` --- .github/workflows/linter.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 5f2093e..c5f76f8 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -33,4 +33,5 @@ jobs: VALIDATE_CHECKOV: false VALIDATE_JSCPD: false VALIDATE_SHELL_SHFMT: false + VALIDATE_YAML_PRETTIER: false GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 4b3f129de735abf6a748a52de7d18623cc5e69cf Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Wed, 2 Oct 2024 14:42:56 +0200 Subject: [PATCH 4/4] ci: disable `VALIDATE_MARKDOWN_PRETTIER` --- .github/workflows/linter.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index c5f76f8..45ce807 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -34,4 +34,5 @@ jobs: VALIDATE_JSCPD: false VALIDATE_SHELL_SHFMT: false VALIDATE_YAML_PRETTIER: false + VALIDATE_MARKDOWN_PRETTIER: false GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}