From ec97eadc9f8a6c9c3d87e054c0f30bfa0c42a211 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 1 Jul 2025 13:53:41 +0200 Subject: [PATCH] ci: fix yamllint warnings about whitespace Part-of: --- .gitlab-ci/bare-metal/gitlab-ci.yml | 1 - .gitlab-ci/build/gitlab-ci-inc.yml | 1 - .gitlab-ci/build/gitlab-ci.yml | 20 ++++++++++---------- .gitlab-ci/container/debian/gitlab-ci.yml | 1 - .gitlab-ci/container/fedora/gitlab-ci.yml | 1 - .gitlab-ci/container/gitlab-ci-inc.yml | 1 - .gitlab-ci/container/gitlab-ci.yml | 1 - .gitlab-ci/container/windows/gitlab-ci.yml | 1 - .gitlab-ci/lava/gitlab-ci.yml | 8 ++++---- .gitlab-ci/test/gitlab-ci-inc.yml | 1 - .gitlab-ci/test/gitlab-ci.yml | 1 - 11 files changed, 14 insertions(+), 23 deletions(-) diff --git a/.gitlab-ci/bare-metal/gitlab-ci.yml b/.gitlab-ci/bare-metal/gitlab-ci.yml index 891c2a6d46d..eece57c2a78 100644 --- a/.gitlab-ci/bare-metal/gitlab-ci.yml +++ b/.gitlab-ci/bare-metal/gitlab-ci.yml @@ -127,4 +127,3 @@ variables: HWCI_TEST_SCRIPT: "/install/deqp-runner.sh" FDO_CI_CONCURRENT: 0 # Default to number of CPUs - diff --git a/.gitlab-ci/build/gitlab-ci-inc.yml b/.gitlab-ci/build/gitlab-ci-inc.yml index 16b7bbd4257..4e4fc7d12a3 100644 --- a/.gitlab-ci/build/gitlab-ci-inc.yml +++ b/.gitlab-ci/build/gitlab-ci-inc.yml @@ -93,4 +93,3 @@ - _build/meson-logs/*.txt - _build/meson-logs/strace - _build/.ninja_log - diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index 4aa2d58559e..5125b611ed6 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -23,7 +23,7 @@ debian-x86_64: extends: - .meson-build-for-tests - .use-debian/x86_64_build - - .build-run-long # but it really shouldn't! tracked in mesa#12544 + - .build-run-long # but it really shouldn't! tracked in mesa#12544 - .ci-deqp-artifacts variables: UNWIND: "enabled" @@ -45,7 +45,7 @@ debian-x86_64: -D tools=drm-shim -D valgrind=disabled S3_ARTIFACT_NAME: mesa-x86_64-default-${BUILDTYPE} - RUN_MESON_TESTS: "false" # debian-build-x86_64 already runs these + RUN_MESON_TESTS: "false" # debian-build-x86_64 already runs these artifacts: reports: junit: artifacts/ci_scripts_report.xml @@ -70,7 +70,7 @@ debian-x86_64-asan: -D valgrind=disabled S3_ARTIFACT_NAME: mesa-x86_64-asan-${BUILDTYPE} ARTIFACTS_DEBUG_SYMBOLS: 1 - RUN_MESON_TESTS: "false" # just too slow + RUN_MESON_TESTS: "false" # just too slow # Do a host build for mesa-clc (asan complains not being loaded as # the first library) HOST_BUILD_OPTIONS: > @@ -121,7 +121,7 @@ debian-x86_64-msan: -Wno-error=unused-private-field -Wno-error=vla-cxx-extension -Wno-error=deprecated-declarations - RUN_MESON_TESTS: "false" # just too slow + RUN_MESON_TESTS: "false" # just too slow # Do a host build for mesa-clc and precomp-compiler (msan complains about uninitialized # values in the LLVM libs) HOST_BUILD_OPTIONS: > @@ -159,7 +159,7 @@ debian-x86_64-ubsan: -D gallium-va=false S3_ARTIFACT_NAME: "" ARTIFACTS_DEBUG_SYMBOLS: 1 - RUN_MESON_TESTS: "false" # just too slow + RUN_MESON_TESTS: "false" # just too slow HOST_BUILD_OPTIONS: > -D build-tests=false -D enable-glcpp-tests=false @@ -477,7 +477,7 @@ debian-arm32-asan: -D tools=dlclose-skip -D gallium-rusticl=false ARTIFACTS_DEBUG_SYMBOLS: 1 - RUN_MESON_TESTS: "false" # just too slow + RUN_MESON_TESTS: "false" # just too slow S3_ARTIFACT_NAME: mesa-arm32-asan-${BUILDTYPE} debian-arm64: @@ -501,7 +501,7 @@ debian-arm64: -D teflon=true GALLIUM_ST: -D gallium-rusticl=true - RUN_MESON_TESTS: "false" # run by debian-arm64-build-testing + RUN_MESON_TESTS: "false" # run by debian-arm64-build-testing S3_ARTIFACT_NAME: mesa-arm64-default-${BUILDTYPE} debian-arm64-asan: @@ -522,7 +522,7 @@ debian-arm64-asan: -D tools=dlclose-skip -D gallium-rusticl=false ARTIFACTS_DEBUG_SYMBOLS: 1 - RUN_MESON_TESTS: "false" # just too slow + RUN_MESON_TESTS: "false" # just too slow S3_ARTIFACT_NAME: mesa-arm64-asan-${BUILDTYPE} debian-arm64-ubsan: @@ -547,7 +547,7 @@ debian-arm64-ubsan: -D b_sanitize=undefined -D gallium-rusticl=false ARTIFACTS_DEBUG_SYMBOLS: 1 - RUN_MESON_TESTS: "false" # just too slow + RUN_MESON_TESTS: "false" # just too slow S3_ARTIFACT_NAME: mesa-arm64-ubsan-${BUILDTYPE} debian-arm64-build-test: @@ -732,7 +732,7 @@ debian-x86_32: - .meson-cross - .use-debian/x86_32_build - .meson-build-only - - .build-run-long # it's not clear why this runs long, but it also doesn't matter much + - .build-run-long # it's not clear why this runs long, but it also doesn't matter much variables: BUILDTYPE: debug CROSS: i386 diff --git a/.gitlab-ci/container/debian/gitlab-ci.yml b/.gitlab-ci/container/debian/gitlab-ci.yml index 04c5c60ed44..78183911fc3 100644 --- a/.gitlab-ci/container/debian/gitlab-ci.yml +++ b/.gitlab-ci/container/debian/gitlab-ci.yml @@ -575,4 +575,3 @@ debian/baremetal_arm64_test-vk: optional: true - job: debian/baremetal_arm64_test-vk optional: true - diff --git a/.gitlab-ci/container/fedora/gitlab-ci.yml b/.gitlab-ci/container/fedora/gitlab-ci.yml index 5f604ac49b4..f391139fb03 100644 --- a/.gitlab-ci/container/fedora/gitlab-ci.yml +++ b/.gitlab-ci/container/fedora/gitlab-ci.yml @@ -39,4 +39,3 @@ fedora/x86_64_build: optional: true - job: fedora/x86_64_build optional: true - diff --git a/.gitlab-ci/container/gitlab-ci-inc.yml b/.gitlab-ci/container/gitlab-ci-inc.yml index 266a1ef9a31..57576ef72c0 100644 --- a/.gitlab-ci/container/gitlab-ci-inc.yml +++ b/.gitlab-ci/container/gitlab-ci-inc.yml @@ -111,4 +111,3 @@ extends: - .container - .incorporate-base-tag+templates-commit - diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index 79460a465d5..2416728b58c 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -18,4 +18,3 @@ include: - local: '.gitlab-ci/container/gitlab-ci-inc.yml' - local: '.gitlab-ci/container/*/gitlab-ci.yml' - diff --git a/.gitlab-ci/container/windows/gitlab-ci.yml b/.gitlab-ci/container/windows/gitlab-ci.yml index 727a600bd06..4ee6e62b23c 100644 --- a/.gitlab-ci/container/windows/gitlab-ci.yml +++ b/.gitlab-ci/container/windows/gitlab-ci.yml @@ -108,4 +108,3 @@ windows_test_msvc: variables: MESA_IMAGE_PATH: *windows_test_image_path MESA_IMAGE_TAG: *windows_test_image_tag - diff --git a/.gitlab-ci/lava/gitlab-ci.yml b/.gitlab-ci/lava/gitlab-ci.yml index b79da5f1360..2452a6911df 100644 --- a/.gitlab-ci/lava/gitlab-ci.yml +++ b/.gitlab-ci/lava/gitlab-ci.yml @@ -30,9 +30,9 @@ variables: # to a lack of available devices to run the jobs. timeout: 1h variables: - GIT_STRATEGY: none # testing doesn't build anything from source + GIT_STRATEGY: none # testing doesn't build anything from source HWCI_TEST_SCRIPT: ./install/deqp-runner.sh - FDO_CI_CONCURRENT: 6 # should be replaced by per-machine definitions + FDO_CI_CONCURRENT: 6 # should be replaced by per-machine definitions # the dispatchers use this to cache data locally LAVA_HTTP_CACHE_URI: "http://caching-proxy/cache/?uri=" LAVA_ROOTFS_PATH: "${MESA_IMAGE_PATH}:${FDO_DISTRIBUTION_TAG}/lava-rootfs.tar.zst" @@ -90,9 +90,9 @@ variables: - job: debian/x86_64_test-android artifacts: false optional: true - - job: debian-x86_64 # The generic Linux build for the host will be downloaded later + - job: debian-x86_64 # The generic Linux build for the host will be downloaded later artifacts: false - - job: debian-android # The Android build for the guest will be downloaded later and installed via adb + - job: debian-android # The Android build for the guest will be downloaded later and installed via adb artifacts: false .lava-x86_64-test-gl: diff --git a/.gitlab-ci/test/gitlab-ci-inc.yml b/.gitlab-ci/test/gitlab-ci-inc.yml index d6e204d3ffa..f8927dc148e 100644 --- a/.gitlab-ci/test/gitlab-ci-inc.yml +++ b/.gitlab-ci/test/gitlab-ci-inc.yml @@ -191,4 +191,3 @@ - job: yaml-toml-shell-py-test optional: true artifacts: false - diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index d6f770f69c6..da3603325dc 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -106,4 +106,3 @@ yaml-toml-shell-py-test: when: manual tags: - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64 -