From 9f49eb152bfb7b1e920e2b8d237a052b9ec6b93b Mon Sep 17 00:00:00 2001 From: Mirco Santori Date: Wed, 12 Jun 2024 11:53:43 +0200 Subject: [PATCH] Fix indentation/sorting issues --- .github/workflows/gate.yaml | 4 ++-- .github/workflows/gate_fedora.yml | 7 +++---- CMakeLists.txt | 6 +++--- build_product | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/gate.yaml b/.github/workflows/gate.yaml index 197098c18277..88e377579c2a 100644 --- a/.github/workflows/gate.yaml +++ b/.github/workflows/gate.yaml @@ -157,6 +157,7 @@ jobs: - name: Build run: |- ./build_product \ + al2023 \ alinux2 \ alinux3 \ anolis23 \ @@ -164,14 +165,13 @@ jobs: chromium \ fedora \ firefox \ + ocp4 \ rhcos4 \ rhel7 \ rhel8 \ rhel9 \ rhel10 \ uos20 \ - ocp4 \ - al2023 env: ADDITIONAL_CMAKE_OPTIONS: "-DSSG_OVAL_SCHEMATRON_VALIDATION_ENABLED=OFF" - name: Test diff --git a/.github/workflows/gate_fedora.yml b/.github/workflows/gate_fedora.yml index 085805d6f8ab..fe727f47b7c3 100644 --- a/.github/workflows/gate_fedora.yml +++ b/.github/workflows/gate_fedora.yml @@ -25,6 +25,7 @@ jobs: - name: Build run: |- ./build_product -j2 \ + al2023 \ alinux2 \ alinux3 \ anolis23 \ @@ -35,6 +36,7 @@ jobs: fedora \ firefox \ macos1015 \ + ocp4 \ ol7 \ ol8 \ ol9 \ @@ -46,10 +48,7 @@ jobs: rhel9 \ rhel10 \ rhv4 \ - uos20 \ - ocp4 \ - uos20 \ - al2023 + uos20 env: ADDITIONAL_CMAKE_OPTIONS: "-DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED=ON -DSSG_OVAL_SCHEMATRON_VALIDATION_ENABLED=OFF" - name: Test diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d0d01abefc0..60f206be39f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -371,6 +371,9 @@ add_custom_target(render-policies) ssg_build_man_page() +if(SSG_PRODUCT_AL2023) + add_subdirectory("products/al2023" "al2023") +endif() if(SSG_PRODUCT_ALINUX2) add_subdirectory("products/alinux2" "alinux2") endif() @@ -468,9 +471,6 @@ endif() if(SSG_PRODUCT_UOS20) add_subdirectory("products/uos20" "uos20") endif() -if(SSG_PRODUCT_AL2023) - add_subdirectory("products/al2023" "al2023") -endif() if(SSG_PRODUCT_OPENEMBEDDED) add_subdirectory("products/openembedded" "openembedded") endif() diff --git a/build_product b/build_product index a43fa92ae081..9d6ad89ec018 100755 --- a/build_product +++ b/build_product @@ -345,6 +345,7 @@ set_explict_build_targets() { # Get this using # grep 'option(SSG_PRODUCT' CMakeLists.txt | sed -e 's/option(SSG_PRODUCT_\(\w\+\).*/\1/' all_cmake_products=( + AL2023 ALINUX2 ALINUX3 ANOLIS8 @@ -378,7 +379,6 @@ all_cmake_products=( MACOS1015 OPENEMBEDDED OPENEULER2203 - AL2023 ) DEFAULT_OVAL_MAJOR_VERSION=5