Skip to content

Commit

Permalink
Merge 3c6c22a into 03c96db
Browse files Browse the repository at this point in the history
  • Loading branch information
OskarStark committed Feb 24, 2020
2 parents 03c96db + 3c6c22a commit e9a0c5a
Show file tree
Hide file tree
Showing 5 changed files with 112 additions and 13 deletions.
50 changes: 50 additions & 0 deletions .github/workflows/test_prefer_lowest.yaml
@@ -0,0 +1,50 @@
on:
pull_request:
paths:
- 'src/**'
- 'tests/**'
- '.github/workflows/**'

push:
branches:
- develop
- master

name: Test

env:
SYMFONY_DEPRECATIONS_HELPER: max[self]=0
PHPUNIT_VERSION: 8
PHP_EXTENSIONS: "json" # just for testing now
PHP_INI_VALUES: "memory_limit=3072M"

jobs:
test:
name: PHP ${{ matrix.php-version }} + --prefer-lowest

runs-on: ubuntu-16.04 # xenial

strategy:
matrix:
php-version:
- "7.2"
- "7.3"
- "7.4"

steps:
- name: "Checkout"
uses: actions/checkout@v2.0.0

- name: "Install PHP with extensions"
uses: "shivammathur/setup-php@v1"
with:
coverage: "none"
extensions: "${{ env.PHP_EXTENSIONS }}"
php-version: "${{ matrix.php-version }}"
ini-values: "${{ env.PHP_INI_VALUES }}"
tools: phpunit:8.5.2

- run: composer update --prefer-dist --no-interaction --prefer-stable --no-progress --prefer-lowest

- name: "Run tests via PHPUnit"
run: phpunit -c phpunit.xml.dist
60 changes: 60 additions & 0 deletions .github/workflows/test_variants.yaml
@@ -0,0 +1,60 @@
on:
pull_request:
paths:
- 'src/**'
- 'tests/**'
- '.github/workflows/**'

push:
branches:
- develop
- master

name: Test

env:
SYMFONY_DEPRECATIONS_HELPER: max[self]=0
PHPUNIT_VERSION: 8
PHP_EXTENSIONS: "json" # just for testing now
PHP_INI_VALUES: "memory_limit=3072M"

jobs:
test:
name: PHP ${{ matrix.php-version }} + ${{ matrix.variant }}

runs-on: ubuntu-16.04 # xenial

strategy:
matrix:
php-version:
- "7.3"
variant:
- "SYMFONY=4.4.*"
- "SYMFONY='dev-master as 4.4.x-dev'"
- "SONATA_CORE=3.*"
- "SONATA_CORE='dev-master as 3.x-dev'"
- "SONATA_BLOCK=3.*"
- "SONATA_BLOCK='dev-master as 3.x-dev'"
- "SYMFONY_DEPRECATIONS_HELPER=0"

steps:
- name: "Checkout"
uses: actions/checkout@v2.0.0

- name: "Install PHP with extensions"
uses: "shivammathur/setup-php@v1"
with:
coverage: "none"
extensions: "${{ env.PHP_EXTENSIONS }}"
php-version: "${{ matrix.php-version }}"
ini-values: "${{ env.PHP_INI_VALUES }}"
tools: phpunit:8.5.2

- run: composer update --prefer-dist --no-interaction --prefer-stable --no-progress

- run: export ${{ matrix.variant }}

- run: sh .travis/before_install_test.sh

- name: "Run tests via PHPUnit"
run: phpunit -c phpunit.xml.dist
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -47,7 +47,7 @@ matrix:
- php: '7.3'
env: SONATA_BLOCK='dev-master as 3.x-dev'
- php: '7.3'
env: SYMFONY_DEPRECATIONS_HELPER=0
env:
allow_failures:
- php: 7.4snapshot
- php: nightly
Expand Down
7 changes: 1 addition & 6 deletions .travis/before_install_test.sh
@@ -1,12 +1,7 @@
#!/usr/bin/env bash
set -ev

PHP_INI_DIR="$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/"
TRAVIS_INI_FILE="$PHP_INI_DIR/travis.ini"
echo "memory_limit=3072M" >> "$TRAVIS_INI_FILE"


sed --in-place "s/\"dev-master\":/\"dev-${TRAVIS_COMMIT}\":/" composer.json
sed --in-place "s/\"dev-master\":/\"dev-${GITHUB_SHA}\":/" composer.json

if [ "$SYMFONY" != "" ]; then composer require "symfony/symfony:$SYMFONY" --no-update; fi;
if [ "$SONATA_CORE" != "" ]; then composer require "sonata-project/core-bundle:$SONATA_CORE" --no-update; fi;
Expand Down
6 changes: 0 additions & 6 deletions .travis/check_relevant_test.sh

This file was deleted.

0 comments on commit e9a0c5a

Please sign in to comment.