Commit a1bc4749 by Giovannoni Laurent

Merge branch 'revert-4efb85b0' into 'master'

Revert "Merge branch 'develop' into 'master'"

See merge request !59
parents 4efb85b0 727edb3a
......@@ -7,61 +7,42 @@ variables:
POSTGRES_PASSWORD: ""
stages:
- build
- test
before_script:
- apt-get update > /dev/null
- apt-get install wget -yqq > /dev/null
- apt-get install npm -yqq > /dev/null
- apt-get install git -yqq > /dev/null
- bash ci/docker_install_php.sh > /dev/null
- bash ci/docker_install_database.sh > /dev/null
- wget https://composer.github.io/installer.sig -O - -q | tr -d '\n' > installer.sig
- php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
- php -r "if (hash_file('SHA384', 'composer-setup.php') === file_get_contents('installer.sig')) { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
- php composer-setup.php
- php -r "unlink('composer-setup.php'); unlink('installer.sig');"
- php composer.phar install
- mv composer.phar /usr/local/bin/composer
- chmod +x /usr/local/bin/composer
job1:
stage: build
job_php-7.0:
image: php:7.0-apache
stage: test
script:
- apt-get update > /dev/null
- apt-get install git -yqq > /dev/null
- cd ${CI_PROJECT_DIR}
- git clone --depth 1 -b "17.06" https://labs.maarch.org/maarch/LibsExtMaarchCourrier temp \
- cp -R temp/* . \
- rm -Rf temp \
- tar -zcvf MaarchCourrier.tar.gz ${CI_PROJECT_DIR}
artifacts:
name : "${CI_JOB_STAGE}_${CI_COMMIT_TAG}"
path :
- /builds/maarch/MaarchCourrier
- mkdir -p /var/www/html/
- cp -R /builds/maarch/MaarchCourrier/ /var/www/html/
- cd /var/www/html/MaarchCourrier
- mkdir -p /var/www/html/MaarchCourrier
- composer -n install
- curl -sL https://deb.nodesource.com/setup_7.x | bash -
- apt-get install -yqq nodejs
- npm install npm@latest -g
- npm set registry https://registry.npmjs.org/
- npm install
- sed 's/<databaseserver>.*<\/databaseserver>/<databaseserver>postgres<\/databaseserver>/;s/<databasepassword>.*<\/databasepassword>/<databasepassword><\/databasepassword>/;s/<databasename>.*<\/databasename>/<databasename>MaarchCourrier<\/databasename>/;s/<databaseuser>.*<\/databaseuser>/<databaseuser>maarch<\/databaseuser>/' apps/maarch_entreprise/xml/config.xml.default > apps/maarch_entreprise/xml/config.xml
- curl --location -s --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar
- chmod +x /usr/local/bin/phpunit
#- cd App/MaarchRM
- phpunit --coverage-text --colors=never -c phpunit.xml
only:
- master
- tags
#before_script:
# - apt-get update > /dev/null
# - apt-get install wget -yqq > /dev/null
# - apt-get install npm -yqq > /dev/null
# - apt-get install git -yqq > /dev/null
# - bash ci/docker_install_php.sh > /dev/null
# - bash ci/docker_install_database.sh > /dev/null
# - wget https://composer.github.io/installer.sig -O - -q | tr -d '\n' > installer.sig
# - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
# - php -r "if (hash_file('SHA384', 'composer-setup.php') === file_get_contents('installer.sig')) { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
# - php composer-setup.php
# - php -r "unlink('composer-setup.php'); unlink('installer.sig');"
# - php composer.phar install
# - mv composer.phar /usr/local/bin/composer
# - chmod +x /usr/local/bin/composer
#
#job_php-7.0:
# image: php:7.0-apache
# stage: test
# script:
# - mkdir -p /var/www/html/
# - cp -R /builds/maarch/MaarchCourrier/ /var/www/html/
# - cd /var/www/html/MaarchCourrier
# - mkdir -p /var/www/html/MaarchCourrier
# - composer -n install
# - curl -sL https://deb.nodesource.com/setup_7.x | bash -
# - apt-get install -yqq nodejs
# - npm install npm@latest -g
# - npm set registry https://registry.npmjs.org/
# - npm install
# - sed 's/<databaseserver>.*<\/databaseserver>/<databaseserver>postgres<\/databaseserver>/;s/<databasepassword>.*<\/databasepassword>/<databasepassword><\/databasepassword>/;s/<databasename>.*<\/databasename>/<databasename>MaarchCourrier<\/databasename>/;s/<databaseuser>.*<\/databaseuser>/<databaseuser>maarch<\/databaseuser>/' apps/maarch_entreprise/xml/config.xml.default > apps/maarch_entreprise/xml/config.xml
# - curl --location -s --output /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar
# - chmod +x /usr/local/bin/phpunit
# #- cd App/MaarchRM
# - phpunit --coverage-text --colors=never -c phpunit.xml
# only:
# - develop
\ No newline at end of file
- develop
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment