diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml index ba5faa6866..f4c4ddea02 100644 --- a/.github/workflows/build_packages.yml +++ b/.github/workflows/build_packages.yml @@ -6,8 +6,11 @@ on: - 'release/**' - 'hotfix/**' - 'develop' - #- 'feature/update-opensearch' + - 'feature/update-opensearch' paths: + - 'install/common/**' + - 'install/deb/**' + - 'install/rpm/**' - '.github/workflows/build_packages.yml' workflow_dispatch: inputs: @@ -59,7 +62,8 @@ jobs: - name: Determine changed id: changes run: | - echo "build_all=$(git diff --name-only HEAD~1 HEAD | grep -qE 'build_packages.yml' && echo true)" >> $GITHUB_OUTPUT + 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 run: | diff --git a/.github/workflows/ci-oci-docker-install.yml b/.github/workflows/ci-oci-docker-install.yml index 2e19f96e34..ccf67d92e6 100644 --- a/.github/workflows/ci-oci-docker-install.yml +++ b/.github/workflows/ci-oci-docker-install.yml @@ -14,7 +14,7 @@ on: - 'feature/update-opensearch' paths: - 'install/OneClickInstall/install-Docker.sh' - - 'install/docker/*.yml' + - 'install/docker/*' workflow_dispatch: inputs: offline: diff --git a/install/common/product-configuration b/install/common/product-configuration index fffa02e925..b404c4bb9d 100644 --- 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}" diff --git a/install/docker/.env b/install/docker/.env index 942432e20a..1bbaf68d35 100644 --- a/install/docker/.env +++ b/install/docker/.env @@ -14,7 +14,7 @@ UID="root" GID="root" -# images version ## +# images version # DOCKER_TAG=latest MYSQL_VERSION=8.3.0 PROXY_VERSION=latest