Skip to content

Include OS and CPU architecture in CircleCI cache keys #12106

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
merged 2 commits into from
Oct 12, 2021
Merged

Include OS and CPU architecture in CircleCI cache keys #12106

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24c8a60
Include OS and CPU architecture in CircleCI cache keys
cameel Oct 7, 2021
cd22574
Workaround for CircleCI not being able to restore cached /usr/local/H…
cameel Oct 11, 2021
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
32 changes: 26 additions & 6 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,17 @@ defaults:
- store_test_results: *store_test_results
- store_artifacts: *artifacts_test_results

- steps_restore_cache_homebrew_workaround: &steps_restore_cache_homebrew_workaround
steps:
- run:
# FIXME: For some reason restore_cache fails saying that it cannot remove the scm/ dir.
Copy link
Contributor

@christianparpart christianparpart Oct 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean the rm -r below? If so, what about rm -rf?

Copy link
Collaborator Author

@cameel cameel Oct 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, the rm is the workaround :) Works without --force.

It's restore_cache that can't remove the files and it's provided by CircleCI so we have to wait for a fix from them.

# The directory contains only two files: `git` (wrapper script over git) and `svn` (symlink
# to `git`). This looks like a bug in restore_cache. Removing scm/ is a workaround.
# See https://github.com/ethereum/solidity/pull/12106 for more details.
name: Workaround for restore_cache + /usr/local/Homebrew/Library/Homebrew/shims/scm/
command: |
rm -r /usr/local/Homebrew/Library/Homebrew/shims/scm/

- test_ubuntu1604_clang: &test_ubuntu1604_clang
docker:
- image: << pipeline.parameters.ubuntu-1604-clang-ossfuzz-docker-image >>
Expand Down Expand Up @@ -625,16 +636,19 @@ jobs:
MAKEFLAGS: -j 5
steps:
- checkout
- when:
condition: true
<<: *steps_restore_cache_homebrew_workaround
- restore_cache:
keys:
- dependencies-osx-{{ checksum ".circleci/osx_install_dependencies.sh" }}
- dependencies-osx-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
# DO NOT EDIT between here and save_cache, but rather edit ./circleci/osx_install_dependencies.sh
# WARNING! If you do edit anything here instead, remember to invalidate the cache manually.
- run:
name: Install build dependencies
command: ./.circleci/osx_install_dependencies.sh
- save_cache:
key: dependencies-osx-{{ checksum ".circleci/osx_install_dependencies.sh" }}
key: dependencies-osx-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
paths:
- /usr/local/bin
- /usr/local/sbin
Expand All @@ -661,9 +675,12 @@ jobs:
TERM: xterm
steps:
- checkout
- when:
condition: true
<<: *steps_restore_cache_homebrew_workaround
- restore_cache:
keys:
- dependencies-osx-{{ checksum ".circleci/osx_install_dependencies.sh" }}
- dependencies-osx-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
- attach_workspace:
at: .
- run: *run_soltest
Expand All @@ -677,9 +694,12 @@ jobs:
TERM: xterm
steps:
- checkout
- when:
condition: true
<<: *steps_restore_cache_homebrew_workaround
- restore_cache:
keys:
- dependencies-osx-{{ checksum ".circleci/osx_install_dependencies.sh" }}
- dependencies-osx-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
- attach_workspace:
at: .
- run: *run_cmdline_tests
Expand Down Expand Up @@ -886,14 +906,14 @@ jobs:
- checkout
- restore_cache:
keys:
- dependencies-win-{{ checksum "scripts/install_deps.ps1" }}
- dependencies-win-{{ arch }}-{{ checksum "scripts/install_deps.ps1" }}
# DO NOT EDIT between here and save_cache, but rather edit .\scripts\install_deps.ps1
# WARNING! If you do edit anything here instead, remember to invalidate the cache manually.
- run:
name: "Installing dependencies"
command: .\scripts\install_deps.ps1
- save_cache:
key: dependencies-win-{{ checksum "scripts/install_deps.ps1" }}
key: dependencies-win-{{ arch }}-{{ checksum "scripts/install_deps.ps1" }}
paths:
- .\deps
- run:
Expand Down