This is an automated email from the ASF dual-hosted git repository. github-merge-queue[bot] pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/texera.git
commit ce23c01d8ed1ee373116ff58e8d2a2f322e23549 Author: Yicong Huang <[email protected]> AuthorDate: Sun Jun 28 11:50:39 2026 -0700 chore: delete per-service shell wrappers (#5973) ### What changes were proposed in this PR? Tier-2 follow-up to **#5971** (which deletes `deploy-daemon.sh` / `deploy-docker.sh` / `build.sh` / `frontend-dev.sh`). With those gone, the per-service shell wrappers they called into are orphans — each is a single-line invocation of the `target/<svc>-*/bin/<svc>` dist launcher that `bin/local-dev.sh` or each service's Dockerfile already runs directly. Delete: | File | What it did | Why dead | |---|---|---| | `bin/server.sh` | `(cd amber && target/texera-*/bin/texera-web-application)` | **Already broken** — dist is `amber-*` now, not `texera-*`. Only callers were the deleted deploy scripts. | | `bin/config-service.sh` | `target/config-service-*/bin/config-service` | One-liner; only caller was `deploy-daemon.sh`. | | `bin/file-service.sh` | same shape | same. | | `bin/computing-unit-managing-service.sh` | same shape | same. | | `bin/workflow-compiling-service.sh` | same shape | same. | | `bin/workflow-computing-unit.sh` | `target/texera-*/bin/computing-unit-master` | **Already broken** (`texera-*` vs `amber-*`); only deploy-script callers. | | `bin/shared-editing-server.sh` | `(cd frontend && npx y-websocket)` | `yarn start` already runs `concurrently --kill-others "npx y-websocket" "ng serve"`. | | `bin/frontend.sh` | `(cd frontend && yarn install && yarn run build)` | Prod build wrapper; only caller was the deleted `build.sh`. | | `bin/python-language-service.sh` | pyright / pylsp launcher | Never referenced — pylsp ships via `bin/pylsp/Dockerfile`'s `ENTRYPOINT ["…","run_pylsp.sh"]`. | | `bin/build-services.sh` | `sbt clean dist` + unzip each service's zip | **Already broken** — `unzip amber/target/universal/texera-*.zip` won't match (now `amber-*`); only callers were `deploy-daemon.sh` + `build.sh` (both in #5971). | Plus a one-line touch to `bin/README.md` to drop the prose mention of `build-services.sh`. `bin/build-images.sh` and `bin/pylsp/run_pylsp.sh` stay — both still have active callers (README and `bin/pylsp/Dockerfile` respectively). ### Any related issues, documentation, discussions? Closes #5972. **Depends on #5971** — the remaining references to these wrappers all live in `deploy-daemon.sh` / `deploy-docker.sh` / `build.sh`, which #5971 removes. Land in that order. ### How was this PR tested? Static — only deletions and a one-line README edit. Confirmed: * `grep -rln` over `*.sh / *.md / *.yml / *.yaml / *.scala / *.py / *.dockerfile / Dockerfile*` returns nothing outside the deleted files themselves once #5971's deletions are applied; * No Dockerfile invokes any of them (per-service Dockerfiles use the dist launcher directly via `CMD ["bin/<service>"]`); * `bin/k8s/**` doesn't reference them; * `bin/local-dev.sh` doesn't shell out to them. ### Was this PR authored or co-authored using generative AI tooling? Generated-by: Claude Code (Anthropic, Claude Opus 4.7). Co-authored-by: Claude Opus 4.7 (1M context) <[email protected]> --- bin/README.md | 2 +- bin/build-services.sh | 32 ------------- bin/computing-unit-managing-service.sh | 18 -------- bin/config-service.sh | 18 -------- bin/file-service.sh | 18 -------- bin/frontend.sh | 18 -------- bin/python-language-service.sh | 84 ---------------------------------- bin/server.sh | 18 -------- bin/shared-editing-server.sh | 18 -------- bin/workflow-compiling-service.sh | 18 -------- bin/workflow-computing-unit.sh | 26 ----------- 11 files changed, 1 insertion(+), 269 deletions(-) diff --git a/bin/README.md b/bin/README.md index 3b13961296..847e47512b 100644 --- a/bin/README.md +++ b/bin/README.md @@ -12,7 +12,7 @@ For example, to build the image using `texera-web-application.dockerfile`, run t docker build -f bin/texera-web-application.dockerfile -t your-repo/texera-web-application:test . ``` -Two shell scripts, `build-images.sh` and `build-services.sh` are included for building platform-dependent images conveniently. +`build-images.sh` is included for building platform-dependent images conveniently. You can also find prebuilt images published by the Texera team on the [Texera DockerHub Repository](https://hub.docker.com/repositories/texera). diff --git a/bin/build-services.sh b/bin/build-services.sh deleted file mode 100755 index a28e7e2cb0..0000000000 --- a/bin/build-services.sh +++ /dev/null @@ -1,32 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -sbt clean dist -unzip workflow-compiling-service/target/universal/workflow-compiling-service-*.zip -d target/ -rm workflow-compiling-service/target/universal/workflow-compiling-service-*.zip - -unzip file-service/target/universal/file-service-*.zip -d target/ -rm file-service/target/universal/file-service-*.zip - -unzip config-service/target/universal/config-service-*.zip -d target/ -rm config-service/target/universal/config-service-*.zip - -unzip computing-unit-managing-service/target/universal/computing-unit-managing-service-*.zip -d target/ -rm computing-unit-managing-service/target/universal/computing-unit-managing-service-*.zip - -unzip amber/target/universal/texera-*.zip -d amber/target/ -rm amber/target/universal/texera-*.zip diff --git a/bin/computing-unit-managing-service.sh b/bin/computing-unit-managing-service.sh deleted file mode 100755 index 3b0b31a8b5..0000000000 --- a/bin/computing-unit-managing-service.sh +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -target/computing-unit-managing-service-*/bin/computing-unit-managing-service \ No newline at end of file diff --git a/bin/config-service.sh b/bin/config-service.sh deleted file mode 100755 index 4341c7849a..0000000000 --- a/bin/config-service.sh +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -target/config-service-*/bin/config-service \ No newline at end of file diff --git a/bin/file-service.sh b/bin/file-service.sh deleted file mode 100755 index 6cba7c35ee..0000000000 --- a/bin/file-service.sh +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -target/file-service-*/bin/file-service \ No newline at end of file diff --git a/bin/frontend.sh b/bin/frontend.sh deleted file mode 100755 index 65b15e19e8..0000000000 --- a/bin/frontend.sh +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -(cd frontend && yarn install && yarn run build) diff --git a/bin/python-language-service.sh b/bin/python-language-service.sh deleted file mode 100755 index 253af37402..0000000000 --- a/bin/python-language-service.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - - -set -e - -DEFAULT_PROVIDER="pylsp" -DEFAULT_PORT=3000 - -PROVIDER="" -PORT="" - -BASE_DIR=$(dirname "$0") -PYRIGHT_DIR="$BASE_DIR/../pyright-language-service" - -while [ $# -gt 0 ]; do - case "$1" in - --server=*|--provider=*) - PROVIDER="${1#*=}" - ;; - --port=*) - PORT="${1#*=}" - ;; - *) - echo "Unknown argument: $1" - echo "Usage: $0 [--server=<pyright|pylsp>] [--port=<port_number>]" - exit 1 - ;; - esac - shift -done - -PROVIDER="${PROVIDER:-$DEFAULT_PROVIDER}" -PORT="${PORT:-$DEFAULT_PORT}" - -# Validate port value -if ! [[ "$PORT" =~ ^[0-9]+$ ]]; then - echo "Invalid port: $PORT. Must be a number." - exit 1 -fi - -start_pyright() { - echo "Starting Pyright Language Server on port $PORT..." - cd "$PYRIGHT_DIR" - yarn install --silent - yarn start --port="$PORT" -} - -start_pylsp() { - echo "Starting Pylsp Language Server on port $PORT..." - if ! command -v pylsp &>/dev/null; then - echo "Error: pylsp is not installed. Install it with 'pip install python-lsp-server'." - exit 1 - fi - pylsp --port "$PORT" --ws -} - -case $PROVIDER in - pyright) - start_pyright - ;; - pylsp) - start_pylsp - ;; - *) - echo "Invalid provider: $PROVIDER. Valid options are: pyright, pylsp." - exit 1 - ;; -esac diff --git a/bin/server.sh b/bin/server.sh deleted file mode 100755 index 0320c7ea55..0000000000 --- a/bin/server.sh +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -(cd amber && target/texera-*/bin/texera-web-application) \ No newline at end of file diff --git a/bin/shared-editing-server.sh b/bin/shared-editing-server.sh deleted file mode 100644 index ad9f8b4477..0000000000 --- a/bin/shared-editing-server.sh +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -(cd frontend && npx y-websocket) diff --git a/bin/workflow-compiling-service.sh b/bin/workflow-compiling-service.sh deleted file mode 100755 index b77c6930fc..0000000000 --- a/bin/workflow-compiling-service.sh +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -target/workflow-compiling-service-*/bin/workflow-compiling-service \ No newline at end of file diff --git a/bin/workflow-computing-unit.sh b/bin/workflow-computing-unit.sh deleted file mode 100755 index 2fade50b9b..0000000000 --- a/bin/workflow-computing-unit.sh +++ /dev/null @@ -1,26 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -( - cd amber && - if [ ! -z $1 ] - then - target/texera-*/bin/computing-unit-master --cluster $1 - else - target/texera-*/bin/computing-unit-master - fi -) \ No newline at end of file
