From 28b23865b0f66dcbaf26c9c1e5d36506fa2e6d44 Mon Sep 17 00:00:00 2001 From: Tavo Nieves J Date: Mon, 11 Jan 2021 11:51:34 -0500 Subject: [PATCH 1/2] Fix GitHub Actions for PR's --- .github/workflows/main.yml | 144 ++++++++++++++++++++----------------- 1 file changed, 78 insertions(+), 66 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 68c338f5..f9df29cf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,71 +9,83 @@ jobs: strategy: matrix: php: [7.3, 7.4, 8.0] - symfony: [3.4, 4.4, 5] + symfony: [3.4, 4.4, 5.2] steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - tools: composer:v2 - extensions: ctype, iconv, intl, json, mbstring, pdo, pdo_sqlite - coverage: none - - - name: Checkout Symfony 3.4 Sample - if: matrix.symfony == 3.4 - uses: actions/checkout@v2 - with: - repository: Codeception/symfony-module-tests - submodules: recursive - ref: 3.4 - - - name: Checkout Symfony 4.4 Sample - if: matrix.symfony == 4.4 - uses: actions/checkout@v2 - with: - repository: Codeception/symfony-module-tests - submodules: recursive - ref: 4.4 - - - name: Checkout Symfony 5 Sample - if: matrix.symfony == 5 - uses: actions/checkout@v2 - with: - repository: Codeception/symfony-module-tests - submodules: recursive - ref: main - - - name: Validate composer.json and composer.lock - run: composer validate - - - name: Get composer cache directory - id: composer-cache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" - - - name: Cache composer dependencies - uses: actions/cache@v2.1.3 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} - restore-keys: ${{ runner.os }}-${{ matrix.php }}-composer- - - - name: Install Symfony Sample on PHP7 - if: matrix.php < 8 - run: composer update --no-progress - - - name: Install Symfony Sample on PHP8 - if: matrix.php == 8.0 - run: composer update --no-progress --ignore-platform-req=php - - - name: Update database schema - run: php bin/console d:s:u -f - - - name: Load Doctrine fixtures - run: php bin/console d:f:l -q - - - name: Run test suite Symfony - run: php vendor/bin/codecept run Functional \ No newline at end of file + - name: Checkout code + uses: actions/checkout@v2 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + tools: composer:v2 + extensions: ctype, iconv, intl, json, mbstring, pdo, pdo_sqlite + coverage: none + + - name: Checkout Symfony 3.4 Sample + if: matrix.symfony == 3.4 + uses: actions/checkout@v2 + with: + repository: Codeception/symfony-module-tests + path: framework-tests + ref: 3.4 + + - name: Checkout Symfony 4.4 Sample + if: matrix.symfony == 4.4 + uses: actions/checkout@v2 + with: + repository: Codeception/symfony-module-tests + path: framework-tests + ref: 4.4 + + - name: Checkout Symfony 5.2 Sample + if: matrix.symfony == 5.2 + uses: actions/checkout@v2 + with: + repository: Codeception/symfony-module-tests + path: framework-tests + ref: main + + - name: Get composer cache directory + id: composer-cache + run: echo "::set-output name=dir::$(composer config cache-files-dir)" + + - name: Cache composer dependencies + uses: actions/cache@v2.1.3 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} + restore-keys: ${{ runner.os }}-${{ matrix.php }}-composer- + + - name: Install dependencies + run: | + composer require symfony/finder=${{ matrix.symfony }} --ignore-platform-req=php --no-update + composer require symfony/yaml=${{ matrix.symfony }} --ignore-platform-req=php --no-update + composer require symfony/console=${{ matrix.symfony }} --ignore-platform-req=php --no-update + composer require symfony/event-dispatcher=${{ matrix.symfony }} --ignore-platform-req=php --no-update + composer require symfony/css-selector=${{ matrix.symfony }} --ignore-platform-req=php --no-update + composer require symfony/dom-crawler=${{ matrix.symfony }} --ignore-platform-req=php --no-update + composer require symfony/browser-kit=${{ matrix.symfony }} --ignore-platform-req=php --no-update + composer install --prefer-dist --no-progress --ignore-platform-req=php + + - name: Validate composer.json and composer.lock + run: composer validate + working-directory: framework-tests + + - name: Install Symfony Sample + run: | + composer remove codeception/module-symfony --dev --no-update + composer update --no-progress + working-directory: framework-tests + + - name: Prepare the test environment + run: | + php bin/console d:s:u -f + php bin/console d:f:l -q + working-directory: framework-tests + + - name: Run test suite + run: | + php vendor/bin/codecept build -c framework-tests + php vendor/bin/codecept run Functional -c framework-tests \ No newline at end of file From 195a1e4e10dd3b927ccd124bd9ab8cbf0aa10705 Mon Sep 17 00:00:00 2001 From: Tavo Nieves J Date: Mon, 11 Jan 2021 11:51:52 -0500 Subject: [PATCH 2/2] Remove unnecessary dependencies --- composer.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/composer.json b/composer.json index 19a7a13e..db685fd4 100644 --- a/composer.json +++ b/composer.json @@ -24,9 +24,7 @@ "require-dev": { "codeception/module-asserts": "^1.3", "codeception/module-doctrine2": "^1.0", - "codeception/module-phpbrowser": "^1.0", "codeception/module-rest": "^1.2", - "codeception/module-sequence": "^1.0", "vlucas/phpdotenv": "^3.6 | ^4.1 | ^5.2" }, "autoload": {