From 17f1f90f650a58e74113a893b1ae12abf166ff39 Mon Sep 17 00:00:00 2001 From: Andreas Schempp Date: Tue, 28 May 2024 10:59:57 +0200 Subject: [PATCH] Fix the GitHub action --- .github/workflows/ci.yml | 23 +++-------------------- composer.json | 10 +++++----- 2 files changed, 8 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c3ac914a..d1d64b8f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,25 +7,8 @@ on: permissions: read-all jobs: - ecs: - name: build-tools - runs-on: ubuntu-latest - steps: - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.1 - coverage: none - - - name: Checkout - uses: actions/checkout@v3 - - - name: Install the dependencies - run: | - composer install --no-interaction --no-progress - - - name: Run all build-tools to validate code - run: composer run build-tools + ci: + uses: 'terminal42/contao-build-tools/.github/workflows/build-tools.yml@main' tests: name: Unit tests @@ -46,7 +29,7 @@ jobs: - name: Install the dependencies run: | - composer install --no-interaction --no-progress + composer install --no-interaction --no-progress --no-plugins - name: Run phpunit run: composer unit diff --git a/composer.json b/composer.json index f27c20f7..935f2ede 100644 --- a/composer.json +++ b/composer.json @@ -79,11 +79,11 @@ }, "config": { "allow-plugins": { - "contao-components/installer": true, - "contao/manager-plugin": true, - "contao-community-alliance/composer-plugin": true, - "php-http/discovery": false, - "terminal42/contao-build-tools": true + "terminal42/contao-build-tools": true, + "contao-components/installer": false, + "contao/manager-plugin": false, + "contao-community-alliance/composer-plugin": false, + "php-http/discovery": false }, "sort-packages": true },