diff --git a/.circleci/config.yml b/.circleci/config.yml index bd0d049948..cd84622c3f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -109,7 +109,8 @@ commands: command: | ddev composer config repositories.dkan path dkan ddev composer require getdkan/dkan:@dev --no-install -W - ddev composer update getdkan/dkan -W +# ddev composer update getdkan/dkan -W + ddev composer update ddev composer show getdkan/dkan ddev dkan-site-install ddev drush updb -y @@ -138,6 +139,7 @@ jobs: steps: - docker/install-docker-tools - prepare_build: + addon_branch: late-install php_version: << parameters.php_version >> dkan_recommended_branch: << parameters.dkan_recommended_branch >> - prepare_site: @@ -231,41 +233,41 @@ workflows: install_and_test: # We use matrix for these parameters so that we can tell them apart in report screens. jobs: - - cypress: - name: install_test_cypress - dkan_recommended_branch: '9.5.x-dev' - - phpunit: - matrix: - parameters: - dkan_recommended_branch: [ '9.4.x-dev'] - php_version: [ '7.4' ] - - phpunit: - matrix: - parameters: - dkan_recommended_branch: [ '9.5.x-dev'] - php_version: [ '7.4', '8.1' ] - - phpunit: - name: 'Install target (Drupal 9.5, PHP 8.0)' - report_coverage: true - matrix: - parameters: - dkan_recommended_branch: [ '9.5.x-dev'] - php_version: [ '8.0' ] +# - cypress: +# name: install_test_cypress +# dkan_recommended_branch: '9.5.x-dev' +# - phpunit: +# matrix: +# parameters: +# dkan_recommended_branch: [ '9.4.x-dev'] +# php_version: [ '7.4' ] +# - phpunit: +# matrix: +# parameters: +# dkan_recommended_branch: [ '9.5.x-dev'] +# php_version: [ '7.4', '8.1' ] +# - phpunit: +# name: 'Install target (Drupal 9.5, PHP 8.0)' +# report_coverage: true +# matrix: +# parameters: +# dkan_recommended_branch: [ '9.5.x-dev'] +# php_version: [ '8.0' ] - phpunit: matrix: parameters: dkan_recommended_branch: [ '10.0.x-dev'] php_version: [ '8.1' ] - upgrade_and_test: - jobs: - - cypress: - name: upgrade_test_cypress - upgrade: true - dkan_recommended_branch: '9.5.x-dev' - - phpunit: - name: 'Upgrade target (Drupal 9.5, PHP 8.0)' - upgrade: true - matrix: - parameters: - dkan_recommended_branch: [ '9.5.x-dev'] - php_version: [ '8.0' ] +# upgrade_and_test: +# jobs: +# - cypress: +# name: upgrade_test_cypress +# upgrade: true +# dkan_recommended_branch: '9.5.x-dev' +# - phpunit: +# name: 'Upgrade target (Drupal 9.5, PHP 8.0)' +# upgrade: true +# matrix: +# parameters: +# dkan_recommended_branch: [ '9.5.x-dev'] +# php_version: [ '8.0' ]