Fix indentation/sorting issues

ComplianceAsCode · Jun 13, 2024 · 9f49eb1 · 9f49eb1
1 parent 9eeaf6b
commit 9f49eb1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/gate.yaml b/.github/workflows/gate.yaml
@@ -157,21 +157,21 @@ jobs:
       -   name: Build
           run: |-
             ./build_product \
+                al2023 \
                 alinux2 \
                 alinux3 \
                 anolis23 \
                 anolis8 \
                 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
@@ -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
@@ -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
@@ -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