Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/build-packages.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use Symfony\Component\Finder\Finder;

$finder = (new Finder())
->in([__DIR__.'/../src/*/', __DIR__.'/../src/*/src/Bridge/*/', __DIR__.'/../ux.symfony.com/', __DIR__.'/../test_apps/*/'])
->in([__DIR__.'/../src/*/', __DIR__.'/../src/*/src/Bridge/*/', __DIR__.'/../ux.symfony.com/', __DIR__.'/../apps/*/'])
->depth(0)
->name('composer.json')
;
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/app-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ jobs:
- name: Install PHP dependencies
uses: ramsey/composer-install@v3
with:
working-directory: test_apps/encore-app
working-directory: apps/encore
dependency-versions: highest

- working-directory: test_apps/encore-app
- working-directory: apps/encore
run: npm install --install-links

- if: matrix.ux-packages-source == 'js-packages'
name: Install UX JS packages with a JS package manager
working-directory: test_apps/encore-app
working-directory: apps/encore
run: |
PACKAGES_TO_INSTALL=''
for PACKAGE_DATA in $(pnpm ls -r --json --depth -1 | jq 'map(select(.private != true))' | jq -c '.[]'); do
Expand All @@ -71,7 +71,7 @@ jobs:
npm add --save-dev --install-links $PACKAGES_TO_INSTALL

- name: Ensure UX packages are installed from "${{ env.EXPECTED_PATTERN }}"
working-directory: test_apps/encore-app
working-directory: apps/encore
run: |
for PACKAGE_DATA in $(cat package.json | jq -c '(.dependencies // {}) + (.devDependencies // {}) | to_entries[] | select(.key | startswith("@symfony/ux-")) | {name: .key, version: .value}'); do
PACKAGE=$(echo $PACKAGE_DATA | jq -r '.name')
Expand All @@ -90,9 +90,9 @@ jobs:
EXPECTED_PATTERN: ${{ matrix.ux-packages-source == 'php-vendor' && 'file:vendor/symfony/*' || 'file:../../src/*' }}

- name: Ensure project can be built in dev mode
working-directory: test_apps/encore-app
working-directory: apps/encore
run: npm run dev

- name: Ensure project can be built in prod mode
working-directory: test_apps/encore-app
working-directory: apps/encore
run: npm run build
12 changes: 6 additions & 6 deletions .github/workflows/browser-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,19 +69,19 @@ jobs:

- name: Start Docker containers
run: docker compose up -d --build
working-directory: test_apps/e2e-app
working-directory: apps/e2e

- name: Configure E2E app
run: |
echo 'APP_ENV=prod' >> .env.local
echo 'APP_DEBUG=0' >> .env.local
echo 'APP_SECRET=df4c071596e64cc75a349456f2887ae2419ae650' >> .env.local
working-directory: test_apps/e2e-app
working-directory: apps/e2e

- name: Install E2E PHP dependencies
uses: ramsey/composer-install@v3
with:
working-directory: test_apps/e2e-app
working-directory: apps/e2e
dependency-versions: highest
composer-options: --no-dev
custom-cache-suffix: symfony-${{ matrix.symfony }}
Expand All @@ -92,11 +92,11 @@ jobs:
symfony composer dump-env
symfony console asset-map:compile
symfony console ux:icons:warm-cache
working-directory: test_apps/e2e-app
working-directory: apps/e2e

- name: Start E2E app
run: symfony serve --daemon
working-directory: test_apps/e2e-app
working-directory: apps/e2e

- name: Run browser tests
run: pnpm run test:browser
Expand All @@ -115,5 +115,5 @@ jobs:
if: ${{ always() && steps.browser-tests.conclusion == 'failure' }}
with:
name: Symfony logs (${{ matrix.symfony }})
path: test_apps/e2e-app/var/log/
path: apps/e2e/var/log/
retention-days: 7
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion test/playwright-helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as path from 'node:path';
import * as fs from 'fs';

export function getSymfonyKernelVersionId(): number {
const kernelPath = path.join(import.meta.dirname, '../test_apps/e2e-app/vendor/symfony/http-kernel/Kernel.php');
const kernelPath = path.join(import.meta.dirname, '../apps/e2e/vendor/symfony/http-kernel/Kernel.php');
if (!fs.existsSync(kernelPath)) {
throw new Error(`Unable to read Symfony Kernel version ID, the file "${kernelPath}" does not exist.`)
}
Expand Down
Loading