Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

[2.0.x] [CI/CD] Boost will not install without SDKROOT #8452

Merged
merged 4 commits into from Jan 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 12 additions & 12 deletions .cicd/generate-pipeline.sh
Expand Up @@ -119,7 +119,7 @@ EOF
- "cd eos && ./.cicd/build.sh"
- "cd eos && tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
plugins:
- chef/anka#v0.5.5:
- NorseGaud/anka#v0.5.7:
no-volume: true
inherit-environment-vars: true
vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
Expand All @@ -132,7 +132,7 @@ EOF
failover-registries:
- 'registry_1'
- 'registry_2'
pre-execute-sleep: 10
pre-execute-ping-sleep: "8.8.8.8"
pre-commands:
- "git clone git@github.com:EOSIO/mac-anka-fleet.git && cd mac-anka-fleet && . ./ensure-tag.bash -u 12 -r 25G -a '-n'"
env:
Expand Down Expand Up @@ -209,7 +209,7 @@ EOF
- "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
- "cd eos && ./.cicd/test.sh scripts/parallel-test.sh"
plugins:
- chef/anka#v0.5.4:
- NorseGaud/anka#v0.5.7:
no-volume: true
inherit-environment-vars: true
vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
Expand All @@ -220,7 +220,7 @@ EOF
failover-registries:
- 'registry_1'
- 'registry_2'
pre-execute-sleep: 10
pre-execute-ping-sleep: "8.8.8.8"
agents: "queue=mac-anka-node-fleet"
retry:
manual:
Expand Down Expand Up @@ -271,7 +271,7 @@ EOF
- "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
- "cd eos && ./.cicd/test.sh scripts/wasm-spec-test.sh"
plugins:
- chef/anka#v0.5.4:
- NorseGaud/anka#v0.5.7:
no-volume: true
inherit-environment-vars: true
vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
Expand All @@ -282,7 +282,7 @@ EOF
failover-registries:
- 'registry_1'
- 'registry_2'
pre-execute-sleep: 10
pre-execute-ping-sleep: "8.8.8.8"
agents: "queue=mac-anka-node-fleet"
retry:
manual:
Expand Down Expand Up @@ -336,7 +336,7 @@ EOF
- "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' && tar -xzf build.tar.gz"
- "cd eos && ./.cicd/test.sh scripts/serial-test.sh $TEST_NAME"
plugins:
- chef/anka#v0.5.4:
- NorseGaud/anka#v0.5.7:
no-volume: true
inherit-environment-vars: true
vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
Expand All @@ -347,7 +347,7 @@ EOF
failover-registries:
- 'registry_1'
- 'registry_2'
pre-execute-sleep: 10
pre-execute-ping-sleep: "8.8.8.8"
agents: "queue=mac-anka-node-fleet"
retry:
manual:
Expand Down Expand Up @@ -402,7 +402,7 @@ EOF
- "cd eos && buildkite-agent artifact download build.tar.gz . --step '$(echo "$PLATFORM_JSON" | jq -r .ICON) $(echo "$PLATFORM_JSON" | jq -r .PLATFORM_NAME_FULL) - Build' ${BUILD_SOURCE} && tar -xzf build.tar.gz"
- "cd eos && ./.cicd/test.sh scripts/long-running-test.sh $TEST_NAME"
plugins:
- chef/anka#v0.5.4:
- NorseGaud/anka#v0.5.7:
no-volume: true
inherit-environment-vars: true
vm-name: ${MOJAVE_ANKA_TEMPLATE_NAME}
Expand All @@ -413,7 +413,7 @@ EOF
failover-registries:
- 'registry_1'
- 'registry_2'
pre-execute-sleep: 10
pre-execute-ping-sleep: "8.8.8.8"
agents: "queue=mac-anka-node-fleet"
retry:
manual:
Expand Down Expand Up @@ -586,7 +586,7 @@ cat <<EOF
- "cd eos && buildkite-agent artifact download build.tar.gz . --step ':darwin: macOS 10.14 - Build' && tar -xzf build.tar.gz"
- "cd eos && ./.cicd/package.sh"
plugins:
- chef/anka#v0.5.4:
- NorseGaud/anka#v0.5.7:
no-volume: true
inherit-environment-vars: true
vm-name: 10.14.6_6C_14G_40G
Expand All @@ -597,7 +597,7 @@ cat <<EOF
failover-registries:
- 'registry_1'
- 'registry_2'
pre-execute-sleep: 10
pre-execute-ping-sleep: "8.8.8.8"
agents:
- "queue=mac-anka-node-fleet"
timeout: ${TIMEOUT:-10}
Expand Down
4 changes: 3 additions & 1 deletion .cicd/platforms/pinned/macos-10.14-pinned.sh
Expand Up @@ -49,11 +49,13 @@ sudo make install
cd ../..
rm -rf clang8
# install boost from source
# Boost Fix: eosio/install/bin/../include/c++/v1/stdlib.h:94:15: fatal error: 'stdlib.h' file not found
export SDKROOT="$(xcrun --sdk macosx --show-sdk-path)"
curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2
tar -xjf boost_1_71_0.tar.bz2
cd boost_1_71_0
./bootstrap.sh --prefix=/usr/local
sudo ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(getconf _NPROCESSORS_ONLN) install
sudo SDKROOT="$SDKROOT" ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(getconf _NPROCESSORS_ONLN) install
cd ..
sudo rm -rf boost_1_71_0.tar.bz2 boost_1_71_0
# install mongoDB
Expand Down
2 changes: 1 addition & 1 deletion libraries/fc
Submodule fc updated 1 files
+2 −4 src/log/logger_config.cpp