From 892dfb0dcbda7bd0182e83ca10d495d1fd46bd49 Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Fri, 13 Sep 2024 12:49:36 +0200 Subject: [PATCH 1/2] CI: More silence in [sanity_ci] --- .gitlab/ci/pipelines/before_merging.yml | 4 ++-- .gitlab/ci/pipelines/merge_train.yml | 4 ++-- .gitlab/ci/pipelines/schedule_extended_test.yml | 4 ++-- ci/bin/code_verification.ml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index 8974e4a7b6fb..1e9f70690c8a 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -147,10 +147,10 @@ sanity_ci: - ./scripts/ci/take_ownership.sh - eval $(opam env) script: - - make -C manifest check + - make --silent -C manifest check - ./scripts/lint.sh --check-gitlab-ci-yml - ./scripts/ci/check_alpine_version.sh - - make -C ci check + - make --silent -C ci check docker:hadolint: image: hadolint/hadolint:2.9.3-debian diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml index 6c2379b7c47f..d83a4473fa7d 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -147,10 +147,10 @@ sanity_ci: - ./scripts/ci/take_ownership.sh - eval $(opam env) script: - - make -C manifest check + - make --silent -C manifest check - ./scripts/lint.sh --check-gitlab-ci-yml - ./scripts/ci/check_alpine_version.sh - - make -C ci check + - make --silent -C ci check docker:hadolint: image: hadolint/hadolint:2.9.3-debian diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index f2b75590a2e7..eb8eaa028527 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -124,10 +124,10 @@ sanity_ci: - ./scripts/ci/take_ownership.sh - eval $(opam env) script: - - make -C manifest check + - make --silent -C manifest check - ./scripts/lint.sh --check-gitlab-ci-yml - ./scripts/ci/check_alpine_version.sh - - make -C ci check + - make --silent -C ci check docker:hadolint: image: hadolint/hadolint:2.9.3-debian diff --git a/ci/bin/code_verification.ml b/ci/bin/code_verification.ml index 1f8220db541f..99f645da9f42 100644 --- a/ci/bin/code_verification.ml +++ b/ci/bin/code_verification.ml @@ -322,13 +322,13 @@ let jobs pipeline_type = ~dependencies ~before_script:(before_script ~take_ownership:true ~eval_opam:true []) [ - "make -C manifest check"; + "make --silent -C manifest check"; "./scripts/lint.sh --check-gitlab-ci-yml"; (* Check that the opam-repo images' Alpine version corresponds to the value in scripts/version.sh. *) "./scripts/ci/check_alpine_version.sh"; (* Check that .gitlab-ci.yml is up to date. *) - "make -C ci check"; + "make --silent -C ci check"; ] in let job_nix : tezos_job = -- GitLab From 1e846dc88b1d07c10f33e86b74c89452157f15cd Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Fri, 13 Sep 2024 12:51:21 +0200 Subject: [PATCH 2/2] [scripts/lint.sh]: remove gitlab ci yaml deprecated by CIAO CIAO forbids the type of errors checked by this lint. --- .gitlab/ci/pipelines/before_merging.yml | 1 - .gitlab/ci/pipelines/merge_train.yml | 1 - .../ci/pipelines/schedule_extended_test.yml | 1 - ci/bin/code_verification.ml | 1 - scripts/lint.sh | 26 ------------------- 5 files changed, 30 deletions(-) diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index 1e9f70690c8a..6ae916fbc483 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -148,7 +148,6 @@ sanity_ci: - eval $(opam env) script: - make --silent -C manifest check - - ./scripts/lint.sh --check-gitlab-ci-yml - ./scripts/ci/check_alpine_version.sh - make --silent -C ci check diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml index d83a4473fa7d..055168f67853 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -148,7 +148,6 @@ sanity_ci: - eval $(opam env) script: - make --silent -C manifest check - - ./scripts/lint.sh --check-gitlab-ci-yml - ./scripts/ci/check_alpine_version.sh - make --silent -C ci check diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index eb8eaa028527..9d4b0c7749e8 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -125,7 +125,6 @@ sanity_ci: - eval $(opam env) script: - make --silent -C manifest check - - ./scripts/lint.sh --check-gitlab-ci-yml - ./scripts/ci/check_alpine_version.sh - make --silent -C ci check diff --git a/ci/bin/code_verification.ml b/ci/bin/code_verification.ml index 99f645da9f42..bd01af338141 100644 --- a/ci/bin/code_verification.ml +++ b/ci/bin/code_verification.ml @@ -323,7 +323,6 @@ let jobs pipeline_type = ~before_script:(before_script ~take_ownership:true ~eval_opam:true []) [ "make --silent -C manifest check"; - "./scripts/lint.sh --check-gitlab-ci-yml"; (* Check that the opam-repo images' Alpine version corresponds to the value in scripts/version.sh. *) "./scripts/ci/check_alpine_version.sh"; diff --git a/scripts/lint.sh b/scripts/lint.sh index 553fbfb2b19c..4e4ef2e0ba67 100755 --- a/scripts/lint.sh +++ b/scripts/lint.sh @@ -10,7 +10,6 @@ Where can be: git-commit (requires clean repo). * --check-ocamlformat: check that --update-ocamlformat does nothing. * --format-scripts: format shell scripts inplace using shfmt -* --check-gitlab-ci-yml: check .gitlab-ci.yml has been updated. * --check-scripts: shellcheck and check formatting of the .sh files * --check-redirects: check docs/_build/_redirects. * --check-coq-attributes: check the presence of coq attributes. @@ -197,28 +196,6 @@ check_rust_toolchain_files() { done } -check_gitlab_ci_yml() { - # Check that a rule is not defined twice, which would result in the first - # one being ignored. Gitlab linter doesn't warn for it. - find .gitlab-ci.yml .gitlab/ci/ -iname \*.yml | - while read -r filename; do - repeated=$(grep '^[^ #-]' "$filename" | - sort | - grep -v include | - uniq --repeated) - if [ -n "$repeated" ]; then - echo "$filename contains repeated rules:" - echo "$repeated" - touch /tmp/repeated - fi - done - - if [ -f /tmp/repeated ]; then - rm /tmp/repeated - exit 1 - fi -} - check_licenses_git_new() { if [ -z "${CHECK_LICENSES_DIFF_BASE:-}" ]; then echo 'Action --check-licenses-git-new requires that CHECK_LICENSES_DIFF_BASE is set in the environment.' @@ -302,9 +279,6 @@ case "$action" in action=update_all_dot_ocamlformats check_clean=true ;; -"--check-gitlab-ci-yml") - action=check_gitlab_ci_yml - ;; "--check-scripts") action=check_scripts ;; -- GitLab