Skip to content

Commit

Permalink
Disable CI jobs that relied on torcharrow scripts (facebookincubator#…
Browse files Browse the repository at this point in the history
…9013)

Summary:
Since we recently removed the legacy setup-velox-torcharrow.sh script, we also need to cleanup some other references to it. For now, disabling jobs that used that docker container.

Pull Request resolved: facebookincubator#9013

Reviewed By: xiaoxmeng, kgpai

Differential Revision: D54878322

Pulled By: pedroerp

fbshipit-source-id: f909b0cd7841d556dde6fd9f0e7424aa52cab7ad
  • Loading branch information
pedroerp authored and facebook-github-bot committed Mar 14, 2024
1 parent 9aab7cb commit 33fe33a
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 48 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build_pyvelox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ concurrency:
cancel-in-progress: true

jobs:
# TODO: https://github.com/facebookincubator/velox/issues/9014
if: false
build_wheels:
name: Build wheels on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ jobs:
file: "scripts/circleci-container.dockfile"
args: "cpu_target=avx"
tags: "ghcr.io/facebookincubator/velox-dev:circleci-avx"
- name: Torcharrow
file: "scripts/velox-torcharrow-container.dockfile"
args: "cpu_target=avx"
tags: "ghcr.io/facebookincubator/velox-dev:torcharrow-avx"
- name: Dev
file: "scripts/ubuntu-22.04-cpp.dockerfile"
args: ""
Expand Down
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,6 @@ circleci-container: #: Build the linux container for CircleCi
check-container:
$(MAKE) linux-container CONTAINER_NAME=check

velox-torcharrow-container:
$(MAKE) linux-container CONTAINER_NAME=velox-torcharrow

linux-container:
rm -rf /tmp/docker && \
mkdir -p /tmp/docker && \
Expand Down
20 changes: 0 additions & 20 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,26 +51,6 @@ services:
- .:/velox:delegated
command: /bin/bash -c "scl enable gcc-toolset-9 '/velox/scripts/docker-command.sh'"

python:
# Usage:
# docker-compose pull ubuntu-cpp or docker-compose build ubuntu-cpp
# docker-compose run --rm ubuntu-cpp
# or
# docker-compose run -e NUM_THREADS=<NUMBER_OF_THREADS_TO_USE> --rm ubuntu-cpp
# to set the number of threads used during compilation
image: ghcr.io/facebookincubator/velox-dev:torcharrow-avx
build:
context: .
dockerfile: scripts/velox-torcharrow-container.dockfile
environment:
PYTHON_EXECUTABLE: python3.7
NUM_THREADS: 8 # default value for NUM_THREADS
CCACHE_DIR: "/velox/.ccache"
volumes:
- .:/velox:delegated
command: cd /velox && make python-test


presto-java:
# Usage:
# docker-compose pull presto-java or docker-compose build presto-java
Expand Down
21 changes: 0 additions & 21 deletions scripts/velox-torcharrow-container.dockfile

This file was deleted.

0 comments on commit 33fe33a

Please sign in to comment.