diff --git a/scripts/gitlab/publish-awss3.sh b/scripts/gitlab/publish-awss3.sh index e21e636cb..94ff49560 100755 --- a/scripts/gitlab/publish-awss3.sh +++ b/scripts/gitlab/publish-awss3.sh @@ -3,7 +3,6 @@ set -e # fail on any error set -u # treat unset variables as error - echo "__________Register Release__________" DATA="secret=$RELEASES_SECRET" @@ -13,18 +12,6 @@ echo "Pushing release to Mainnet" echo "Pushing release to Kovan" ./scripts/gitlab/safe-curl.sh $DATA "http://update.parity.io:1338/push-release/$CI_BUILD_REF_NAME/$CI_BUILD_REF" -echo "__________Set ENVIROMENT__________" -DESCRIPTION="$(cat CHANGELOG.md)" -RELEASE_TABLE="$(cat scripts/gitlab/templates/release-table.md)" -RELEASE_TABLE="$(echo "${RELEASE_TABLE//\$VERSION/${VERSION}}")" -#The text in the file CANGELOG.md before which the table with links is inserted. Must be present in this file necessarily -REPLACE_TEXT="The full list of included changes:" -case ${CI_COMMIT_REF_NAME} in - nightly|*v2.2*) NAME="Parity "$VERSION" nightly";; - beta|*v2.1*) NAME="Parity "$VERSION" beta";; - stable|*v2.0*) NAME="Parity "$VERSION" stable";; - *) echo "No release" exit 0;; -esac cd artifacts ls -l | sort -k9 filetest=( * ) @@ -38,10 +25,9 @@ do else WIN=""; fi - for binary in $(ls parity.sha256) + for binary in $(ls parity.sha3) do - sha256=$(cat $binary | awk '{ print $1}' ) - sha3=$(cat ${binary/sha256/sha3} | awk '{ print $1}' ) + sha3=$(cat ${binary/sha3} | awk '{ print $1}' ) case $DIR in x86_64* ) DATA="commit=$CI_BUILD_REF&sha3=$sha3&filename=parity$WIN&secret=$RELEASES_SECRET" @@ -50,18 +36,10 @@ do ../../scripts/gitlab/safe-curl.sh $DATA "http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$DIR" ;; esac - RELEASE_TABLE="$(echo "${RELEASE_TABLE/sha$DIR/${sha256}}")" done cd .. done -#do not touch the following 3 lines. Features of output in Markdown -DESCRIPTION="$(echo "${DESCRIPTION/${REPLACE_TEXT}/${RELEASE_TABLE} -${REPLACE_TEXT}}")" -echo "$DESCRIPTION" -if [[ "$CI_COMMIT_REF_NAME" == "nightly" ]]; then DESCRIPTION=""; fi #TODO in the future, we need to prepare a script that will do changelog -echo "__________Create release to Github____________" -github-release release --user devops-parity --repo parity-ethereum --tag "$CI_COMMIT_REF_NAME" --draft --name "$NAME" --description "$DESCRIPTION" echo "__________Push binaries to AWS S3____________" aws configure set aws_access_key_id $s3_key aws configure set aws_secret_access_key $s3_secret diff --git a/scripts/gitlab/publish-docker.sh b/scripts/gitlab/publish-docker.sh index d2ef66e16..c9aeaaf44 100755 --- a/scripts/gitlab/publish-docker.sh +++ b/scripts/gitlab/publish-docker.sh @@ -4,8 +4,8 @@ set -e # fail on any error set -u # treat unset variables as error if [ "$CI_COMMIT_REF_NAME" == "master" ]; -then export DOCKER_BUILD_TAG="latest"; -else export DOCKER_BUILD_TAG=$CI_COMMIT_REF_NAME; + then export DOCKER_BUILD_TAG="latest"; + else export DOCKER_BUILD_TAG=$CI_COMMIT_REF_NAME; fi docker login -u $Docker_Hub_User_Parity -p $Docker_Hub_Pass_Parity diff --git a/scripts/gitlab/test.sh b/scripts/gitlab/test.sh index 8395ec962..2533b9baa 100755 --- a/scripts/gitlab/test.sh +++ b/scripts/gitlab/test.sh @@ -4,11 +4,8 @@ set -e # fail on any error set -u # treat unset variables as error - -set -x # full command output for development git log --graph --oneline --all --decorate=short -n 10 - case $CI_COMMIT_REF_NAME in (master|beta|stable) export GIT_COMPARE=$CI_COMMIT_REF_NAME~ @@ -18,27 +15,18 @@ case $CI_COMMIT_REF_NAME in ;; esac - export RUST_FILES_MODIFIED="$(git --no-pager diff --name-only $GIT_COMPARE...$CI_COMMIT_SHA | grep -v -e ^\\. -e ^LICENSE -e ^README.md -e ^CHANGELOG.md -e ^test.sh -e ^scripts/ -e ^docs/ | wc -l | tr -d ' ')" echo "RUST_FILES_MODIFIED: $RUST_FILES_MODIFIED" - if [ "${RUST_FILES_MODIFIED}" = "0" ] then echo "__________Skipping Rust tests since no Rust files modified__________"; exit 0 fi - rustup default $1 git submodule update --init --recursive rustup show exec ./test.sh - -# if [[ "$CI_COMMIT_REF_NAME" == "nightly" ]]; -# ### @TODO re-enable fail after https://github.com/paritytech/parity-import-tests/issues/3 -# then sh scripts/aura-test.sh; # || exit $?; -# fi -