Test action OCI

ONLYOFFICE · Dec 8, 2024 · 7e0ab8d · 7e0ab8d
1 parent 57f955e
commit 7e0ab8d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 43 deletions.
diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml
@@ -46,8 +46,8 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
       # deb_built: ${{ steps.changes.outputs.build_deb }}
       # rpm_built: ${{ steps.changes.outputs.build_rpm }}
-      deb_built: "false" # test
-      rpm_built: "true" # test
+      deb_built: "true" # test
+      rpm_built: "false" # test
     steps:
       - name: Mock preparation
         run: echo "Preparation step complete."

diff --git a/.github/workflows/ci-oci-install.yml b/.github/workflows/ci-oci-install.yml
@@ -75,7 +75,6 @@ jobs:
           echo "debian_changed=$(echo "$CHANGED_FILES" | grep -q 'install-Debian' && echo true || echo false)" >> $GITHUB_ENV
           echo "redhat_changed=$(echo "$CHANGED_FILES" | grep -q 'install-RedHat' && echo true || echo false)" >> $GITHUB_ENV           
 
-
       - name: Set matrix names
         id: set-matrix
         run: |
@@ -86,7 +85,7 @@ jobs:
               ]
             }')
         
-            matrix=$(jq -c --argjson debuilt "${{ github.event.inputs.deb_built || false }}" --argjson rpmbuilt "${{ github.event.inputs.rpm_built || false }}" '
+            matrix=$(echo "$matrix" | jq -c --argjson debuilt "${{ github.event.inputs.deb_built || false }}" --argjson rpmbuilt "${{ github.event.inputs.rpm_built || false }}" '
               { include: [ .include[]
                 | select(
                     ($debuilt and (.name | test("Debian|Ubuntu"))) or
@@ -107,44 +106,6 @@ jobs:
         
             echo "matrix=$matrix" >> $GITHUB_OUTPUT
 
-
-      # - name: Set matrix names
-      #   id: set-matrix
-      #   run: |
-      #     deb_machines=$(jq -n --argjson debian12 true \
-      #                         --argjson ubuntu2204 true \
-      #                         '{include: [
-      #                             {"name":"Debian12","os":"debian12","distr":"generic","execute":$debian12}
-      #                         ]}')
-      #     rpm_machines=$(jq -n --argjson centos9s true \
-      #                         --argjson fedora40 true \
-      #                         '{include: [
-      #                             {"name":"CentOS9S","os":"centos9s","distr":"generic","execute":$centos9s}
-      #                         ]}')
-
-      #     if [ "${{ github.event.inputs.deb_built }}" = "true" ] && [ "${{ github.event.inputs.rpm_built }}" = "true" ]; then
-      #       combined=$(jq -c -s '{"include": (.[0].include + .[1].include)}' <(echo "$deb_machines") <(echo "$rpm_machines"))
-      #     elif [ "${{ github.event.inputs.deb_built }}" = "true" ]; then
-      #       combined=$deb_machines
-      #     elif [ "${{ github.event.inputs.rpm_built }}" = "true" ]; then
-      #       combined=$rpm_machines
-      #     else
-      #       combined='{"include":[]}'
-      #     fi
-
-      #     if [ "$GITHUB_EVENT_NAME" = "pull_request" ]; then
-      #       combined=$(echo "$combined" | jq -c --arg REDHAT_CHANGED "${{ env.redhat_changed }}" --arg DEBIAN_CHANGED "${{ env.debian_changed }}" '
-      #         { include: [ .include[]
-      #           | select(
-      #               ($REDHAT_CHANGED == $DEBIAN_CHANGED and .execute == true) or
-      #               ($REDHAT_CHANGED == "true" and (.name | test("CentOS|Fedora"))) or
-      #               ($DEBIAN_CHANGED == "true" and (.name | test("Debian|Ubuntu")))
-      #             )
-      #         ] }')
-      #     fi
-
-      #     echo "matrix=$(echo "$combined" | jq -c)" >> $GITHUB_OUTPUT
-
   vagrant-up:
     name: "Test DocSpace with ${{ matrix.name}}"
     runs-on: ubuntu-24.04

diff --git a/install/rpm/SPECS/SOURCES/product.rpmlintrc b/install/rpm/SPECS/SOURCES/product.rpmlintrc
@@ -1,4 +1,4 @@
-# Ignoring node_modules errors due to lack of ability to influence them
+## Ignoring node_modules errors due to lack of ability to influence them
 addFilter(r'node_modules')
 
 # Packages use a non-standard user and group for our project directories, but the user and group are created in %pre common