From 625c87041721d0a65774cdd1fb89ad93d6683658 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sun, 13 Dec 2020 17:45:48 +0100 Subject: [PATCH] Added step to build docker image, and deleted travis config file --- .github/workflows/ci.yml | 14 ++++++++++ .travis.yml | 56 ---------------------------------------- README.md | 4 +-- 3 files changed, 16 insertions(+), 58 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22b459b9..4e5ff5b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -303,3 +303,17 @@ jobs: coverage-unit coverage-db coverage-api + + build-docker-image: + runs-on: ubuntu-20.04 + steps: + - name: Checkout code + uses: actions/checkout@v2 + - uses: marceloprado/has-changed-path@v1 + id: changed-dockerfile + with: + paths: ./Dockerfile + - if: ${{ steps.changed-dockerfile.outputs.changed == 'true' }} + run: docker build -t shlink-docker-image:temp . + - if: ${{ steps.changed-dockerfile.outputs.changed != 'true' }} + run: echo "Dockerfile didn't change. Skipped" diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index f3857e5d..00000000 --- a/.travis.yml +++ /dev/null @@ -1,56 +0,0 @@ -dist: bionic - -language: php - -branches: - only: - - /.*/ - -services: - - docker - -cache: - directories: - - $HOME/.composer/cache/files - -jobs: - fast_finish: true - allow_failures: - - php: '8.0' - include: - - name: 'CI - 8.0' - php: '8.0' - env: - - COMPOSER_FLAGS='--ignore-platform-req=php' - - name: 'CI - 7.4' - php: '7.4' - env: - - COMPOSER_FLAGS='' - -before_install: - - echo 'extension = apcu.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - - phpenv config-rm xdebug.ini || return 0 - - sudo ./data/infra/ci/install-ms-odbc.sh - - docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d shlink_db_ms shlink_db shlink_db_postgres shlink_db_maria - - yes | pecl install pdo_sqlsrv-5.9.0beta2 swoole-4.5.9 pcov - -install: - - composer self-update - - composer install --no-interaction --prefer-dist $COMPOSER_FLAGS - -before_script: - - docker-compose exec shlink_db_ms /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'Passw0rd!' -Q "CREATE DATABASE shlink_test;" - - mkdir build - - export DOCKERFILE_CHANGED=$(git diff ${TRAVIS_COMMIT_RANGE:-origin/main} --name-only | grep Dockerfile) - -script: - - composer ci - - bin/test/run-api-tests.sh - - if [[ ! -z "${DOCKERFILE_CHANGED}" && "${TRAVIS_PHP_VERSION}" == "7.4" ]]; then docker build -t shlink-docker-image:temp . ; fi - -after_success: - - rm -f build/clover.xml - - wget https://phar.phpunit.de/phpcov-7.0.2.phar - - php phpcov-7.0.2.phar merge build --clover build/clover.xml - - wget https://scrutinizer-ci.com/ocular.phar - - php ocular.phar code-coverage:upload --format=php-clover build/clover.xml diff --git a/README.md b/README.md index 1f6d2149..255c719e 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ ![Shlink](https://raw.githubusercontent.com/shlinkio/shlink.io/main/public/images/shlink-hero.png) -[![Build Status](https://img.shields.io/travis/com/shlinkio/shlink.svg?style=flat-square)](https://travis-ci.com/shlinkio/shlink) +[![Build Status](https://img.shields.io/github/workflow/status/shlinkio/shlink/Continuous%20integration/main?logo=github&style=flat-square)](https://github.com/shlinkio/shlink/actions?query=workflow%3A%22Continuous+integration%22) [![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/shlinkio/shlink.svg?style=flat-square)](https://scrutinizer-ci.com/g/shlinkio/shlink/) [![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/shlinkio/shlink.svg?style=flat-square)](https://scrutinizer-ci.com/g/shlinkio/shlink/) [![Latest Stable Version](https://img.shields.io/github/release/shlinkio/shlink.svg?style=flat-square)](https://packagist.org/packages/shlinkio/shlink) -[![Docker pulls](https://img.shields.io/docker/pulls/shlinkio/shlink.svg?style=flat-square)](https://hub.docker.com/r/shlinkio/shlink/) +[![Docker pulls](https://img.shields.io/docker/pulls/shlinkio/shlink.svg?logo=docker&style=flat-square)](https://hub.docker.com/r/shlinkio/shlink/) [![License](https://img.shields.io/github/license/shlinkio/shlink.svg?style=flat-square)](https://github.com/shlinkio/shlink/blob/main/LICENSE) [![Paypal donate](https://img.shields.io/badge/Donate-paypal-blue.svg?style=flat-square&logo=paypal&colorA=aaaaaa)](https://slnk.to/donate)