Skip to content

ci, cd: improve caching #2461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamescowens merged 3 commits into from
Mar 9, 2022
Merged

ci, cd: improve caching #2461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c64a662
ci, cd: use compiler version for ccache compiler check
div72 Mar 8, 2022
b6afe1a
ci, cd: increase cache size
div72 Mar 8, 2022
4c9acf4
ci, cd: enforce cache writes
div72 Mar 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,17 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v2
- name: current time for cache
run: echo "TIMESTAMP=$(date +%s)" >> $GITHUB_ENV
- name: cache
uses: actions/cache@v2
with:
path: |
./depends/built
./ci/scratch/.ccache
key: ${{ runner.os }}-${{ matrix.script-id }}
key: ${{ runner.os }}-${{ matrix.script-id }}-${{ env.TIMESTAMP }}
restore-keys: |
${{ runner.os }}-${{ matrix.script-id }}-
- name: build
run: |
./cd/run_all.sh
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,17 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v2
- name: current time for cache
run: echo "TIMESTAMP=$(date +%s)" >> $GITHUB_ENV
- name: cache
uses: actions/cache@v2
with:
path: |
./depends/built
./ci/scratch/.ccache
key: ${{ runner.os }}-${{ matrix.script-id }}
key: ${{ runner.os }}-${{ matrix.script-id }}-${{ env.TIMESTAMP }}
restore-keys: |
${{ runner.os }}-${{ matrix.script-id }}-
- name: test
run: |
./ci/test_run_all.sh
Expand All @@ -52,12 +56,16 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v2
- name: current time for cache
run: echo "TIMESTAMP=$(date +%s)" >> $GITHUB_ENV
- name: cache
uses: actions/cache@v2
with:
path: |
./ci/scratch/.ccache
key: ${{ runner.os }}
key: ${{ runner.os }}-${{ env.TIMESTAMP }}
restore-keys: |
${{ runner.os }}-
- name: install-packages
# We run the contrib/install_db4.sh script rather than installing the
# Homebrew berkeley-db4 formula to add the Berkeley DB 4.8 dependency
Expand Down
3 changes: 2 additions & 1 deletion cd/00_setup_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@ export CONTAINER_NAME=${CONTAINER_NAME:-ci_unnamed}
export DOCKER_NAME_TAG=${DOCKER_NAME_TAG:-ubuntu:18.04}
# See man 7 debconf
export DEBIAN_FRONTEND=noninteractive
export CCACHE_SIZE=${CCACHE_SIZE:-100M}
export CCACHE_SIZE=${CCACHE_SIZE:-300M}
export CCACHE_TEMPDIR=${CCACHE_TEMPDIR:-/tmp/.ccache-temp}
export CCACHE_COMPRESS=${CCACHE_COMPRESS:-1}
export CCACHE_COMPILERCHECK=${CCACHE_COMPILERCHECK:-"%compiler% -v"}
# The cache dir.
# This folder exists on the ci host and ci guest. Changes are propagated back and forth.
export CCACHE_DIR=${CCACHE_DIR:-$BASE_SCRATCH_DIR/.ccache}
Expand Down
3 changes: 2 additions & 1 deletion ci/test/00_setup_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,10 @@ export DOCKER_NAME_TAG=${DOCKER_NAME_TAG:-ubuntu:18.04}
export BOOST_TEST_RANDOM=${BOOST_TEST_RANDOM:-1}
# See man 7 debconf
export DEBIAN_FRONTEND=noninteractive
export CCACHE_SIZE=${CCACHE_SIZE:-100M}
export CCACHE_SIZE=${CCACHE_SIZE:-300M}
export CCACHE_TEMPDIR=${CCACHE_TEMPDIR:-/tmp/.ccache-temp}
export CCACHE_COMPRESS=${CCACHE_COMPRESS:-1}
export CCACHE_COMPILERCHECK=${CCACHE_COMPILERCHECK:-"%compiler% -v"}
# The cache dir.
# This folder exists on the ci host and ci guest. Changes are propagated back and forth.
export CCACHE_DIR=${CCACHE_DIR:-$BASE_SCRATCH_DIR/.ccache}
Expand Down