Update Gitlab scripts

This commit is contained in:
5chdn 2018-04-24 20:16:16 +02:00
parent 5dd3729256
commit 4b3ea9b1af
No known key found for this signature in database
GPG Key ID: 1A40871B597F5F80
2 changed files with 2 additions and 2 deletions

View File

@ -188,7 +188,7 @@ docker-build:
before_script: before_script:
- docker info - docker info
script: 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" == "beta" ]; then DOCKER_TAG="latest"; else DOCKER_TAG=$CI_BUILD_REF_NAME; fi
- echo "Tag:" $DOCKER_TAG - echo "Tag:" $DOCKER_TAG
- docker login -u $Docker_Hub_User_Parity -p $Docker_Hub_Pass_Parity - docker login -u $Docker_Hub_User_Parity -p $Docker_Hub_Pass_Parity
- scripts/docker-build.sh $DOCKER_TAG - scripts/docker-build.sh $DOCKER_TAG

View File

@ -313,7 +313,7 @@ case $BUILD_PLATFORM in
snapcraft clean snapcraft clean
echo "Prepare snapcraft.yaml for build on Gitlab CI in Docker image" echo "Prepare snapcraft.yaml for build on Gitlab CI in Docker image"
sed -i 's/git/'"$VER"'/g' snap/snapcraft.yaml 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 then
sed -i -e 's/grade: devel/grade: stable/' snap/snapcraft.yaml; sed -i -e 's/grade: devel/grade: stable/' snap/snapcraft.yaml;
fi fi