Test update OpenSearch to 2.18

ONLYOFFICE · Dec 25, 2024 · b805404 · b805404
1 parent 37c35a1
commit b805404
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml
@@ -44,9 +44,9 @@ 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/update-opensearch'
-  BRANCH_CLIENT: 'feature/update-opensearch'
-  BRANCH_SERVER: 'feature/update-opensearch'
+  BRANCH_BUILDTOOLS: ${{ github.event.inputs.branch-buildtools != '' && github.event.inputs.branch-buildtools || 'develop' }}
+  BRANCH_CLIENT: ${{ github.event.inputs.branch-client != '' && github.event.inputs.branch-client || 'develop' }}
+  BRANCH_SERVER: ${{ github.event.inputs.branch-server != '' && github.event.inputs.branch-server || 'develop' }}
 
 jobs:
   prepare:
@@ -62,7 +62,8 @@ jobs:
       - name: Determine changed
         id: changes
         run: |
-          CHANGED_FILES=$(git diff --name-only HEAD~1 HEAD)
+          git fetch --no-tags --prune --depth=2
+          CHANGED_FILES=$(git diff --name-only HEAD~1 HEAD)     
           echo "build_all=$(echo "$CHANGED_FILES" | grep -qE '^.github/workflows/build_packages.yml' && echo true || echo false)" >> $GITHUB_OUTPUT       
       - name: Set matrix
         id: set-matrix

diff --git a/install/common/product-configuration b/install/common/product-configuration
@@ -560,7 +560,7 @@ setup_openresty(){
 	echo "OK"
 }
 
-## Function gets Document server host and port using regular expression, we need it to check connection
+# Function gets Document server host and port using regular expression, we need it to check connection
 parse_external_docs_url () {
 	if [[ $DOCUMENT_SERVER_URL_EXTERNAL =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$ ]]; then 
 		DOCUMENT_SERVER_PORT="${BASH_REMATCH[4]:-80}"