From 8e70b57fee2dae8ae077622a29a3dc523450143e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tina=20M=C3=BCller?= Date: Tue, 4 Jun 2024 11:48:08 +0200 Subject: [PATCH] git subrepo pull (merge) external/os-autoinst-common subrepo: subdir: "external/os-autoinst-common" merged: "9a505a7" upstream: origin: "https://github.com/os-autoinst/os-autoinst-common.git" branch: "master" commit: "9a505a7" git-subrepo: version: "0.4.6" origin: "git@github.com:ingydotnet/git-subrepo" commit: "110b9eb" --- .../.github/workflows/base-commit-message-checker.yml | 2 +- .../.github/workflows/perl-critic.yml | 2 +- .../.github/workflows/perl-lint-checks.yml | 2 +- .../os-autoinst-common/.github/workflows/yamllint.yml | 4 ++-- external/os-autoinst-common/.gitrepo | 4 ++-- external/os-autoinst-common/Makefile | 10 +++++++++- external/os-autoinst-common/cpanfile | 2 +- external/os-autoinst-common/dependencies.yaml | 2 +- 8 files changed, 18 insertions(+), 10 deletions(-) diff --git a/external/os-autoinst-common/.github/workflows/base-commit-message-checker.yml b/external/os-autoinst-common/.github/workflows/base-commit-message-checker.yml index f83b61a..f93bd0f 100644 --- a/external/os-autoinst-common/.github/workflows/base-commit-message-checker.yml +++ b/external/os-autoinst-common/.github/workflows/base-commit-message-checker.yml @@ -26,7 +26,7 @@ jobs: - name: Check subject line length uses: gsactions/commit-message-checker@v2 with: - pattern: '^.{1,72}(\n|$)' + pattern: '^(Revert "?)?.{1,72}(\n|$)' flags: 'g' error: 'The maximum subject line length of 72 characters is exceeded.' excludeDescription: 'true' diff --git a/external/os-autoinst-common/.github/workflows/perl-critic.yml b/external/os-autoinst-common/.github/workflows/perl-critic.yml index 92cbcfc..840be05 100644 --- a/external/os-autoinst-common/.github/workflows/perl-critic.yml +++ b/external/os-autoinst-common/.github/workflows/perl-critic.yml @@ -11,4 +11,4 @@ jobs: image: perldocker/perl-tester steps: - uses: actions/checkout@v4 - - run: ./tools/perlcritic --quiet . + - run: make test-critic diff --git a/external/os-autoinst-common/.github/workflows/perl-lint-checks.yml b/external/os-autoinst-common/.github/workflows/perl-lint-checks.yml index 1808526..73d4d5e 100644 --- a/external/os-autoinst-common/.github/workflows/perl-lint-checks.yml +++ b/external/os-autoinst-common/.github/workflows/perl-lint-checks.yml @@ -11,4 +11,4 @@ jobs: image: registry.opensuse.org/devel/openqa/containers/os-autoinst_dev steps: - uses: actions/checkout@v4 - - run: GITHUB_ACTIONS=1 ./tools/tidyall --check-only --all --quiet + - run: GITHUB_ACTIONS=1 make test-tidy diff --git a/external/os-autoinst-common/.github/workflows/yamllint.yml b/external/os-autoinst-common/.github/workflows/yamllint.yml index 64d6b94..246cd75 100644 --- a/external/os-autoinst-common/.github/workflows/yamllint.yml +++ b/external/os-autoinst-common/.github/workflows/yamllint.yml @@ -11,5 +11,5 @@ jobs: - uses: actions/checkout@v4 - uses: docker://registry.opensuse.org/home/okurz/container/containers/tumbleweed:yamllint with: - entrypoint: yamllint - args: -c .yamllint --strict ./ --format github + entrypoint: make + args: test-yaml diff --git a/external/os-autoinst-common/.gitrepo b/external/os-autoinst-common/.gitrepo index 39e1cf9..bf21e07 100644 --- a/external/os-autoinst-common/.gitrepo +++ b/external/os-autoinst-common/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/os-autoinst/os-autoinst-common.git branch = master - commit = db78c615c257969eed5d71f3fcf5efe1a09d3b5c - parent = 10683a4777aae56837fd0aaa789666914c5b71df + commit = 9a505a76f9835862211cdf59e07e2a3865320f49 + parent = e21cf1ffbae9a9988a2f814e061d976da596f868 method = merge cmdver = 0.4.6 diff --git a/external/os-autoinst-common/Makefile b/external/os-autoinst-common/Makefile index c22489f..37e0d26 100644 --- a/external/os-autoinst-common/Makefile +++ b/external/os-autoinst-common/Makefile @@ -8,12 +8,20 @@ update-deps: tools/update-deps --cpanfile cpanfile .PHONY: test -test: test-tidy test-author +test: test-tidy test-critic test-yaml test-author .PHONY: test-tidy test-tidy: tools/tidyall --all --check-only +.PHONY: test-critic +test-critic: + tools/perlcritic --quiet . + +.PHONY: test-yaml +test-yaml: + yamllint --strict ./ + .PHONY: test-author test-author: prove -l -r xt/ diff --git a/external/os-autoinst-common/cpanfile b/external/os-autoinst-common/cpanfile index bd53e7e..89e8e5f 100644 --- a/external/os-autoinst-common/cpanfile +++ b/external/os-autoinst-common/cpanfile @@ -17,7 +17,7 @@ on 'develop' => sub { requires 'Code::TidyAll'; requires 'Perl::Critic'; requires 'Perl::Critic::Community'; - requires 'Perl::Tidy', '== 20230912'; + requires 'Perl::Tidy', '== 20240511.0.0'; }; diff --git a/external/os-autoinst-common/dependencies.yaml b/external/os-autoinst-common/dependencies.yaml index 091db9d..190366c 100644 --- a/external/os-autoinst-common/dependencies.yaml +++ b/external/os-autoinst-common/dependencies.yaml @@ -17,7 +17,7 @@ main_requires: perl(Module::CPANfile): develop_requires: - perl(Perl::Tidy): '== 20230912' + perl(Perl::Tidy): '== 20240511.0.0' perl(Code::TidyAll): perl(Perl::Critic): perl(Perl::Critic::Community):