From 70402e1a09c65b1bb7f0142f5fc7f0a1cc5c5b57 Mon Sep 17 00:00:00 2001 From: Petro Kurbatskyi Date: Wed, 25 Mar 2026 09:12:48 +0100 Subject: [PATCH 1/2] Switch to private non-skip-dev Satis server for CI tests --- .github/workflows/browser-tests.yml | 2 +- actions/composer-install/action.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index 6ad8ec0..5688965 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -206,7 +206,7 @@ jobs: - if: env.SATIS_NETWORK_KEY != '' name: Add composer keys for private packagist run: | - composer config http-basic.updates.ibexa.co $SATIS_NETWORK_KEY $SATIS_NETWORK_TOKEN + composer config http-basic.satis.services.ibexa.co $SATIS_NETWORK_KEY $SATIS_NETWORK_TOKEN env: SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }} diff --git a/actions/composer-install/action.yml b/actions/composer-install/action.yml index 4c1ebbf..7a91299 100644 --- a/actions/composer-install/action.yml +++ b/actions/composer-install/action.yml @@ -56,7 +56,7 @@ runs: - if: ${{ inputs.satis-network-key != '' && inputs.satis-network-token != '' }} name: Add composer keys for private packagist shell: bash - run: composer config http-basic.updates.ibexa.co $SATIS_NETWORK_KEY $SATIS_NETWORK_TOKEN + run: composer config http-basic.satis.services.ibexa.co $SATIS_NETWORK_KEY $SATIS_NETWORK_TOKEN env: SATIS_NETWORK_KEY: ${{ inputs.satis-network-key }} SATIS_NETWORK_TOKEN: ${{ inputs.satis-network-token }} From cef82d1d21350e743c3006991e237692cf82a90c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Parafi=C5=84ski?= Date: Wed, 9 Sep 2026 11:20:12 +0200 Subject: [PATCH 2/2] IBX-12374: Used PHP Behat configuration in multirepository setup when available (#116) Used PHP Behat configuration in multirepository setup when available (cherry picked from commit c949a8177cf96841568f38d0c5e97d540902dafa) --- .github/workflows/browser-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index 5688965..bd839a4 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -265,7 +265,7 @@ jobs: # Clear SPI cache docker compose exec -T --user www-data app sh -c 'php bin/console cache:pool:clear ${CACHE_POOL:-cache.tagaware.filesystem}' # Run setup - docker compose exec -T --user www-data app sh -c "vendor/bin/ibexabehat --mode=standard --profile=setup --suite=multirepository -c=behat_ibexa_oss.yaml --tags=~@elastic" + docker compose exec -T --user www-data app sh -c "vendor/bin/ibexabehat --mode=standard --profile=setup --suite=multirepository -c=\$([ -f behat_ibexa_oss.php ] && echo behat_ibexa_oss.php || echo behat_ibexa_oss.yaml) --tags=~@elastic" if [[ "${{ steps.project-version.outputs.version }}" == *'5.0.x-dev'* ]]; then docker compose exec -T --user www-data app sh -c "NODE_OPTIONS='--max-old-space-size=3072' composer run post-install-cmd" else @@ -283,7 +283,7 @@ jobs: # Clear SPI cache docker compose exec -T --user www-data app sh -c 'php bin/console cache:pool:clear ${CACHE_POOL:-cache.tagaware.filesystem}' # Run setup - docker compose exec -T --user www-data app sh -c "vendor/bin/ibexabehat --mode=standard --profile=setup --suite=multirepository -c=behat_ibexa_oss.yaml --tags=~@solr" + docker compose exec -T --user www-data app sh -c "vendor/bin/ibexabehat --mode=standard --profile=setup --suite=multirepository -c=\$([ -f behat_ibexa_oss.php ] && echo behat_ibexa_oss.php || echo behat_ibexa_oss.yaml) --tags=~@solr" if [[ "${{ steps.project-version.outputs.version }}" == *'5.0.x-dev'* ]]; then docker compose exec -T --user www-data app sh -c "NODE_OPTIONS='--max-old-space-size=3072' composer run post-install-cmd" else @@ -301,7 +301,7 @@ jobs: # Clear SPI cache docker compose exec -T --user www-data app sh -c 'php bin/console cache:pool:clear ${CACHE_POOL:-cache.tagaware.filesystem}' # Run setup - docker compose exec -T --user www-data app sh -c "vendor/bin/ibexabehat --mode=standard --profile=setup --suite=multirepository -c=behat_ibexa_oss.yaml --tags=@multirepository" + docker compose exec -T --user www-data app sh -c "vendor/bin/ibexabehat --mode=standard --profile=setup --suite=multirepository -c=\$([ -f behat_ibexa_oss.php ] && echo behat_ibexa_oss.php || echo behat_ibexa_oss.yaml) --tags=@multirepository" if [[ "${{ steps.project-version.outputs.version }}" == *'5.0.x-dev'* ]]; then docker compose exec -T --user www-data app sh -c "NODE_OPTIONS='--max-old-space-size=3072' composer run post-install-cmd" else