From 58893bbe4a579ea6c3a0a6a51d299a9b8a6461a5 Mon Sep 17 00:00:00 2001
From: Vladimir Ischenko <vladimir.ischenko@onlyoffice.com>
Date: Thu, 23 Jan 2025 20:10:16 +0300
Subject: [PATCH] Test refactoring common scripts

---
 .github/workflows/build_packages.yml | 40 ++++++++++++++--------------
 .github/workflows/ci-oci-install.yml |  1 -
 install/deb/debian/po/POTFILES.in    |  2 +-
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml
index 6db5e437c60..99ded66c362 100644
--- a/.github/workflows/build_packages.yml
+++ b/.github/workflows/build_packages.yml
@@ -41,7 +41,7 @@ env:
   PRODUCT_LOW: "docspace"
   BUILD_NUMBER: ${{ github.run_number }}
   PACKAGE_DIRECTORY: "/home/runner/work/${{ github.event.repository.name }}/${{ github.event.repository.name }}"
-  BRANCH_BUILDTOOLS: 'feature/fix-common-scripts'
+  BRANCH_BUILDTOOLS: 'develop'
   BRANCH_CLIENT: 'develop'
   BRANCH_SERVER: 'develop'
 
@@ -76,8 +76,8 @@ jobs:
           if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
             [[ "${{ github.event.inputs.deb_build }}" == "true" ]] && package_types+=("deb")
             [[ "${{ github.event.inputs.rpm_build }}" == "true" ]] && package_types+=("rpm")
-          # elif [[ "${{ steps.changes.outputs.build_all }}" == "true" ]]; then
-          #     package_types+=("deb" "rpm")
+           elif [[ "${{ steps.changes.outputs.build_all }}" == "true" ]]; then
+               package_types+=("deb" "rpm")
           else
             [[ "${{ github.event.inputs.deb_build }}" == "true" ]] && package_types+=("deb")
             [[ "${{ github.event.inputs.rpm_build }}" == "true" ]] && package_types+=("rpm")
@@ -209,23 +209,23 @@ jobs:
               && echo "Success: $(basename "$rpm_package") uploaded." || echo "Error: Failed to upload $(basename "$rpm_package")"
           done
 
-      - name: Checking the DEB package for errors
-        if: matrix.packageType == 'deb'
-        run: |
-          lintian --profile debian ${PACKAGE_DIRECTORY}/install/*.deb | tee -a LINTIAN
-          if grep -qE '^(W:|E:)' LINTIAN; then
-            echo "::warning Noticedeb=lintian::$(cat LINTIAN | awk '/^W:/ { ws += 1 } /^E:/ { es += 1 } END { print "Warnings:", ws, "Errors:", es }')"
-          fi
-
-      - name: Checking the RPM package for errors
-        if: matrix.packageType == 'rpm'
-        run: |
-          for rpm_package in ${PACKAGE_DIRECTORY}/install/rpm/SPECS/RPMS/noarch/*.rpm; do
-            rpmlint --ignore-unused-rpmlintrc --rpmlintrc ${PACKAGE_DIRECTORY}/install/rpm/SPECS/SOURCES/${PRODUCT_LOW}.rpmlintrc $rpm_package | tee -a RPM_LINT
-          done
-          if grep -qE '(W:|E:)' RPM_LINT; then
-            echo "::warning Noticerpm=rpmlint::$(cat RPM_LINT | awk '/W:/ { ws += 1 } /E:/ { es += 1 } END { print "Warnings:", ws, "Errors:", es }')"
-          fi
+      # - name: Checking the DEB package for errors
+      #   if: matrix.packageType == 'deb'
+      #   run: |
+      #     lintian --profile debian ${PACKAGE_DIRECTORY}/install/*.deb | tee -a LINTIAN
+      #     if grep -qE '^(W:|E:)' LINTIAN; then
+      #       echo "::warning Noticedeb=lintian::$(cat LINTIAN | awk '/^W:/ { ws += 1 } /^E:/ { es += 1 } END { print "Warnings:", ws, "Errors:", es }')"
+      #     fi
+
+      # - name: Checking the RPM package for errors
+      #   if: matrix.packageType == 'rpm'
+      #   run: |
+      #     for rpm_package in ${PACKAGE_DIRECTORY}/install/rpm/SPECS/RPMS/noarch/*.rpm; do
+      #       rpmlint --ignore-unused-rpmlintrc --rpmlintrc ${PACKAGE_DIRECTORY}/install/rpm/SPECS/SOURCES/${PRODUCT_LOW}.rpmlintrc $rpm_package | tee -a RPM_LINT
+      #     done
+      #     if grep -qE '(W:|E:)' RPM_LINT; then
+      #       echo "::warning Noticerpm=rpmlint::$(cat RPM_LINT | awk '/W:/ { ws += 1 } /E:/ { es += 1 } END { print "Warnings:", ws, "Errors:", es }')"
+      #     fi
       
   trigger_oci:
     name: Trigger ci-oci-install Workflow
diff --git a/.github/workflows/ci-oci-install.yml b/.github/workflows/ci-oci-install.yml
index cef6bd0aa04..0714e4e65af 100644
--- a/.github/workflows/ci-oci-install.yml
+++ b/.github/workflows/ci-oci-install.yml
@@ -73,7 +73,6 @@ jobs:
         run: |
           matrix=$(echo '{
             "include": [
-              {"execute": '${{ github.event.inputs.centos9s || true }}', "name": "CentOS9S", "os": "centos9s", "distr": "generic"},
               {"execute": '${{ github.event.inputs.ubuntu2404 || true }}', "name": "Ubuntu24.04", "os": "ubuntu-24.04", "distr": "bento"},
               {"execute": '${{ github.event.inputs.fedora41 || true }}', "name": "Fedora41", "os": "41-cloud-base", "distr": "fedora"}
             ]
diff --git a/install/deb/debian/po/POTFILES.in b/install/deb/debian/po/POTFILES.in
index a77f1a0e4d1..ffbd7f11ada 100644
--- a/install/deb/debian/po/POTFILES.in
+++ b/install/deb/debian/po/POTFILES.in
@@ -1,3 +1,3 @@
-## List of source files containing translatable strings.
+# List of source files containing translatable strings.
 
 [type: gettext/rfc822deb] {{product}}.templates