From 0bb0f580d0c01dc54b19451f7fe1d382d6faeeba Mon Sep 17 00:00:00 2001 From: Oleg Bespalov Date: Thu, 1 Oct 2020 15:44:29 +0200 Subject: [PATCH 1/9] initial config --- .github/workflows/php.yml | 40 +++++++++++++++++++++++++++++++++++++++ .travis.yml | 21 -------------------- 2 files changed, 40 insertions(+), 21 deletions(-) create mode 100644 .github/workflows/php.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml new file mode 100644 index 0000000..d4c250f --- /dev/null +++ b/.github/workflows/php.yml @@ -0,0 +1,40 @@ +name: Code Checks + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + run: + runs-on: self-hosted + strategy: + matrix: + php-versions: ['7.1', '7.2'] + name: PHP ${{ matrix.php-versions }} + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-versions }} + env: + runner: self-hosted + + - name: Validate composer.json and composer.lock + run: composer validate + + - name: Cache Composer packages + id: composer-cache + uses: actions/cache@v2 + with: + path: vendor + key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }} + restore-keys: | + ${{ runner.os }}-php- + + - name: Tests Coverage + run: vendor/bin/phpunit --coverage-clover=coverage.xml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b5776a5..0000000 --- a/.travis.yml +++ /dev/null @@ -1,21 +0,0 @@ -language: php - -php: - - 7.1 - - 7.2 - -before_script: - - composer self-update - - composer install --prefer-source --no-interaction - -script: -- vendor/bin/phpunit --coverage-clover=coverage.xml - -after_success: -# Submit coverage report to https://codecov.io -- bash <(curl -s https://codecov.io/bash) - -# You can delete the cache using travis-ci web interface -cache: - directories: - - $HOME/.composer/cache \ No newline at end of file From d36690cfa7c6ca0abadb93d0fe5bb1c9544b9dc4 Mon Sep 17 00:00:00 2001 From: Oleg Bespalov Date: Thu, 1 Oct 2020 15:47:59 +0200 Subject: [PATCH 2/9] change to the ubuntu-18.04 --- .github/workflows/php.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index d4c250f..b451ee2 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -8,7 +8,7 @@ on: jobs: run: - runs-on: self-hosted + runs-on: ubuntu-18.04 strategy: matrix: php-versions: ['7.1', '7.2'] @@ -22,7 +22,7 @@ jobs: with: php-version: ${{ matrix.php-versions }} env: - runner: self-hosted + runner: ubuntu-18.04 - name: Validate composer.json and composer.lock run: composer validate From a53a1b26706e19f61cb6cb21f5b10f2d88590a98 Mon Sep 17 00:00:00 2001 From: Oleg Bespalov Date: Thu, 1 Oct 2020 15:50:30 +0200 Subject: [PATCH 3/9] install packages --- .github/workflows/php.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index b451ee2..0caf420 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -27,6 +27,9 @@ jobs: - name: Validate composer.json and composer.lock run: composer validate + - name: Install composer packages + run: composer install --prefer-source --no-interaction + - name: Cache Composer packages id: composer-cache uses: actions/cache@v2 From 0880b3120e48f9dd7eecf5bb8a1bde848a7b46c0 Mon Sep 17 00:00:00 2001 From: Oleg Bespalov Date: Thu, 1 Oct 2020 16:01:04 +0200 Subject: [PATCH 4/9] proper caching composer --- .github/workflows/php.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 0caf420..bc1758b 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -27,17 +27,20 @@ jobs: - name: Validate composer.json and composer.lock run: composer validate - - name: Install composer packages - run: composer install --prefer-source --no-interaction + - name: Get composer cache directory + id: composercache + run: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache Composer packages id: composer-cache uses: actions/cache@v2 with: - path: vendor - key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }} - restore-keys: | - ${{ runner.os }}-php- + path: ${{ steps.composercache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: ${{ runner.os }}-composer- + + - name: Install composer packages + run: composer install --prefer-dist --no-interaction - name: Tests Coverage run: vendor/bin/phpunit --coverage-clover=coverage.xml From 5279b1a61266725e0cd5cb4a64149630635406f7 Mon Sep 17 00:00:00 2001 From: Oleg Bespalov Date: Thu, 1 Oct 2020 16:02:10 +0200 Subject: [PATCH 5/9] fix the spaces --- .github/workflows/php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index bc1758b..a2fc220 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -40,7 +40,7 @@ jobs: restore-keys: ${{ runner.os }}-composer- - name: Install composer packages - run: composer install --prefer-dist --no-interaction + run: composer install --prefer-dist --no-interaction - name: Tests Coverage run: vendor/bin/phpunit --coverage-clover=coverage.xml From 592169e4fb01d9537dfe7b1dddec03b4118551f0 Mon Sep 17 00:00:00 2001 From: Oleg Bespalov Date: Thu, 1 Oct 2020 16:20:59 +0200 Subject: [PATCH 6/9] code coverage action --- .github/workflows/php.yml | 15 +++++++++++---- README.md | 1 - 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index a2fc220..cba2e2a 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -1,17 +1,17 @@ -name: Code Checks +name: CI Code Checks on: - push: - branches: [ master ] pull_request: + push: branches: [ master ] jobs: run: runs-on: ubuntu-18.04 strategy: + fail-fast: false matrix: - php-versions: ['7.1', '7.2'] + php-versions: ['7.1', '7.2', '7.3', '7.4'] name: PHP ${{ matrix.php-versions }} steps: - name: Checkout @@ -44,3 +44,10 @@ jobs: - name: Tests Coverage run: vendor/bin/phpunit --coverage-clover=coverage.xml + + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v1 + with: + file: ./coverage.xml + flags: unittests + fail_ci_if_error: true diff --git a/README.md b/README.md index 017124b..c681a73 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ ## LaravelShoppingcart -[![Build Status](https://travis-ci.org/bumbummen99/LaravelShoppingcart.png?branch=master)](https://travis-ci.org/bumbummen99/LaravelShoppingcart) [![codecov](https://codecov.io/gh/bumbummen99/LaravelShoppingcart/branch/master/graph/badge.svg)](https://codecov.io/gh/bumbummen99/LaravelShoppingcart) [![StyleCI](https://styleci.io/repos/152610878/shield?branch=master)](https://styleci.io/repos/152610878) [![Total Downloads](https://poser.pugx.org/bumbummen99/shoppingcart/downloads.png)](https://packagist.org/packages/bumbummen99/shoppingcart) From a1a43b94d840ec0165b70fe7847a282209c78468 Mon Sep 17 00:00:00 2001 From: Oleg Bespalov Date: Thu, 1 Oct 2020 16:25:44 +0200 Subject: [PATCH 7/9] pass php version also --- .github/workflows/php.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index cba2e2a..3980067 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -12,6 +12,8 @@ jobs: fail-fast: false matrix: php-versions: ['7.1', '7.2', '7.3', '7.4'] + env: + PHP_VERSION: ${{ matrix.php-versions }} name: PHP ${{ matrix.php-versions }} steps: - name: Checkout @@ -50,4 +52,5 @@ jobs: with: file: ./coverage.xml flags: unittests + env_vars: PHP_VERSION fail_ci_if_error: true From b260c4f845d663c55bb5fe654bbc90967c3e2d3c Mon Sep 17 00:00:00 2001 From: Oleg Bespalov Date: Thu, 1 Oct 2020 16:27:17 +0200 Subject: [PATCH 8/9] fix the env place --- .github/workflows/php.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 3980067..c594659 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -12,8 +12,8 @@ jobs: fail-fast: false matrix: php-versions: ['7.1', '7.2', '7.3', '7.4'] - env: - PHP_VERSION: ${{ matrix.php-versions }} + env: + PHP_VERSION: ${{ matrix.php-versions }} name: PHP ${{ matrix.php-versions }} steps: - name: Checkout From 0783ab3a55beb278553977cc2c9984a0c6ffd0af Mon Sep 17 00:00:00 2001 From: Oleg Bespalov Date: Thu, 1 Oct 2020 18:13:44 +0200 Subject: [PATCH 9/9] CI status with the github actions --- README.md | 1 + README_Idn.md | 2 +- README_uk-UA.md | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c681a73..98a09b4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ ## LaravelShoppingcart +![CI Code Checks](https://github.com/bumbummen99/LaravelShoppingcart/workflows/CI%20Code%20Checks/badge.svg?branch=master) [![codecov](https://codecov.io/gh/bumbummen99/LaravelShoppingcart/branch/master/graph/badge.svg)](https://codecov.io/gh/bumbummen99/LaravelShoppingcart) [![StyleCI](https://styleci.io/repos/152610878/shield?branch=master)](https://styleci.io/repos/152610878) [![Total Downloads](https://poser.pugx.org/bumbummen99/shoppingcart/downloads.png)](https://packagist.org/packages/bumbummen99/shoppingcart) diff --git a/README_Idn.md b/README_Idn.md index 3839008..5861093 100644 --- a/README_Idn.md +++ b/README_Idn.md @@ -1,5 +1,5 @@ ## LaravelShoppingcart -[![Build Status](https://travis-ci.org/bumbummen99/LaravelShoppingcart.png?branch=master)](https://travis-ci.org/bumbummen99/LaravelShoppingcart) +![CI Code Checks](https://github.com/bumbummen99/LaravelShoppingcart/workflows/CI%20Code%20Checks/badge.svg?branch=master) [![codecov](https://codecov.io/gh/bumbummen99/LaravelShoppingcart/branch/master/graph/badge.svg)](https://codecov.io/gh/bumbummen99/LaravelShoppingcart) [![StyleCI](https://styleci.io/repos/152610878/shield?branch=master)](https://styleci.io/repos/152610878) [![Total Downloads](https://poser.pugx.org/bumbummen99/shoppingcart/downloads.png)](https://packagist.org/packages/bumbummen99/shoppingcart) diff --git a/README_uk-UA.md b/README_uk-UA.md index af44477..fb27de2 100644 --- a/README_uk-UA.md +++ b/README_uk-UA.md @@ -1,5 +1,5 @@ ## LaravelShoppingcart -[![Build Status](https://travis-ci.org/bumbummen99/LaravelShoppingcart.png?branch=master)](https://travis-ci.org/bumbummen99/LaravelShoppingcart) +![CI Code Checks](https://github.com/bumbummen99/LaravelShoppingcart/workflows/CI%20Code%20Checks/badge.svg?branch=master) [![codecov](https://codecov.io/gh/bumbummen99/LaravelShoppingcart/branch/master/graph/badge.svg)](https://codecov.io/gh/bumbummen99/LaravelShoppingcart) [![StyleCI](https://styleci.io/repos/152610878/shield?branch=master)](https://styleci.io/repos/152610878) [![Total Downloads](https://poser.pugx.org/bumbummen99/shoppingcart/downloads.png)](https://packagist.org/packages/bumbummen99/shoppingcart)