Compare commits

...

3 Commits

Author SHA1 Message Date
5chdn
60d0094b03 Use master as gitlab latest 2018-04-24 20:18:51 +02:00
5chdn
94c3bfff77 Update Gitlab scripts 2018-04-24 20:14:01 +02:00
5chdn
7a2da2c2d2 Betalize 1.11 :) 2018-04-24 19:40:39 +02:00
3 changed files with 3 additions and 3 deletions

View File

@@ -188,7 +188,7 @@ docker-build:
before_script:
- docker info
script:
- if [ "$CI_BUILD_REF_NAME" == "beta-release" ]; then DOCKER_TAG="latest"; else DOCKER_TAG=$CI_BUILD_REF_NAME; fi
- if [ "$CI_BUILD_REF_NAME" == "master" ]; then DOCKER_TAG="latest"; else DOCKER_TAG=$CI_BUILD_REF_NAME; fi
- echo "Tag:" $DOCKER_TAG
- docker login -u $Docker_Hub_User_Parity -p $Docker_Hub_Pass_Parity
- scripts/docker-build.sh $DOCKER_TAG

View File

@@ -313,7 +313,7 @@ case $BUILD_PLATFORM in
snapcraft clean
echo "Prepare snapcraft.yaml for build on Gitlab CI in Docker image"
sed -i 's/git/'"$VER"'/g' snap/snapcraft.yaml
if [[ "$CI_BUILD_REF_NAME" = "beta" || "$VER" == *1.10* ]];
if [[ "$CI_BUILD_REF_NAME" = "beta" || "$VER" == *1.11* ]];
then
sed -i -e 's/grade: devel/grade: stable/' snap/snapcraft.yaml;
fi

View File

@@ -10,7 +10,7 @@ build = "build.rs"
[package.metadata]
# This versions track. Should be changed to `stable` or `beta` when on respective branches.
# Used by auto-updater and for Parity version string.
track = "nightly"
track = "beta"
# Indicates a critical release in this track (i.e. consensus issue)
critical = true