From 6e10f38dde714c276fefeefa0548ac9908fcfa63 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Fri, 15 Jan 2021 11:16:44 +0100 Subject: [PATCH 1/4] Remove travis yaml --- .travis.yml | 66 ----------------------------------------------------- 1 file changed, 66 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b3df58c9..00000000 --- a/.travis.yml +++ /dev/null @@ -1,66 +0,0 @@ -sudo: false -dist: trusty -language: php -matrix: - include: - - language: php - php: 5.6 - env: - - SYMFONY=^2.8 - - ES_VERSION=^5.0 - - ES_DOWNLOAD_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.14.zip" - - ENABLE_SWAP=true - - - language: php - php: 7.0 - env: - - SYMFONY=^3.4 - - ES_VERSION=^5.0 - - ES_DOWNLOAD_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.14.zip" - - - language: php - php: 7.2 - env: - - SYMFONY=^3.4 - - ES_VERSION=^5.0 - - ES_DOWNLOAD_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.14.zip" - - - language: php - php: 7.3 - env: - - SYMFONY=^4.4 - - ES_VERSION=^5.0 - - ES_DOWNLOAD_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.14.zip" - - - language: php - php: 7.4 - env: - - SYMFONY=^5.0 - - ES_VERSION=^5.0 - - ES_DOWNLOAD_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.14.zip" - -before_install: - - composer self-update --snapshot # remove when composer 2 is released - -install: - # install elasticsearch - - wget ${ES_DOWNLOAD_URL} - - unzip elasticsearch-*.zip - - cd ./elasticsearch-* - - bin/elasticsearch -d - - cd .. - -before_script: - - echo 'memory_limit=-1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - - composer require --no-update symfony/symfony:${SYMFONY} - - composer require --no-update elasticsearch/elasticsearch:${ES_VERSION} - - if [[ $TRAVIS_SECURE_ENV_VARS = "true" ]]; then composer config -g github-oauth.github.com $GITHUB_COMPOSER_AUTH; fi - - composer install --no-interaction --prefer-dist - -script: - - wget -q --waitretry=1 --retry-connrefused -T 10 -O - http://127.0.0.1:9200 - - vendor/bin/simple-phpunit --coverage-clover=coverage.clover - - vendor/bin/phpcs -p --standard=PSR2 --ignore=vendor/,Tests/app/,var/,Profiler/Handler/BackwardCompatibilityWriteTrait.php ./ - -after_script: - - travis_retry php vendor/bin/coveralls From bf856405871ec163845f92a5ec8e91f239dabfaf Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Fri, 15 Jan 2021 11:31:25 +0100 Subject: [PATCH 2/4] Fix elasticsearch host in .github actions --- .github/workflows/test-application.yaml | 10 +++++----- Tests/app/config/config_test.yml | 7 +++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index 7118ec01..61ee4d6b 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -21,35 +21,35 @@ jobs: symfony-version: '^2.8' elasticsearch-package-constraint: '^5.0' env: - ELASTICSEARCH_HOST: '127.0.0.1:9205' + SYMFONY__ELASTICSEARCH_HOST: '127.0.0.1:9205' - php-version: '7.0' lint: false symfony-version: '^3.4' elasticsearch-package-constraint: '^5.0' env: - ELASTICSEARCH_HOST: '127.0.0.1:9205' + SYMFONY__ELASTICSEARCH_HOST: '127.0.0.1:9205' - php-version: '7.2' lint: false symfony-version: '^3.4' elasticsearch-package-constraint: '^5.0' env: - ELASTICSEARCH_HOST: '127.0.0.1:9205' + SYMFONY__ELASTICSEARCH_HOST: '127.0.0.1:9205' - php-version: '7.3' lint: false symfony-version: '^4.4' elasticsearch-package-constraint: '^5.0' env: - ELASTICSEARCH_HOST: '127.0.0.1:9205' + SYMFONY__ELASTICSEARCH_HOST: '127.0.0.1:9205' - php-version: '7.4' lint: true symfony-version: '^5.0' elasticsearch-package-constraint: '^5.0' env: - ELASTICSEARCH_HOST: '127.0.0.1:9205' + SYMFONY__ELASTICSEARCH_HOST: '127.0.0.1:9205' services: elasticsearch5: diff --git a/Tests/app/config/config_test.yml b/Tests/app/config/config_test.yml index 9b2d8d9e..f964b20c 100644 --- a/Tests/app/config/config_test.yml +++ b/Tests/app/config/config_test.yml @@ -1,3 +1,6 @@ +parameters: + elasticsearch_host: '127.0.0.1:9200' + # Framework Configuration framework: secret: "SUPER-TOP-SECRET" @@ -21,7 +24,7 @@ ongr_elasticsearch: custom_dir: index: hosts: - - 127.0.0.1:9200 + - '%elasticsearch_host%' index_name: ongr-custom-document-dir-test mappings: TestBundle: @@ -29,7 +32,7 @@ ongr_elasticsearch: default: index: hosts: - - 127.0.0.1:9200 + - '%elasticsearch_host%' index_name: ongr-esb-test settings: refresh_interval: -1 From 2c87d98078f8297a49980257f306843c5490079a Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Fri, 15 Jan 2021 11:43:14 +0100 Subject: [PATCH 3/4] Fix test again ES --- .github/workflows/test-application.yaml | 40 ++++--------------------- Tests/app/config/config_test.yml | 7 ++--- 2 files changed, 8 insertions(+), 39 deletions(-) diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index 61ee4d6b..a3e4f612 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -19,61 +19,33 @@ jobs: - php-version: '5.6' lint: false symfony-version: '^2.8' - elasticsearch-package-constraint: '^5.0' - env: - SYMFONY__ELASTICSEARCH_HOST: '127.0.0.1:9205' + elasticsearch-package-constraint: '^5.0' - php-version: '7.0' lint: false symfony-version: '^3.4' - elasticsearch-package-constraint: '^5.0' - env: - SYMFONY__ELASTICSEARCH_HOST: '127.0.0.1:9205' + elasticsearch-package-constraint: '^5.0' - php-version: '7.2' lint: false symfony-version: '^3.4' - elasticsearch-package-constraint: '^5.0' - env: - SYMFONY__ELASTICSEARCH_HOST: '127.0.0.1:9205' + elasticsearch-package-constraint: '^5.0' - php-version: '7.3' lint: false symfony-version: '^4.4' - elasticsearch-package-constraint: '^5.0' - env: - SYMFONY__ELASTICSEARCH_HOST: '127.0.0.1:9205' + elasticsearch-package-constraint: '^5.0' - php-version: '7.4' lint: true symfony-version: '^5.0' - elasticsearch-package-constraint: '^5.0' - env: - SYMFONY__ELASTICSEARCH_HOST: '127.0.0.1:9205' + elasticsearch-package-constraint: '^5.0' services: elasticsearch5: image: elasticsearch:5.6.14 ports: - - 9205:9200 - env: - discovery.type: 'single-node' - xpack.security.enabled: 'false' - options: --health-cmd="curl http://localhost:9200/_cluster/health" --health-interval=10s --health-timeout=5s --health-retries=5 - - elasticsearch6: - image: elasticsearch:6.8.4 - ports: - - 9206:9200 - env: - discovery.type: 'single-node' - xpack.security.enabled: 'false' - options: --health-cmd="curl http://localhost:9200/_cluster/health" --health-interval=10s --health-timeout=5s --health-retries=5 - - elasticsearch7: - image: elasticsearch:7.9.3 - ports: - - 9202:9200 + - 9200:9200 env: discovery.type: 'single-node' xpack.security.enabled: 'false' diff --git a/Tests/app/config/config_test.yml b/Tests/app/config/config_test.yml index f964b20c..9b2d8d9e 100644 --- a/Tests/app/config/config_test.yml +++ b/Tests/app/config/config_test.yml @@ -1,6 +1,3 @@ -parameters: - elasticsearch_host: '127.0.0.1:9200' - # Framework Configuration framework: secret: "SUPER-TOP-SECRET" @@ -24,7 +21,7 @@ ongr_elasticsearch: custom_dir: index: hosts: - - '%elasticsearch_host%' + - 127.0.0.1:9200 index_name: ongr-custom-document-dir-test mappings: TestBundle: @@ -32,7 +29,7 @@ ongr_elasticsearch: default: index: hosts: - - '%elasticsearch_host%' + - 127.0.0.1:9200 index_name: ongr-esb-test settings: refresh_interval: -1 From 37af2fc3ab6721b1557d474fa1fb9ae0c6c553f5 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Fri, 15 Jan 2021 12:12:53 +0100 Subject: [PATCH 4/4] Fix github actions --- .coveralls.yml | 3 --- .github/workflows/test-application.yaml | 9 ++------- .scrutinizer.yml | 5 ----- composer.json | 3 +-- 4 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 .coveralls.yml delete mode 100644 .scrutinizer.yml diff --git a/.coveralls.yml b/.coveralls.yml deleted file mode 100644 index 79d33a69..00000000 --- a/.coveralls.yml +++ /dev/null @@ -1,3 +0,0 @@ -coverage_clover: coverage.clover -json_path: ./coveralls.json -repo_token: PpZCCrM6aBtU9l5xdzeOFj8bakIcaJqgD diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index a3e4f612..b7e92c6a 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -83,12 +83,7 @@ jobs: - name: Fix code style if: ${{ matrix.lint }} - run: vendor/bin/phpcs -p --standard=PSR2 --ignore=vendor/,Tests/app/ ./ + run: vendor/bin/phpcs -p --standard=PSR2 --ignore=vendor/,Tests/app/,Profiler/Handler/BackwardCompatibilityWriteTrait.php ./ - name: Run tests - run: vendor/bin/simple-phpunit --coverage-clover=coverage.clover - - - name: Upload coverage results to Coveralls - run: vendor/bin/php-coveralls -v - env: - COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: vendor/bin/simple-phpunit diff --git a/.scrutinizer.yml b/.scrutinizer.yml deleted file mode 100644 index 8d17ca3b..00000000 --- a/.scrutinizer.yml +++ /dev/null @@ -1,5 +0,0 @@ -imports: - - php -filter: - excluded_paths: - - Tests/* diff --git a/composer.json b/composer.json index e3253788..695d0cc9 100644 --- a/composer.json +++ b/composer.json @@ -39,8 +39,7 @@ "symfony/phpunit-bridge": "^5.1", "symfony/dependency-injection": "^2.8|^3.4|^4|^5", "symfony/validator": "^2.8|^3.4|^4|^5", - "symfony/options-resolver": "^2.8|^3.4|^4|^5", - "php-coveralls/php-coveralls": "^2.4.3" + "symfony/options-resolver": "^2.8|^3.4|^4|^5" }, "autoload": { "psr-4": { "ONGR\\ElasticsearchBundle\\": "" },