mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
CI: Make osx test jobs handle dependency installation even if b_osx does not install them
This commit is contained in:
parent
140e59d190
commit
6931c939e0
@ -249,8 +249,20 @@ defaults:
|
||||
- restore_cache:
|
||||
keys:
|
||||
- dependencies-osx-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
|
||||
- attach_workspace:
|
||||
at: .
|
||||
# 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
|
||||
|
||||
# --------------------------------------------------------------------------
|
||||
# Base Image Templates
|
||||
@ -900,23 +912,9 @@ jobs:
|
||||
MAKEFLAGS: -j10
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
keys:
|
||||
- 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-{{ 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
|
||||
- when:
|
||||
condition: true
|
||||
<<: *steps_install_dependencies_osx
|
||||
- run: *run_build
|
||||
- store_artifacts: *artifacts_solc
|
||||
- store_artifacts: *artifact_solidity_upgrade
|
||||
@ -940,6 +938,8 @@ jobs:
|
||||
- when:
|
||||
condition: true
|
||||
<<: *steps_install_dependencies_osx
|
||||
- attach_workspace:
|
||||
at: .
|
||||
- run: *run_soltest
|
||||
- store_test_results: *store_test_results
|
||||
- store_artifacts: *artifacts_test_results
|
||||
@ -952,6 +952,8 @@ jobs:
|
||||
- when:
|
||||
condition: true
|
||||
<<: *steps_install_dependencies_osx
|
||||
- attach_workspace:
|
||||
at: .
|
||||
- run: *run_cmdline_tests
|
||||
- store_artifacts: *artifacts_test_results
|
||||
- gitter_notify_failure_unless_pr
|
||||
|
Loading…
Reference in New Issue
Block a user