From b108851735e82176b42ccf3b41528c75d92924f1 Mon Sep 17 00:00:00 2001 From: Marwolf Date: Tue, 31 Jul 2018 14:50:32 -0400 Subject: [PATCH] Attempting to automate build testing --- .travis.yml | 52 +++++++++++++++-- docker-compose.travis.yml | 115 -------------------------------------- 2 files changed, 48 insertions(+), 119 deletions(-) delete mode 100644 docker-compose.travis.yml diff --git a/.travis.yml b/.travis.yml index d5f3465..9af2414 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,14 @@ sudo: required - +language: java +install: ant deps +jdk: + - oraclejdk8 + - oraclejdk9 + - oraclejdk10 + - openjdk8 + - openjdk9 + - openjdk10 + - openjdk11 env: DOCKER_COMPOSE_VERSION: 1.22.0 @@ -7,13 +16,48 @@ services: - docker before_install: + - sudo make clone-game + - sudo chmod -R 777 Game + - sudo make clone-website + - sudo make clone-website + - sudo chmod -R 777 Website - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose - chmod +x docker-compose - sudo mv docker-compose /usr/local/bin - docker-compose -v - docker -v - - mkdir Docker-Home + - sudo service mysql stop script: - - docker-compose -f docker-compose.travis.yml up -d - - docker-compose -f docker-compose.travis.yml ps + - sudo make start + - docker-compose -f docker-compose.yml ps + - sudo make import-game + - sudo make import-website + + - export JAVA_HOME=$HOME/oraclejdk8 + - $TRAVIS_BUILD_DIR/install-jdk.sh --install oraclejdk8 --target $JAVA_HOME + - sudo ant -f Game/server/build.xml compile + + - export JAVA_HOME=$HOME/oraclejdk9 + - $TRAVIS_BUILD_DIR/install-jdk.sh --install oraclejdk9 --target $JAVA_HOME + - sudo ant -f Game/server/build.xml compile + + - export JAVA_HOME=$HOME/oraclejdk10 + - $TRAVIS_BUILD_DIR/install-jdk.sh --install oraclejdk10 --target $JAVA_HOME + - sudo ant -f Game/server/build.xml compile + + - export JAVA_HOME=$HOME/openjdk8 + - $TRAVIS_BUILD_DIR/install-jdk.sh --install openjdk8 --target $JAVA_HOME + - sudo ant -f Game/server/build.xml compile + + - export JAVA_HOME=$HOME/openjdk9 + - $TRAVIS_BUILD_DIR/install-jdk.sh --install openjdk9 --target $JAVA_HOME + - sudo ant -f Game/server/build.xml compile + + - export JAVA_HOME=$HOME/openjdk10 + - $TRAVIS_BUILD_DIR/install-jdk.sh --install openjdk10 --target $JAVA_HOME + - sudo ant -f Game/server/build.xml compile + + - export JAVA_HOME=$HOME/openjdk11 + - $TRAVIS_BUILD_DIR/install-jdk.sh --install openjdk11 --target $JAVA_HOME + - sudo ant -f Game/server/build.xml compile diff --git a/docker-compose.travis.yml b/docker-compose.travis.yml deleted file mode 100644 index 03f7d99..0000000 --- a/docker-compose.travis.yml +++ /dev/null @@ -1,115 +0,0 @@ -version: '3' -services: - - web: - image: nginx:alpine - container_name: nginx - volumes: - - "./etc/nginx/default.conf:/etc/nginx/conf.d/default.conf" - - "./Website:/var/www/html/public:ro" - - "./etc/nginx/default.template.conf:/etc/nginx/conf.d/default.template" - - "./etc/logs/nginx:/var/log/nginx" - - "./etc/logs/letsencrypt:/var/log/letsencrypt" - - "./etc/letsencrypt/certs:/etc/letsencrypt" - - "./etc/letsencrypt/data:/data/letsencrypt" - ports: - - "80:80" - - "443:443" - environment: - - NGINX_HOST=${NGINX_HOST} - command: /bin/sh -c "envsubst '$$NGINX_HOST' < /etc/nginx/conf.d/default.template > /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'" - restart: always - depends_on: - - php - - mysqldb -# logging: -# driver: splunk -# options: -# splunk-token: "e1c56fa1-9f7c-4d2c-ba8f-989b15d85008" -# splunk-url: "https://127.0.0.1:8088" -# splunk-insecureskipverify: "true" -# tag: "{{.ImageName}}/{{.Name}}/{{.ID}}" -# labels: "Nginx" - - php: - image: nanoninja/php-fpm:${PHP_VERSION} - container_name: php - restart: always - volumes: - - "./etc/php/php.ini:/usr/local/etc/php/conf.d/php.ini" - - "./Website:/var/www/html/public" -# logging: -# driver: splunk -# options: -# splunk-token: "e1c56fa1-9f7c-4d2c-ba8f-989b15d85008" -# splunk-url: "https://127.0.0.1:8088" -# splunk-insecureskipverify: "true" -# tag: "{{.ImageName}}/{{.Name}}/{{.ID}}" -# labels: "PHP" - - myadmin: - image: phpmyadmin/phpmyadmin - container_name: phpmyadmin - ports: - - "8080:80" - environment: - - PMA_ARBITRARY=1 - - PMA_HOST=${MYSQL_HOST} - restart: always - depends_on: - - mysqldb -# logging: -# driver: splunk -# options: -# splunk-token: "e1c56fa1-9f7c-4d2c-ba8f-989b15d85008" -# splunk-url: "https://127.0.0.1:8088" -# splunk-insecureskipverify: "true" -# tag: "{{.ImageName}}/{{.Name}}/{{.ID}}" -# labels: "PHPMyAdmin" - - mysqldb: - image: mariadb:${MARIADB_VERSION} - container_name: mysql - container_name: ${MYSQL_HOST} - restart: always - env_file: - - ".env" - environment: - - MYSQL_DATABASE=${MYSQL_DATABASE} - - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - - MYSQL_USER=${MYSQL_USER} - - MYSQL_PASSWORD=${MYSQL_PASSWORD} - ports: - - "3306:3306" - volumes: - - "./data/db/mysql:/var/lib/mysql" - - "./etc/mariadb/innodb-fix.cnf:/etc/mysql/conf.d/innodb-fix.cnf" -# logging: -# driver: splunk -# options: -# splunk-token: "e1c56fa1-9f7c-4d2c-ba8f-989b15d85008" -# splunk-url: "https://127.0.0.1:8088" -# splunk-insecureskipverify: "true" -# tag: "{{.ImageName}}/{{.Name}}/{{.ID}}" -# labels: "MySQL" - - tomcat: - image: tomcat:9.0.10-jre10-slim - container_name: tomcat - ports: - - "8082:8082" - - "8443:8443" - restart: always - volumes: - - "./Website:/usr/local/tomcat/webapps/ROOT" - - "./etc/tomcat:/usr/local/tomcat/conf" - depends_on: - - mysqldb -# logging: -# driver: splunk -# options: -# splunk-token: "e1c56fa1-9f7c-4d2c-ba8f-989b15d85008" -# splunk-url: "https://127.0.0.1:8088" -# splunk-insecureskipverify: "true" -# tag: "{{.ImageName}}/{{.Name}}/{{.ID}}" -# labels: "Tomcat"