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

Commit

Permalink
Merge pull request #786 from EOSIO/merge-release/1.7.0
Browse files Browse the repository at this point in the history
Merge release/1.7.0
  • Loading branch information
larryk85 authored Jan 10, 2020
2 parents d6cfb10 + 1348752 commit a6b8d3f
Show file tree
Hide file tree
Showing 191 changed files with 8,644 additions and 12,171 deletions.
318 changes: 0 additions & 318 deletions .buildkite/pipeline.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .cicd/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ else # Linux

eval docker run $ARGS $evars $FULL_TAG bash -c \"$COMMANDS\"

fi
fi
2 changes: 1 addition & 1 deletion .cicd/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -208,4 +208,4 @@ steps:
- "./.cicd/submodule-regression-checker.sh"
agents:
queue: "automation-basic-builder-fleet"
timeout: 5
timeout: 5
2 changes: 1 addition & 1 deletion .cicd/submodule-regression-checker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ for k in "${!BASE_MAP[@]}"; do
echo "$k was not in the diff; no regression detected"
fi
fi
done
done
25 changes: 22 additions & 3 deletions .cicd/tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@ if [[ $(uname) == 'Darwin' ]]; then

# You can't use chained commands in execute
cd $BUILD_DIR
set +e
bash -c "$TEST"

EXIT_STATUS=$?
cd $ROOT_DIR

else # Linux

ARGS=${ARGS:-"--rm --init -v $(pwd):$MOUNTED_DIR"}
Expand All @@ -29,7 +32,23 @@ else # Linux
evars="$evars --env ${var%%=*}"
done < "$BUILDKITE_ENV_FILE"
fi

set +e
eval docker run $ARGS $evars $FULL_TAG bash -c \"$COMMANDS\"

EXIT_STATUS=$?
fi
# buildkite
if [[ "$BUILDKITE" == 'true' ]]; then
cd build
# upload artifacts
echo '+++ :arrow_up: Uploading Artifacts'
echo 'Exporting xUnit XML'
mv -f ./Testing/$(ls ./Testing/ | grep '2' | tail -n 1)/Test.xml test-results.xml
echo 'Uploading artifacts'
buildkite-agent artifact upload test-results.xml
echo 'Done uploading artifacts.'
fi
# re-throw
if [[ "$EXIT_STATUS" != 0 ]]; then
echo "Failing due to non-zero exit status from ctest: $EXIT_STATUS"
exit $EXIT_STATUS
fi
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,10 @@

# Build
build/*

# Python
__pycache__/
.mypy_cache/

# Editor Files
.vscode/
Loading

0 comments on commit a6b8d3f

Please sign in to comment.