added real zammad version to docker builds on travis-ci

This commit is contained in:
André Bauer 2017-10-02 23:13:13 +02:00
parent e353e89c6d
commit 12e664b84c
3 changed files with 4 additions and 2 deletions

View file

@ -21,6 +21,7 @@ language: ruby
rvm: rvm:
- 2.4.1 - 2.4.1
before_install: before_install:
- git fetch --unshallow
- sudo apt-get -qq update - sudo apt-get -qq update
- sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev postfix - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev postfix
- if [ "${DB}" = "mysql" ]; then mysql -u root -e "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass';"; fi - if [ "${DB}" = "mysql" ]; then mysql -u root -e "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass';"; fi
@ -29,6 +30,7 @@ before_install:
- if [ "${DB}" = "postgresql" ]; then psql -c 'create database zammad_test;' -U postgres; fi - if [ "${DB}" = "postgresql" ]; then psql -c 'create database zammad_test;' -U postgres; fi
- if [ "${DB}" = "postgresql" ]; then cp config/database.yml.test-postgresql config/database.yml; fi - if [ "${DB}" = "postgresql" ]; then cp config/database.yml.test-postgresql config/database.yml; fi
- export RAILS_ENV=test - export RAILS_ENV=test
- export ZAMMAD_VERSION=$(git describe --tags | sed -e 's/-[a-z0-9]\{8,\}.*//g')
install: install:
- if [ "${DB}" = "mysql" ]; then bundle install --without postgres; fi - if [ "${DB}" = "mysql" ]; then bundle install --without postgres; fi
- if [ "${DB}" = "postgresql" ]; then bundle install; fi - if [ "${DB}" = "postgresql" ]; then bundle install; fi

View file

@ -13,6 +13,6 @@ if [ "${TRAVIS_BRANCH}" == 'develop' ]; then
-H "Travis-API-Version: 3" \ -H "Travis-API-Version: 3" \
-H "Accept: application/json" \ -H "Accept: application/json" \
-H "Authorization: token ${TRAVIS_API_TOKEN}" \ -H "Authorization: token ${TRAVIS_API_TOKEN}" \
-d '{"request": {"branch":"'${BRANCH}'"}}' \ -d '{"request":{ "branch":"'${BRANCH}'","config":{"env":{"ZAMMAD_VERSION":"'${ZAMMAD_VERSION}'"}}}}' \
"https://api.travis-ci.org/repo/${REPO_USER}%2F${REPO}/requests" "https://api.travis-ci.org/repo/${REPO_USER}%2F${REPO}/requests"
fi fi

View file

@ -13,6 +13,6 @@ if [ "${TRAVIS_BRANCH}" == 'stable' ]; then
-H "Travis-API-Version: 3" \ -H "Travis-API-Version: 3" \
-H "Accept: application/json" \ -H "Accept: application/json" \
-H "Authorization: token ${TRAVIS_API_TOKEN}" \ -H "Authorization: token ${TRAVIS_API_TOKEN}" \
-d '{"request": {"branch":"'${BRANCH}'"}}' \ -d '{"request":{ "branch":"'${BRANCH}'","config":{"env":{"ZAMMAD_VERSION":"'${ZAMMAD_VERSION}'"}}}}' \
"https://api.travis-ci.org/repo/${REPO_USER}%2F${REPO}/requests" "https://api.travis-ci.org/repo/${REPO_USER}%2F${REPO}/requests"
fi fi