diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml index 90c115cbd5b..a0fdaeb84a7 100644 --- a/.github/workflows/build_packages.yml +++ b/.github/workflows/build_packages.yml @@ -55,8 +55,17 @@ jobs: run: | git fetch --no-tags --prune --depth=2 CHANGED_FILES=$(git diff --name-only HEAD~1 HEAD) - echo "build_deb=$(echo "$CHANGED_FILES" | grep -qE '^install/common/|^install/deb/' && echo true || echo false)" >> $GITHUB_OUTPUT - echo "build_rpm=$(echo "$CHANGED_FILES" | grep -qE '^install/common/|^install/rpm/' && echo true || echo false)" >> $GITHUB_OUTPUT + echo "Changed files: $CHANGED_FILES" + BUILD_DEB="false" + BUILD_RPM="false" + if echo "$CHANGED_FILES" | grep -E '^install/common/|^install/deb/' >/dev/null; then + BUILD_DEB="true" + fi + if echo "$CHANGED_FILES" | grep -E '^install/common/|^install/rpm/' >/dev/null; then + BUILD_RPM="true" + fi + echo "build_deb=$BUILD_DEB" >> $GITHUB_OUTPUT + echo "build_rpm=$BUILD_RPM" >> $GITHUB_OUTPUT - name: Set matrix id: set-matrix @@ -175,25 +184,18 @@ jobs: for deb_package in ${PACKAGE_DIRECTORY}/install/*.deb; do echo $deb_package curl --verbose \ - --user "${{ secrets.REPO_LOGIN }}:${{ secrets.REPO_PASS }}" \ - -H "Content-Type: multipart/form-data" \ - --data-binary "@$deb_package" "${{ secrets.REPO_URL_4TESTING_DEB }}" + --user "${{ secrets.REPO_LOGIN }}:${{ secrets.REPO_PASS }}" \ + -H "Content-Type: multipart/form-data" \ + --data-binary "@$deb_package" "${{ secrets.REPO_URL_4TESTING_DEB }}" done - name: Upload RPM Packages if: matrix.packageType == 'rpm' run: | for rpm_package in ${PACKAGE_DIRECTORY}/install/rpm/SPECS/RPMS/noarch/*.rpm; do - ls -lh "$rpm_package" - file "$rpm_package" - rpm -qip "$rpm_package" || echo "Information about RPM" - curl --verbose \ - --trace curl.log \ --user "${{ secrets.REPO_LOGIN }}:${{ secrets.REPO_PASS }}" \ --upload-file "$rpm_package" "${{ secrets.REPO_URL_4TESTING_RPM }}" - - echo "Logs CURL:" done - name: Checking the DEB package for errors diff --git a/install/rpm/SPECS/SOURCES/product.rpmlintrc b/install/rpm/SPECS/SOURCES/product.rpmlintrc index 5fd9db3900d..845931e3c25 100644 --- 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