Skip to content

Commit

Permalink
properly set ccache base dir for inside container
Browse files Browse the repository at this point in the history
  • Loading branch information
assignUser committed Mar 23, 2024
1 parent 340d033 commit 04b49d9
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 9 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/experimental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ jobs:
timeout-minutes: 120
env:
CCACHE_DIR: "${{ github.workspace }}/.ccache/"
CCACHE_BASEDIR: "${{ github.workspace }}"
LINUX_DISTRO: "ubuntu"
steps:

Expand Down Expand Up @@ -110,8 +109,7 @@ jobs:
container: ghcr.io/facebookincubator/velox-dev:presto-java
timeout-minutes: 120
env:
CCACHE_DIR: "${{ github.workspace }}/.ccache/"
CCACHE_BASEDIR: "${{ github.workspace }}"
CCACHE_DIR: "/__w/velox/velox/.ccache/"
LINUX_DISTRO: "centos"
steps:

Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/linux-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ jobs:
run:
shell: bash
env:
CCACHE_DIR: "${{ github.workspace }}/.ccache"
CCACHE_BASEDIR: "${{ github.workspace }}"
CCACHE_DIR: "/__w/velox/velox/.ccache"
VELOX_DEPENDENCY_SOURCE: SYSTEM
simdjson_SOURCE: BUNDLED
xsimd_SOURCE: BUNDLED
Expand All @@ -71,6 +70,10 @@ jobs:
path: '${{ env.CCACHE_DIR }}'
key: ccache-linux-adapters

- name: "Zero Ccache Statistics"
run: |
ccache -sz
- name: Make Release Build
env:
MAKEFLAGS: 'NUM_THREADS=8 MAX_HIGH_MEM_JOBS=4 MAX_LINK_JOBS=4'
Expand All @@ -87,6 +90,9 @@ jobs:
"-DVELOX_ENABLE_REMOTE_FUNCTIONS=ON"
)
make release EXTRA_CMAKE_FLAGS="${EXTRA_CMAKE_FLAGS[*]}"
- name: Ccache after
run: ccache -s

- uses: assignUser/stash/save@v1
with:
Expand All @@ -97,7 +103,7 @@ jobs:
# Some of the adapters dependencies are in the 'adapters' conda env
shell: mamba run --no-capture-output -n adapters /usr/bin/bash -e {0}
env:
LIBHDFS3_CONF: "${{ github.workspace }}/.circleci/hdfs-client.xml"
LIBHDFS3_CONF: "/__w/velox/velox/.circleci/hdfs-client.xml"
working-directory: _build/release
run: |
ctest -j 8 --output-on-failure --no-tests=error
Expand All @@ -107,7 +113,6 @@ jobs:
name: "Ubuntu debug with resolve_dependency"
env:
CCACHE_DIR: "${{ github.workspace }}/.ccache"
CCACHE_BASEDIR: "${{ github.workspace }}"
defaults:
run:
shell: bash
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/scheduled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@ jobs:
container: ghcr.io/facebookincubator/velox-dev:centos8
timeout-minutes: 120
env:
CCACHE_DIR: "${{ github.workspace }}/.ccache/"
CCACHE_BASEDIR: "${{ github.workspace }}"
CCACHE_DIR: "/__w/velox/velox/.ccache/"
LINUX_DISTRO: "ubuntu"
MAKEFLAGS: "NUM_THREADS=${{ inputs.numThreads || 16 }} MAX_HIGH_MEM_JOBS=${{ inputs.maxHighMemJobs || 8 }} MAX_LINK_JOBS=${{ inputs.maxLinkJobs || 4 }}"

Expand Down Expand Up @@ -128,6 +127,8 @@ jobs:

- name: Build PyVelox
if: ${{ steps.get-sig.outputs.stash-hit != 'true' }}
env:
CCACHE_BASEDIR: "/__w/velox/velox/velox_main"
working-directory: velox_main
run: |
python3 -m venv .venv
Expand Down Expand Up @@ -164,6 +165,7 @@ jobs:
- name: Build
env:
CCACHE_BASEDIR: "/__w/velox/velox/velox"
EXTRA_CMAKE_FLAGS: "-DVELOX_ENABLE_ARROW=ON -DVELOX_BUILD_PYTHON_PACKAGE=ON ${{ inputs.extraCMakeFlags }}"
run: |
EXTRA_CMAKE_FLAGS="-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") $EXTRA_CMAKE_FLAGS"
Expand Down

0 comments on commit 04b49d9

Please sign in to comment.