From 586dd79f5535ada4d341e1352895cf49188c892a Mon Sep 17 00:00:00 2001 From: Malvika Chauhan Date: Mon, 28 Feb 2022 11:58:57 +0100 Subject: [PATCH 1/6] Adding git hub integration --- .github/workflows/tests.yaml | 45 ++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/workflows/tests.yaml diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml new file mode 100644 index 0000000..4f36c93 --- /dev/null +++ b/.github/workflows/tests.yaml @@ -0,0 +1,45 @@ +name: Test + +on: [push, pull_request] + +jobs: + test: + name: PHP ${{ matrix.php-version }}) + + runs-on: ubuntu-18.04 + + strategy: + fail-fast: false + matrix: + php-version: + - 7.1 + - 7.2 + - 7.3 + - 7.4 + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Install PHP with extensions + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-version }} + coverage: pcov + tools: composer:v2 + + - name: Install Composer dependencies + uses: ramsey/composer-install@v1 + with: + composer-options: --prefer-dist + + - name: Setup PCOV + run: | + composer require pcov/clobber + vendor/bin/pcov clobber + + - name: Run Tests + run: composer tests + + - name: Check coding style + run: composer coding-style From 88852dd77480236fe34181beff3a1680b2bc5aa2 Mon Sep 17 00:00:00 2001 From: Malvika Chauhan Date: Mon, 28 Feb 2022 12:05:20 +0100 Subject: [PATCH 2/6] Adding tests command to composer.json --- composer.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 10228d1..40677e0 100644 --- a/composer.json +++ b/composer.json @@ -39,5 +39,9 @@ "branch-alias": { "dev-master": "1.0.x-dev" } - } + }, + "scripts": { + "tests": "phpunit", + "coding-style": "phpcs --standard=vendor/internations/kodierungsregelwerksammlung/ruleset.xml ./src/" + } } From eb23e6e9f045aced02eea8c87e09687fd9a0fc83 Mon Sep 17 00:00:00 2001 From: Malvika Chauhan Date: Mon, 28 Feb 2022 12:18:30 +0100 Subject: [PATCH 3/6] Fixing kodierungsregelwerksammlung version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 40677e0..f40fb6e 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ }, "require-dev": { "internations/testing-component": "dev-master", - "internations/kodierungsregelwerksammlung": "dev-master", + "internations/kodierungsregelwerksammlung": "^0.35.0", "phpunit/phpunit": "~6" }, "autoload": { From 7941bdc00ccfdbb9413a59ba9339228e716229e7 Mon Sep 17 00:00:00 2001 From: Malvika Chauhan Date: Mon, 28 Feb 2022 12:25:40 +0100 Subject: [PATCH 4/6] Travis clean up --- .travis.yml | 18 ------------------ README.md | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index e6e7677..0000000 --- a/.travis.yml +++ /dev/null @@ -1,18 +0,0 @@ -language: php -php: - - 7.1 - - 7.2 - - 7.3 - - 7.4 - - nightly - -matrix: - allow_failures: - - php: nightly - -before_script: - - composer install - -script: - - vendor/bin/phpcs --standard=vendor/internations/kodierungsregelwerksammlung/ruleset.xml src/ - - vendor/bin/phpunit --exclude-group performance diff --git a/README.md b/README.md index 8dd1bc2..6823eef 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # SolrQueryComponent -[![Build Status](https://travis-ci.org/InterNations/SolrQueryComponent.svg)](https://travis-ci.org/InterNations/SolrQueryComponent) +[![Test](https://github.com/InterNations/SolrQueryComponent/actions/workflows/tests.yaml/badge.svg)](https://github.com/InterNations/SolrQueryComponent/actions/workflows/tests.yaml) #### Build Solr queries with ease From 1148807d12d14e2fcef78e3d7b3a48c1a148b620 Mon Sep 17 00:00:00 2001 From: Malvika Chauhan Date: Mon, 28 Feb 2022 12:27:26 +0100 Subject: [PATCH 5/6] Remove extra bracket from name --- .github/workflows/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 4f36c93..6aa8f46 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: test: - name: PHP ${{ matrix.php-version }}) + name: PHP ${{ matrix.php-version }} runs-on: ubuntu-18.04 From 987ef7826e13cb56e3995dff81b8d97583f534b2 Mon Sep 17 00:00:00 2001 From: Malvika Chauhan Date: Mon, 28 Feb 2022 12:30:04 +0100 Subject: [PATCH 6/6] Replace tabs with spaces --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index f40fb6e..c3653e2 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ }, "require-dev": { "internations/testing-component": "dev-master", - "internations/kodierungsregelwerksammlung": "^0.35.0", + "internations/kodierungsregelwerksammlung": "^0.35.0", "phpunit/phpunit": "~6" }, "autoload": { @@ -40,8 +40,8 @@ "dev-master": "1.0.x-dev" } }, - "scripts": { - "tests": "phpunit", - "coding-style": "phpcs --standard=vendor/internations/kodierungsregelwerksammlung/ruleset.xml ./src/" - } + "scripts": { + "tests": "phpunit", + "coding-style": "phpcs --standard=vendor/internations/kodierungsregelwerksammlung/ruleset.xml ./src/" + } }