diff --git a/.github/workflows/composer.yaml b/.github/workflows/composer.yaml index 5fb0ef0..2dd03fd 100644 --- a/.github/workflows/composer.yaml +++ b/.github/workflows/composer.yaml @@ -56,18 +56,16 @@ jobs: fail-fast: false steps: - uses: actions/checkout@v5 + - uses: go-task/setup-task@v1 - name: Create docker network run: | docker network create frontend - run: | - docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer init --no-interaction - docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer config --no-plugins allow-plugins.mglaman/composer-drupal-lenient true - docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer require mglaman/composer-drupal-lenient - docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm rm composer.lenient.* + task composer:install - docker compose run --rm phpfpm composer install + - run: | docker compose run --rm phpfpm composer normalize --dry-run composer-audit: @@ -82,4 +80,4 @@ jobs: docker network create frontend - run: | - docker compose run --rm phpfpm composer audit + docker compose run --rm phpfpm composer audit --locked diff --git a/.github/workflows/php.yaml b/.github/workflows/php.yaml index 3b6415d..a15e2d4 100644 --- a/.github/workflows/php.yaml +++ b/.github/workflows/php.yaml @@ -49,16 +49,14 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v5 + - uses: go-task/setup-task@v1 - name: Create docker network run: | docker network create frontend - run: | - docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer init --no-interaction - docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer config --no-plugins allow-plugins.mglaman/composer-drupal-lenient true - docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer require mglaman/composer-drupal-lenient - docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm rm composer.lenient.* + task composer:install - docker compose run --rm phpfpm composer install + - run: | docker compose run --rm phpfpm vendor/bin/phpcs diff --git a/Taskfile.yml b/Taskfile.yml index b4d390e..a0e046d 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -23,7 +23,7 @@ tasks: # Create a temporary composer file to install https://github.com/mglaman/composer-drupal-lenient before the real install needs it. docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer init --no-interaction docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer config --no-plugins allow-plugins.mglaman/composer-drupal-lenient true - docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer require mglaman/composer-drupal-lenient + docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer require mglaman/composer-drupal-lenient:^1.0 docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm rm composer.lenient.* - task: composer diff --git a/composer.json b/composer.json index 41ed126..ff6cf58 100644 --- a/composer.json +++ b/composer.json @@ -1,16 +1,25 @@ { "name": "os2forms/os2forms_f2", "description": "OS2Forms: F2 integration", - "license": "MIT", + "license": "EUPL-1.2", "type": "drupal-module", + "authors": [ + { + "name": "Mikkel Ricky", + "email": "rimi@aarhus.dk" + } + ], "require": { + "php": "^8.3", + "drush/drush": "^12 || ^13", "itk-dev/drupal_psr6_cache": "^1.1", "itk-dev/f2-api-client": "dev-f2-api-client as 1.0.0", - "os2forms/os2forms": "^5.0" + "os2forms/os2forms": "^5.1" }, "require-dev": { - "drupal/coder": "^9.0", - "ergebnis/composer-normalize": "^2.52" + "drupal/coder": "^8.3 || ^9.0", + "ergebnis/composer-normalize": "^2.52", + "mglaman/composer-drupal-lenient": "^1.0" }, "repositories": [ { @@ -23,10 +32,23 @@ "allow-plugins": { "cweagans/composer-patches": true, "dealerdirect/phpcodesniffer-composer-installer": true, + "drupal/core-composer-scaffold": false, "ergebnis/composer-normalize": true, "mglaman/composer-drupal-lenient": true, "simplesamlphp/composer-module-installer": true, + "simplesamlphp/composer-xmlprovider-installer": true, + "symfony/runtime": false, + "vaimo/composer-patches": true, "zaporylie/composer-drupal-optimizations": true } + }, + "extra": { + "drupal-lenient": { + "allowed-list": [ + + "drupal/coc_forms_auto_export", + "drupal/webform_node_element" + ] + } } } diff --git a/scripts/base b/scripts/base index def2c9d..61d15f4 100644 --- a/scripts/base +++ b/scripts/base @@ -109,6 +109,7 @@ setup() { # Use --json to actually set a boolean value (rather that a string value, e.g. "true") composer --no-plugins config extra.merge-plugin.merge-extra --json true composer --no-plugins config extra.merge-plugin.merge-extra-deep --json true + composer --no-plugins config policy.advisories.block --json false composer update # Our module and its dev requirements are now installed.