From d96ced5f24dd7c4257e2ee189d3ed70972c6f612 Mon Sep 17 00:00:00 2001 From: Jisse Reitsma Date: Fri, 23 Aug 2024 19:26:41 +0200 Subject: [PATCH] Update workflows --- .../extdn-integration-tests-pre-install-m23.sh | 6 ------ .../extdn-integration-tests-pre-install-m24.sh | 6 ------ .../extdn-integration-tests-pre-install.sh | 6 +++++- .github/workflows/extdn-integration-tests.yml | 16 ++++++++++------ .github/workflows/extdn-phpstan-pre-install.sh | 3 ++- .github/workflows/extdn-phpstan.yml | 7 +++---- .github/workflows/extdn-unit-tests.yml | 16 ++++++++++------ 7 files changed, 30 insertions(+), 30 deletions(-) delete mode 100755 .github/workflows/extdn-integration-tests-pre-install-m23.sh delete mode 100755 .github/workflows/extdn-integration-tests-pre-install-m24.sh diff --git a/.github/workflows/extdn-integration-tests-pre-install-m23.sh b/.github/workflows/extdn-integration-tests-pre-install-m23.sh deleted file mode 100755 index 485b7ea..0000000 --- a/.github/workflows/extdn-integration-tests-pre-install-m23.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -composer config minimum-stability dev -composer config prefer-stable false - -composer require yireo/magento2-replace-bundled:^3.0 --no-update -composer require yireo/magento2-integration-test-helper diff --git a/.github/workflows/extdn-integration-tests-pre-install-m24.sh b/.github/workflows/extdn-integration-tests-pre-install-m24.sh deleted file mode 100755 index 3fbfa4d..0000000 --- a/.github/workflows/extdn-integration-tests-pre-install-m24.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -composer config minimum-stability dev -composer config prefer-stable false - -composer require yireo/magento2-replace-bundled:^4.0 --no-update -composer require yireo/magento2-integration-test-helper diff --git a/.github/workflows/extdn-integration-tests-pre-install.sh b/.github/workflows/extdn-integration-tests-pre-install.sh index b1e28ee..5eba56d 100755 --- a/.github/workflows/extdn-integration-tests-pre-install.sh +++ b/.github/workflows/extdn-integration-tests-pre-install.sh @@ -2,4 +2,8 @@ composer config minimum-stability dev composer config prefer-stable false -composer require yireo/magento2-integration-test-helper +composer require --dev yireo/magento2-integration-test-helper --no-update + +composer require yireo/magento2-replace-bundled:^4.0 --no-update +composer require yireo/magento2-replace-inventory:^4.0 --no-update +composer require yireo/magento2-replace-pagebuilder:^4.0 --no-update diff --git a/.github/workflows/extdn-integration-tests.yml b/.github/workflows/extdn-integration-tests.yml index 463b763..938559e 100644 --- a/.github/workflows/extdn-integration-tests.yml +++ b/.github/workflows/extdn-integration-tests.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest services: mysql: - image: mysql:5.7 + image: mysql:8.0 env: MYSQL_ROOT_PASSWORD: root ports: @@ -36,11 +36,15 @@ jobs: MAGENTO_POST_INSTALL_SCRIPT: .github/workflows/extdn-integration-tests-post-install.sh steps: - uses: actions/checkout@v2 - - uses: extdn/github-actions-m2/magento-integration-tests/7.4@master - env: - MAGENTO_VERSION: '2.4.3-p2' - MAGENTO_PRE_INSTALL_SCRIPT: .github/workflows/extdn-integration-tests-pre-install-m24.sh + - name: Cache Composer dependencies + uses: actions/cache@v2 + with: + path: /tmp/composer-cache + key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }} + - uses: extdn/github-actions-m2/magento-integration-tests/8.3@master env: MAGENTO_VERSION: '2.4.7' - MAGENTO_PRE_INSTALL_SCRIPT: .github/workflows/extdn-integration-tests-pre-install-m24.sh + with: + magento_pre_install_script: .github/workflows/extdn-integration-tests-pre-install.sh + magento_post_install_script: .github/workflows/extdn-integration-tests-post-install.sh diff --git a/.github/workflows/extdn-phpstan-pre-install.sh b/.github/workflows/extdn-phpstan-pre-install.sh index 9b54766..2dafffc 100755 --- a/.github/workflows/extdn-phpstan-pre-install.sh +++ b/.github/workflows/extdn-phpstan-pre-install.sh @@ -2,9 +2,10 @@ composer config minimum-stability dev composer config prefer-stable false -composer require --dev yireo/magento2-integration-test-helper --no-update +composer require yireo/magento2-integration-test-helper --no-update composer config --no-plugins allow-plugins true + composer require --dev phpstan/extension-installer --no-update composer require --dev bitexpert/phpstan-magento --no-update diff --git a/.github/workflows/extdn-phpstan.yml b/.github/workflows/extdn-phpstan.yml index 5c0e8e0..b7f28f1 100644 --- a/.github/workflows/extdn-phpstan.yml +++ b/.github/workflows/extdn-phpstan.yml @@ -1,9 +1,9 @@ -name: ExtDN M2 PHPStan -on: [ push, pull_request ] +name: ExtDN PHPStan +on: [push, pull_request] jobs: phpstan: - name: M2 PHPStan + name: PHPStan runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -16,7 +16,6 @@ jobs: uses: actions/cache@v2 with: path: "${{ steps.determine-composer-cache-directory.outputs.directory }}" - #path: /tmp/composer-cache key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }} - uses: extdn/github-actions-m2/magento-phpstan/8.3@master diff --git a/.github/workflows/extdn-unit-tests.yml b/.github/workflows/extdn-unit-tests.yml index 68d7a39..68126c8 100644 --- a/.github/workflows/extdn-unit-tests.yml +++ b/.github/workflows/extdn-unit-tests.yml @@ -8,14 +8,18 @@ jobs: env: MAGENTO_MARKETPLACE_USERNAME: ${{ secrets.MAGENTO_MARKETPLACE_USERNAME }} MAGENTO_MARKETPLACE_PASSWORD: ${{ secrets.MAGENTO_MARKETPLACE_PASSWORD }} - REPOSITORY_URL: https://repo.magento.com/ MODULE_NAME: ${{ secrets.MODULE_NAME }} COMPOSER_NAME: ${{ secrets.COMPOSER_NAME }} steps: - uses: actions/checkout@v2 - - uses: extdn/github-actions-m2/magento-unit-tests/7.4@master - env: - MAGENTO_VERSION: '2.4.3-p2' - - uses: extdn/github-actions-m2/magento-unit-tests/8.1@master + + - name: Cache Composer dependencies + uses: actions/cache@v2 + with: + path: /tmp/composer-cache + key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }} + + - uses: extdn/github-actions-m2/magento-unit-tests/8.3@master env: - MAGENTO_VERSION: '2.4.4' + MAGENTO_VERSION: '2.4.7' + COMPOSER_VERSION: 2 \ No newline at end of file