cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12106 from ethereum/fix-circleci-macos-cache-key

Browse Source 
Include OS and CPU architecture in CircleCI cache keys
This commit is contained in:
chriseth 2021-10-12 16:22:13 +02:00 committed by GitHub
commit 5911fdf6a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.circleci/config.yml
View File

@ -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.
# 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 >>
@ -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
@ -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
@ -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
@ -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: