From fef559dd0908b26349aa588a1f75732b25b9f820 Mon Sep 17 00:00:00 2001 From: Deepak Majeti Date: Tue, 17 Dec 2024 12:44:51 -0500 Subject: [PATCH] build(ci): use ccache instead of .ccache --- .github/workflows/benchmark.yml | 6 +++--- .github/workflows/build_pyvelox.yml | 16 ++++++++-------- .github/workflows/experimental.yml | 4 ++-- .github/workflows/linux-build-base.yml | 4 ++-- .github/workflows/macos.yml | 2 +- .github/workflows/scheduled.yml | 14 +++++++------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 53a3d136f87d..2745d843d1aa 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -43,7 +43,7 @@ jobs: if: github.repository == 'facebookincubator/velox' runs-on: 8-core-ubuntu env: - CCACHE_DIR: "${{ github.workspace }}/.ccache/" + CCACHE_DIR: "${{ github.workspace }}/ccache/" CCACHE_BASEDIR: "${{ github.workspace }}" BINARY_DIR: "${{ github.workspace }}/benchmarks/" LINUX_DISTRO: "ubuntu" @@ -56,7 +56,7 @@ jobs: uses: actions/cache/restore@v3 id: restore-cache with: - path: ".ccache" + path: "ccache" key: ccache-benchmark-${{ github.sha }} restore-keys: | ccache-benchmark- @@ -132,7 +132,7 @@ jobs: uses: actions/cache/save@v3 id: cache with: - path: ".ccache" + path: "ccache" key: ccache-benchmark-${{ github.sha }} - name: "Install benchmark dependencies" diff --git a/.github/workflows/build_pyvelox.yml b/.github/workflows/build_pyvelox.yml index f57ed568531e..73fedf664b9e 100644 --- a/.github/workflows/build_pyvelox.yml +++ b/.github/workflows/build_pyvelox.yml @@ -90,12 +90,12 @@ jobs: # NEXT_VERSION=$(echo $VERSION | awk -F. -v OFS=. '{$NF++ ; print}') echo "build_version=${VERSION}a${COMMITS_SINCE_TAG}" >> $GITHUB_OUTPUT - - run: mkdir -p .ccache + - run: mkdir -p ccache - name: "Restore ccache" uses: actions/cache/restore@v3 id: restore-cache with: - path: ".ccache" + path: "ccache" key: ccache-wheels-${{ matrix.os }}-${{ github.sha }} restore-keys: | ccache-wheels-${{ matrix.os }}- @@ -126,28 +126,28 @@ jobs: CIBW_MANYLINUX_X86_64_IMAGE: "ghcr.io/facebookincubator/velox-dev:torcharrow-avx" CIBW_BEFORE_ALL_LINUX: > mkdir -p /output && - cp -R /host${{ github.workspace }}/.ccache /output/.ccache && + cp -R /host${{ github.workspace }}/ccache /output/ccache && ccache -s CIBW_ENVIRONMENT_PASS_LINUX: CCACHE_DIR BUILD_VERSION CIBW_TEST_EXTRAS: "tests" CIBW_TEST_COMMAND: "cd {project}/pyvelox && python -m unittest -v" CIBW_TEST_SKIP: "*macos*" - CCACHE_DIR: "${{ matrix.os != 'macos-11' && '/output' || github.workspace }}/.ccache" + CCACHE_DIR: "${{ matrix.os != 'macos-11' && '/output' || github.workspace }}/ccache" BUILD_VERSION: "${{ inputs.version || steps.version.outputs.build_version }}" with: output-dir: wheelhouse - - name: "Move .ccache to workspace" + - name: "Move ccache to workspace" if: matrix.os != 'macos-11' run: | - mkdir -p .ccache - cp -R ./wheelhouse/.ccache/* .ccache + mkdir -p ccache + cp -R ./wheelhouse/ccache/* ccache - name: "Save ccache" uses: actions/cache/save@v3 id: cache with: - path: ".ccache" + path: "ccache" key: ccache-wheels-${{ matrix.os }}-${{ github.sha }} - name: "Rename wheel compatibility tag" diff --git a/.github/workflows/experimental.yml b/.github/workflows/experimental.yml index b02bdaed4e60..ce37a45a7567 100644 --- a/.github/workflows/experimental.yml +++ b/.github/workflows/experimental.yml @@ -50,7 +50,7 @@ jobs: runs-on: 16-core-ubuntu timeout-minutes: 120 env: - CCACHE_DIR: "${{ github.workspace }}/.ccache/" + CCACHE_DIR: "${{ github.workspace }}/ccache/" LINUX_DISTRO: "ubuntu" steps: @@ -114,7 +114,7 @@ jobs: container: ghcr.io/facebookincubator/velox-dev:presto-java timeout-minutes: 120 env: - CCACHE_DIR: "${{ github.workspace }}/.ccache/" + CCACHE_DIR: "${{ github.workspace }}/ccache/" LINUX_DISTRO: "centos" steps: diff --git a/.github/workflows/linux-build-base.yml b/.github/workflows/linux-build-base.yml index 4d8218f2e53f..262896d5ffb2 100644 --- a/.github/workflows/linux-build-base.yml +++ b/.github/workflows/linux-build-base.yml @@ -34,7 +34,7 @@ jobs: run: shell: bash env: - CCACHE_DIR: "${{ github.workspace }}/.ccache" + CCACHE_DIR: "${{ github.workspace }}/ccache" VELOX_DEPENDENCY_SOURCE: SYSTEM GTest_SOURCE: BUNDLED simdjson_SOURCE: BUNDLED @@ -124,7 +124,7 @@ jobs: if: ${{ github.repository == 'facebookincubator/velox' }} name: "Ubuntu debug with resolve_dependency" env: - CCACHE_DIR: "${{ github.workspace }}/.ccache" + CCACHE_DIR: "${{ github.workspace }}/ccache" USE_CLANG: "${{ inputs.use-clang && 'true' || 'false' }}" defaults: run: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index e40ec0b4173a..1a14dc5644a8 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -53,7 +53,7 @@ jobs: os: [macos-13, macos-14] runs-on: ${{ matrix.os }} env: - CCACHE_DIR: '${{ github.workspace }}/.ccache' + CCACHE_DIR: '${{ github.workspace }}/ccache' # The arm runners have only 7GB RAM BUILD_TYPE: "${{ matrix.os == 'macos-14' && 'Release' || 'Debug' }}" INSTALL_PREFIX: "/tmp/deps-install" diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 92638f120cea..8633cc87c5dd 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -92,7 +92,7 @@ jobs: container: ghcr.io/facebookincubator/velox-dev:centos9 timeout-minutes: 120 env: - CCACHE_DIR: "${{ github.workspace }}/.ccache" + CCACHE_DIR: "${{ github.workspace }}/ccache" LINUX_DISTRO: "ubuntu" MAKEFLAGS: "NUM_THREADS=${{ inputs.numThreads || 16 }} MAX_HIGH_MEM_JOBS=${{ inputs.maxHighMemJobs || 8 }} MAX_LINK_JOBS=${{ inputs.maxLinkJobs || 4 }}" @@ -590,7 +590,7 @@ jobs: needs: compile timeout-minutes: 120 env: - CCACHE_DIR: "${{ github.workspace }}/.ccache/" + CCACHE_DIR: "${{ github.workspace }}/ccache/" LINUX_DISTRO: "centos" steps: @@ -755,7 +755,7 @@ jobs: container: ghcr.io/facebookincubator/velox-dev:presto-java timeout-minutes: 120 env: - CCACHE_DIR: "${{ github.workspace }}/.ccache/" + CCACHE_DIR: "${{ github.workspace }}/ccache/" LINUX_DISTRO: "centos" steps: @@ -819,7 +819,7 @@ jobs: timeout-minutes: 120 if: ${{ needs.compile.outputs.presto_bias == 'true' }} env: - CCACHE_DIR: "${{ github.workspace }}/.ccache/" + CCACHE_DIR: "${{ github.workspace }}/ccache/" LINUX_DISTRO: "centos" steps: @@ -907,7 +907,7 @@ jobs: timeout-minutes: 120 if: ${{ needs.compile.outputs.presto_aggregate_bias == 'true' }} env: - CCACHE_DIR: "${{ github.workspace }}/.ccache/" + CCACHE_DIR: "${{ github.workspace }}/ccache/" LINUX_DISTRO: "centos" steps: @@ -1004,7 +1004,7 @@ jobs: container: ghcr.io/facebookincubator/velox-dev:presto-java timeout-minutes: 120 env: - CCACHE_DIR: "${{ github.workspace }}/.ccache/" + CCACHE_DIR: "${{ github.workspace }}/ccache/" LINUX_DISTRO: "centos" steps: @@ -1067,7 +1067,7 @@ jobs: container: ghcr.io/facebookincubator/velox-dev:presto-java timeout-minutes: 120 env: - CCACHE_DIR: "${{ github.workspace }}/.ccache/" + CCACHE_DIR: "${{ github.workspace }}/ccache/" LINUX_DISTRO: "centos" steps: