cerc-io/solidity
10
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

CI: Make osx test jobs handle dependency installation even if b_osx does not install them

Browse Source
This commit is contained in:
Kamil Śliwak 2022-04-11 15:54:56 +02:00
parent 140e59d190
commit 6931c939e0
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
.circleci/config.yml
View File

@ -249,8 +249,20 @@ defaults:
- restore_cache: - restore_cache:
keys: keys:
- dependencies-osx-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }} - dependencies-osx-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
- attach_workspace: # DO NOT EDIT between here and save_cache, but rather edit ./circleci/osx_install_dependencies.sh
at: . # 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-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
paths:
- /usr/local/bin
- /usr/local/sbin
- /usr/local/lib
- /usr/local/include
- /usr/local/Cellar
- /usr/local/Homebrew
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Base Image Templates # Base Image Templates
@ -900,23 +912,9 @@ jobs:
MAKEFLAGS: -j10 MAKEFLAGS: -j10
steps: steps:
- checkout - checkout
- restore_cache: - when:
keys: condition: true
- dependencies-osx-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }} <<: *steps_install_dependencies_osx
# 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-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
paths:
- /usr/local/bin
- /usr/local/sbin
- /usr/local/lib
- /usr/local/include
- /usr/local/Cellar
- /usr/local/Homebrew
- run: *run_build - run: *run_build
- store_artifacts: *artifacts_solc - store_artifacts: *artifacts_solc
- store_artifacts: *artifact_solidity_upgrade - store_artifacts: *artifact_solidity_upgrade
@ -940,6 +938,8 @@ jobs:
- when: - when:
condition: true condition: true
<<: *steps_install_dependencies_osx <<: *steps_install_dependencies_osx
- attach_workspace:
at: .
- run: *run_soltest - run: *run_soltest
- store_test_results: *store_test_results - store_test_results: *store_test_results
- store_artifacts: *artifacts_test_results - store_artifacts: *artifacts_test_results
@ -952,6 +952,8 @@ jobs:
- when: - when:
condition: true condition: true
<<: *steps_install_dependencies_osx <<: *steps_install_dependencies_osx
- attach_workspace:
at: .
- run: *run_cmdline_tests - run: *run_cmdline_tests
- store_artifacts: *artifacts_test_results - store_artifacts: *artifacts_test_results
- gitter_notify_failure_unless_pr - gitter_notify_failure_unless_pr