Просмотр исходного кода

netdata/packaging: [ci skip] Emergent fix - Make sure you pick up latest branch details for the whole docker process

Pavlos Emm. Katsoulakis 5 лет назад
Родитель
Сommit
eede895025
2 измененных файлов с 1 добавлено и 4 удалено
  1. 1 0
      .travis.yml
  2. 0 4
      packaging/docker/publish.sh

+ 1 - 0
.travis.yml

@@ -550,6 +550,7 @@ jobs:
     - echo "GIT Describe:" && git describe
     - echo "packaging/version:" && cat packaging/version
     - packaging/docker/check_login.sh
+    - echo "Switching to latest master branch, to pick up tagging if any" && git checkout master && git pull
     - packaging/docker/build.sh
     - packaging/docker/publish.sh
     after_failure: post_message "TRAVIS_MESSAGE" "<!here> Docker image publishing failed"

+ 0 - 4
packaging/docker/publish.sh

@@ -39,10 +39,6 @@ if [ ! -z ${DEVEL+x} ]; then
     declare -a ARCHS=(${DEVEL_ARCHS[@]})
 fi
 
-echo "Syncing repository with latest changes (We may have updated with package versions)"
-git checkout master
-git pull
-
 # Ensure there is a version, the most appropriate one
 if [ "${VERSION}" == "" ]; then
     VERSION=$(git tag --points-at)