From 5693e752c708ea4eaa2965c1ff9f988855cf2124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Delano=C3=AB?= Date: Thu, 6 Aug 2020 12:34:07 +0000 Subject: [PATCH 1/3] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aee85e5..22b98b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ before_script: # Install dependencies - apt-get install git nodejs libcurl4-gnutls-dev libicu-dev libmcrypt-dev libvpx-dev libjpeg-dev libpng-dev libxpm-dev zlib1g-dev libfreetype6-dev libxml2-dev libexpat1-dev libbz2-dev libgmp3-dev libldap2-dev unixodbc-dev libpq-dev libsqlite3-dev libaspell-dev libsnmp-dev libpcre3-dev libtidy-dev -yqq #- apt-get install php-mbstring php-curl php-json php-intl php-gd php-xml php-zip php-bz2 -yqq - - apt-get install mariadb-server + - apt-get install mariadb-server -yqq # Install php extensions - docker-php-ext-install pdo pdo_mysql tokenizer xml pcntl curl json php-mysql # - docker-php-ext-install mbstring intl gd xml bz2 opcache pdo_mysql curl json zip From 9bd71b8b56d5bb10a163bad446951669712b84cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Delano=C3=AB?= Date: Thu, 6 Aug 2020 12:38:51 +0000 Subject: [PATCH 2/3] Update .gitlab-ci.yml --- .gitlab-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 22b98b5..52b27c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,9 +10,10 @@ services: - mariadb:latest variables: - MYSQL_DATABASE: portal - MYSQL_USER: root - MYSQL_ROOT_PASSWORD: secret + MYSQL_DATABASE: "portal" + MYSQL_USER: "root" + MYSQL_PASSWORD: "app" + MYSQL_ROOT_PASSWORD: "secret" # This folder is cached between builds # http://docs.gitlab.com/ce/ci/yaml/README.html#cache @@ -35,7 +36,7 @@ before_script: #- apt-get install php-mbstring php-curl php-json php-intl php-gd php-xml php-zip php-bz2 -yqq - apt-get install mariadb-server -yqq # Install php extensions - - docker-php-ext-install pdo pdo_mysql tokenizer xml pcntl curl json php-mysql + - docker-php-ext-install pdo pdo_mysql tokenizer xml pcntl curl json # - docker-php-ext-install mbstring intl gd xml bz2 opcache pdo_mysql curl json zip # Install & enable Xdebug for code coverage reports - pecl install xdebug From 1c46c47de31f28921d6248c80b087b890517c06f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Delano=C3=AB?= Date: Thu, 6 Aug 2020 12:50:10 +0000 Subject: [PATCH 3/3] Update .gitlab-ci.yml --- .gitlab-ci.yml | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52b27c7..e8af014 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,13 +7,11 @@ image: php:latest # Only needed when using a docker container to run your tests in. # Check out: http://docs.gitlab.com/ce/ci/docker/using_docker_images.html#what-is-a-service services: - - mariadb:latest + - mysql:latest variables: - MYSQL_DATABASE: "portal" - MYSQL_USER: "root" - MYSQL_PASSWORD: "app" - MYSQL_ROOT_PASSWORD: "secret" + MYSQL_DATABASE: portal + MYSQL_ROOT_PASSWORD: secret # This folder is cached between builds # http://docs.gitlab.com/ce/ci/yaml/README.html#cache @@ -30,14 +28,11 @@ before_script: # Prep for Node - apt-get install gnupg -yqq # Upgrade to Node 8 - - curl -sL https://deb.nodesource.com/setup_10.x | bash - + - curl -sL https://deb.nodesource.com/setup_8.x | bash - # Install dependencies - apt-get install git nodejs libcurl4-gnutls-dev libicu-dev libmcrypt-dev libvpx-dev libjpeg-dev libpng-dev libxpm-dev zlib1g-dev libfreetype6-dev libxml2-dev libexpat1-dev libbz2-dev libgmp3-dev libldap2-dev unixodbc-dev libpq-dev libsqlite3-dev libaspell-dev libsnmp-dev libpcre3-dev libtidy-dev -yqq - #- apt-get install php-mbstring php-curl php-json php-intl php-gd php-xml php-zip php-bz2 -yqq - - apt-get install mariadb-server -yqq # Install php extensions - - docker-php-ext-install pdo pdo_mysql tokenizer xml pcntl curl json -# - docker-php-ext-install mbstring intl gd xml bz2 opcache pdo_mysql curl json zip + - docker-php-ext-install mbstring pdo_mysql curl json intl gd xml zip bz2 opcache # Install & enable Xdebug for code coverage reports - pecl install xdebug - docker-php-ext-enable xdebug @@ -46,7 +41,7 @@ before_script: - php composer.phar install # Install Node dependencies. # comment this out if you don't have a node dependency -# - npm install + # - npm install # Copy over testing configuration. # Don't forget to set the database config in .env.testing correctly # DB_HOST=mysql @@ -58,11 +53,10 @@ before_script: # comment this out if you don't have a frontend build # you can change this to to your frontend building script like # npm run build -# - npm run dev + # - npm run dev # Generate an application key. Re-cache. - php artisan key:generate -# - php artisan config:cache - - php artisan optimize + - php artisan config:cache # Run database migrations. - php artisan migrate # Run database seed @@ -71,9 +65,9 @@ before_script: test: script: # run laravel tests - - php artisan test + - php vendor/bin/phpunit --coverage-text --colors=never # run frontend tests # if you have any task for testing frontend # set it in your package.json script # comment this out if you don't have a frontend test -# - npm test + - npm test