Merge pull request #786 from EOSIO/merge-release/1.7.0

Merge release/1.7.0

.cicd/build.sh

@@ -42,4 +42,4 @@ else # Linux
 
     eval docker run $ARGS $evars $FULL_TAG bash -c \"$COMMANDS\"
 
-fi
+fi

.cicd/pipeline.yml

@@ -208,4 +208,4 @@ steps:
       - "./.cicd/submodule-regression-checker.sh"
     agents:
       queue: "automation-basic-builder-fleet"
-    timeout: 5
+    timeout: 5

.cicd/submodule-regression-checker.sh

@@ -53,4 +53,4 @@ for k in "${!BASE_MAP[@]}"; do
             echo "$k was not in the diff; no regression detected"
         fi
     fi
-done
+done

.cicd/tests.sh

@@ -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"}
@@ -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

.gitignore

@@ -36,3 +36,10 @@
 
 # Build
 build/*
+
+# Python
+__pycache__/
+.mypy_cache/
+
+# Editor Files
+.vscode/