This repository has been archived by the owner on Aug 2, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7466 from EOSIO/merge-release-1.7.4-to-master
Merge release 1.7.4 to master
- Loading branch information
Showing
18 changed files
with
136 additions
and
819 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| { | ||
| "eosio-lrt": | ||
| { | ||
| "pipeline-branch": "legacy-os" | ||
| }, | ||
| "eosio-nightly-builds": | ||
| { | ||
| "pipeline-branch": "legacy-os" | ||
| }, | ||
| "eosio-base-images": | ||
| { | ||
| "pipeline-branch": "release/1.7.x" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| #!/bin/bash | ||
| # The purpose of this test is to ensure that the output of the "nodeos --version" command matches the version string defined by our CMake files | ||
| # If the environment variable BUILDKITE_TAG is empty or unset, this test will echo success | ||
| echo '##### Nodeos Version Label Test #####' | ||
| if [[ "$BUILDKITE_TAG" == '' || "$BUILDKITE" != 'true' ]]; then | ||
| echo 'This test is only run in Buildkite against tagged builds.' | ||
| [[ "$BUILDKITE" != 'true' ]] && echo 'This is not Buildkite.' | ||
| [[ "$BUILDKITE_TAG" == '' ]] && echo 'This is not a tagged build.' | ||
| echo 'Exiting...' | ||
| exit 0 | ||
| fi | ||
| echo 'Tagged build detected, running test.' | ||
| # orient ourselves | ||
| [[ "$EOSIO_ROOT" == '' ]] && EOSIO_ROOT=$(echo $(pwd)/ | grep -ioe '.*/eos/') | ||
| [[ "$EOSIO_ROOT" == '' ]] && EOSIO_ROOT=$(echo $(pwd)/ | grep -ioe '.*/EOSIO/eosio/') | ||
| [[ "$EOSIO_ROOT" == '' ]] && EOSIO_ROOT=$(echo $(pwd)/ | grep -ioe '.*/build/' | sed 's,/build/,,') | ||
| echo "Using EOSIO_ROOT=\"$EOSIO_ROOT\"." | ||
| # determine expected value | ||
| CMAKE_CACHE="$EOSIO_ROOT/build/CMakeCache.txt" | ||
| CMAKE_LISTS="$EOSIO_ROOT/CMakeLists.txt" | ||
| if [[ -f "$CMAKE_CACHE" && $(cat "$CMAKE_CACHE" | grep -c 'DOXY_EOS_VERSION') > 0 ]]; then | ||
| echo "Parsing \"$CMAKE_CACHE\"..." | ||
| EXPECTED="v$(cat "$CMAKE_CACHE" | grep 'DOXY_EOS_VERSION' | cut -d '=' -f 2)" | ||
| elif [[ -f "$CMAKE_LISTS" ]]; then | ||
| echo "Parsing \"$CMAKE_LISTS\"..." | ||
| export $(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_MAJOR' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}') | ||
| export $(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_MINOR' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}') | ||
| export $(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_PATCH' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}') | ||
| if [[ $(cat $CMAKE_LISTS | grep -ice 'set *( *VERSION_SUFFIX') > 0 ]]; then | ||
| echo 'Using version suffix...' | ||
| export $(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_SUFFIX' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}') | ||
| export $(echo "$(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_FULL.*VERSION_SUFFIX' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}')" | sed "s/VERSION_MAJOR/$VERSION_MAJOR/" | sed "s/VERSION_MINOR/$VERSION_MINOR/" | sed "s/VERSION_PATCH/$VERSION_PATCH/" | sed "s/VERSION_SUFFIX/$VERSION_SUFFIX/" | tr -d '"{}$') | ||
| else | ||
| echo 'No version suffix found.' | ||
| export $(echo "$(cat $CMAKE_LISTS | grep -ie 'set *( *VERSION_FULL' | grep -ive 'VERSION_SUFFIX' | cut -d '(' -f 2 | cut -d ')' -f 1 | awk '{print $1"="$2}')" | sed "s/VERSION_MAJOR/$VERSION_MAJOR/" | sed "s/VERSION_MINOR/$VERSION_MINOR/" | sed "s/VERSION_PATCH/$VERSION_PATCH/" | tr -d '"{}$') | ||
| fi | ||
| EXPECTED="v$VERSION_FULL" | ||
| fi | ||
| # fail if no expected value was found | ||
| if [[ "$EXPECTED" == '' ]]; then | ||
| echo 'ERROR: Could not determine expected value for version label!' | ||
| set +e | ||
| echo "EOSIO_ROOT=\"$EOSIO_ROOT\"" | ||
| echo "CMAKE_CACHE=\"$CMAKE_CACHE\"" | ||
| echo "CMAKE_LISTS=\"$CMAKE_LISTS\"" | ||
| echo '' | ||
| echo "VERSION_MAJOR=\"$VERSION_MAJOR\"" | ||
| echo "VERSION_MINOR=\"$VERSION_MINOR\"" | ||
| echo "VERSION_PATCH=\"$VERSION_PATCH\"" | ||
| echo "VERSION_SUFFIX=\"$VERSION_SUFFIX\"" | ||
| echo "VERSION_FULL=\"$VERSION_FULL\"" | ||
| echo '' | ||
| echo '$ cat "$CMAKE_CACHE" | grep "DOXY_EOS_VERSION"' | ||
| cat "$CMAKE_CACHE" | grep "DOXY_EOS_VERSION" | ||
| echo '$ pwd' | ||
| pwd | ||
| echo '$ ls -la "$EOSIO_ROOT"' | ||
| ls -la "$EOSIO_ROOT" | ||
| echo '$ ls -la "$EOSIO_ROOT/build"' | ||
| ls -la "$EOSIO_ROOT/build" | ||
| exit 1 | ||
| fi | ||
| echo "Expecting \"$EXPECTED\"..." | ||
| # get nodeos version | ||
| ACTUAL=$($EOSIO_ROOT/build/bin/nodeos --version) || : # nodeos currently returns -1 for --version | ||
| # test | ||
| if [[ "$EXPECTED" == "$ACTUAL" ]]; then | ||
| echo 'Passed with \"$ACTUAL\".' | ||
| exit 0 | ||
| fi | ||
| echo 'Failed!' | ||
| echo "\"$EXPECTED\" != \"$ACTUAL\"" | ||
| exit 1 |
Oops, something went wrong.