From 3ecd58460fcd2d043ac8a6c058c3b4e810431ad0 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Wed, 16 Apr 2025 07:34:57 -0400 Subject: [PATCH] Internals: Apply make format-json format-yaml. No functional change. --- .github/workflows/build.yml | 48 ++++++++++++++--------------- .github/workflows/reusable-test.yml | 1 - CMakeLists.txt | 5 +-- Makefile.in | 2 ++ verilator-config.cmake.in | 20 ++++++------ 5 files changed, 37 insertions(+), 39 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ec771199..d90bc3241 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,8 +27,8 @@ jobs: name: Build uses: ./.github/workflows/reusable-build.yml with: - os: ${{ matrix.os }} - cc: ${{ matrix.cc }} + os: ${{ matrix.os }} + cc: ${{ matrix.cc }} strategy: fail-fast: false matrix: @@ -39,8 +39,8 @@ jobs: name: Build uses: ./.github/workflows/reusable-build.yml with: - os: ${{ matrix.os }} - cc: ${{ matrix.cc }} + os: ${{ matrix.os }} + cc: ${{ matrix.cc }} strategy: fail-fast: false matrix: @@ -51,8 +51,8 @@ jobs: name: Build uses: ./.github/workflows/reusable-build.yml with: - os: ${{ matrix.os }} - cc: ${{ matrix.cc }} + os: ${{ matrix.os }} + cc: ${{ matrix.cc }} strategy: fail-fast: false matrix: @@ -63,8 +63,8 @@ jobs: name: Build uses: ./.github/workflows/reusable-build.yml with: - os: ${{ matrix.os }} - cc: ${{ matrix.cc }} + os: ${{ matrix.os }} + cc: ${{ matrix.cc }} strategy: fail-fast: false matrix: @@ -76,10 +76,10 @@ jobs: needs: build-2404-gcc uses: ./.github/workflows/reusable-test.yml with: - os: ${{ matrix.os }} - cc: ${{ matrix.cc }} - reloc: ${{ matrix.reloc }} - suite: ${{ matrix.suite }} + os: ${{ matrix.os }} + cc: ${{ matrix.cc }} + reloc: ${{ matrix.reloc }} + suite: ${{ matrix.suite }} strategy: fail-fast: false matrix: @@ -98,10 +98,10 @@ jobs: needs: build-2404-clang uses: ./.github/workflows/reusable-test.yml with: - os: ${{ matrix.os }} - cc: ${{ matrix.cc }} - reloc: ${{ matrix.reloc }} - suite: ${{ matrix.suite }} + os: ${{ matrix.os }} + cc: ${{ matrix.cc }} + reloc: ${{ matrix.reloc }} + suite: ${{ matrix.suite }} strategy: fail-fast: false matrix: @@ -120,10 +120,10 @@ jobs: needs: build-2204-gcc uses: ./.github/workflows/reusable-test.yml with: - os: ${{ matrix.os }} - cc: ${{ matrix.cc }} - reloc: ${{ matrix.reloc }} - suite: ${{ matrix.suite }} + os: ${{ matrix.os }} + cc: ${{ matrix.cc }} + reloc: ${{ matrix.reloc }} + suite: ${{ matrix.suite }} strategy: fail-fast: false matrix: @@ -142,10 +142,10 @@ jobs: needs: build-2204-clang uses: ./.github/workflows/reusable-test.yml with: - os: ${{ matrix.os }} - cc: ${{ matrix.cc }} - reloc: ${{ matrix.reloc }} - suite: ${{ matrix.suite }} + os: ${{ matrix.os }} + cc: ${{ matrix.cc }} + reloc: ${{ matrix.reloc }} + suite: ${{ matrix.suite }} strategy: fail-fast: false matrix: diff --git a/.github/workflows/reusable-test.yml b/.github/workflows/reusable-test.yml index 500afc6b6..5bc3fd650 100644 --- a/.github/workflows/reusable-test.yml +++ b/.github/workflows/reusable-test.yml @@ -21,7 +21,6 @@ on: required: true type: string - env: CI_OS_NAME: linux CI_COMMIT: ${{ github.sha }} diff --git a/CMakeLists.txt b/CMakeLists.txt index cb73076f8..7516251d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,10 +134,7 @@ configure_package_config_file( INSTALL_DESTINATION . ) -install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/verilator-config.cmake - DESTINATION . -) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/verilator-config.cmake DESTINATION .) configure_package_config_file( verilator-config-version.cmake.in diff --git a/Makefile.in b/Makefile.in index 784054b5a..5db547897 100644 --- a/Makefile.in +++ b/Makefile.in @@ -528,6 +528,8 @@ GERSEMI_FLAGS = -i format-cmake: $(GERSEMI) $(GERSEMI_FLAGS) $(CMAKE_FILES) +format-yaml: yamlfix + PYLINT = pylint PYLINT_FLAGS = --recursive=n --score=n --disable=R0801 PYLINT_TEST_FLAGS = $(PYLINT_FLAGS) --disable=C0103,C0114,C0116,C0209,C0411,C0413,C0301,R0801,R0912,R0915,R0916,R1702,W0511,W0621 diff --git a/verilator-config.cmake.in b/verilator-config.cmake.in index 1a4247863..e5babed69 100644 --- a/verilator-config.cmake.in +++ b/verilator-config.cmake.in @@ -165,7 +165,7 @@ define_property( function(json_get_string RET JSON SECTION VARIABLE) string(JSON JV ERROR_VARIABLE STATUS GET "${JSON}" ${SECTION} ${VARIABLE}) - if (NOT ${STATUS} STREQUAL "NOTFOUND") + if(NOT ${STATUS} STREQUAL "NOTFOUND") set(JV "") endif() set(${RET} ${JV} PARENT_SCOPE) @@ -188,7 +188,7 @@ endfunction() function(json_get_submodules SUBMODULES NSUBMODULES JSON) string(JSON JV ERROR_VARIABLE STATUS GET "${JSON}" submodules) - if (NOT ${STATUS} STREQUAL "NOTFOUND") + if(NOT ${STATUS} STREQUAL "NOTFOUND") set(${SUBMODULES} "" PARENT_SCOPE) set(${NSUBMODULES} 0 PARENT_SCOPE) return() @@ -205,7 +205,7 @@ endfunction() function(json_get_list RET JSON SECTION VARIABLE) string(JSON L ERROR_VARIABLE STATUS LENGTH "${JSON}" ${SECTION} ${VARIABLE}) - if (NOT ${STATUS} STREQUAL "NOTFOUND" OR NOT ${L}) + if(NOT ${STATUS} STREQUAL "NOTFOUND" OR NOT ${L}) set(${RET} "" PARENT_SCOPE) return() endif() @@ -233,8 +233,8 @@ function(verilate TARGET) ${ARGN} ) - if (VERILATE_TRACE) - if (NOT VERILATE_TRACE_VCD) + if(VERILATE_TRACE) + if(NOT VERILATE_TRACE_VCD) set(VERILATE_TRACE_VCD TRUE) endif() message(DEPRECATION "The `TRACE` argument is deprecated. Please use `TRACE_VCD` instead.") @@ -495,7 +495,7 @@ function(verilate TARGET) json_get_submodules(JSUBMODULES JNSUBMODULES "${MANIFEST}") - if (JNSUBMODULES) + if(JNSUBMODULES) file(APPEND ${VDIR}/${VERILATE_PREFIX}.cmake "# Verilate hierarchical blocks\n" "get_target_property(TOP_TARGET_NAME \"\${TARGET}\" NAME)\n" @@ -513,13 +513,13 @@ function(verilate TARGET) set(SUBMODULE_CMAKE "") set(SUBMODULE_VERILATE_ARGS "") - if (NOT ${I} STREQUAL ${JNSUBMODULES}) + if(NOT ${I} STREQUAL ${JNSUBMODULES}) string(APPEND SUBMODULE_CMAKE "add_library(${JSUBMODULE_PREFIX} STATIC)\n" "target_link_libraries(\${TOP_TARGET_NAME} PRIVATE ${JSUBMODULE_PREFIX})\n" ) - if (JSUBMODULE_DEPS) + if(JSUBMODULE_DEPS) string(APPEND SUBMODULE_CMAKE "target_link_libraries(${JSUBMODULE_PREFIX} INTERFACE ${JSUBMODULE_DEPS})\n") endif() @@ -529,11 +529,11 @@ function(verilate TARGET) string(APPEND SUBMODULE_VERILATE_ARGS "\${TOP_TARGET_NAME} PREFIX ${JSUBMODULE_PREFIX} TOP_MODULE ${JSUBMODULE_TOP} DIRECTORY ${JSUBMODULE_DIRECTORY} SOURCES ${JSUBMODULE_SOURCES}") endif() - if (JSUBMODILE_VERILATOR_ARGS) + if(JSUBMODILE_VERILATOR_ARGS) string(APPEND SUBMODULE_VERILATE_ARGS " VERILATOR_ARGS -f ${JSUBMODILE_VERILATOR_ARGS}") endif() - if (JSUBMODULE_CFLAGS) + if(JSUBMODULE_CFLAGS) string(APPEND SUBMODULE_VERILATE_ARGS " -CFLAGS ${JSUBMODULE_CFLAGS}") endif()