diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..98646889fccfb1d93b5bcde0e4933a6b9f829609 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,99 @@ +################ +# DrupalCI GitLabCI template +# +# Gitlab-ci.yml to replicate DrupalCI testing for Contrib +# +# With thanks to: +# * The GitLab Acceleration Initiative participants +# * DrupalSpoons +################ + +################ +# Guidelines +# +# This template is designed to give any Contrib maintainer everything they need to test, without requiring modification. It is also designed to keep up to date with Core Development automatically through the use of include files that can be centrally maintained. +# +# However, you can modify this template if you have additional needs for your project. +################ + +################ +# Includes +# +# Additional configuration can be provided through includes. +# One advantage of include files is that if they are updated upstream, the changes affect all pipelines using that include. +# +# Includes can be overridden by re-declaring anything provided in an include, here in gitlab-ci.yml +# https://docs.gitlab.com/ee/ci/yaml/includes.html#override-included-configuration-values +################ + +include: + ################ + # DrupalCI includes: + # As long as you include this, any future includes added by the Drupal Association will be accessible to your pipelines automatically. + # View these include files at https://git.drupalcode.org/project/gitlab_templates/ + ################ + - project: $_GITLAB_TEMPLATES_REPO + ref: $_GITLAB_TEMPLATES_REF + file: + - '/includes/include.drupalci.main.yml' + # EXPERIMENTAL: For Drupal 7, remove the above line and uncomment the below. + # - '/includes/include.drupalci.main-d7.yml' + - '/includes/include.drupalci.variables.yml' + - '/includes/include.drupalci.workflows.yml' + +################ +# Pipeline configuration variables +# +# These are the variables provided to the Run Pipeline form that a user may want to override. +# +# Docs at https://git.drupalcode.org/project/gitlab_templates/-/blob/1.0.x/includes/include.drupalci.variables.yml +################ +# variables: +# SKIP_ESLINT: '1' + + +################################################################################### +# +# * +# /( +# ((((, +# /((((((( +# ((((((((((* +# ,((((((((((((((( +# ,((((((((((((((((((( +# ((((((((((((((((((((((((* +# *((((((((((((((((((((((((((((( +# ((((((((((((((((((((((((((((((((((* +# *(((((((((((((((((( .(((((((((((((((((( +# ((((((((((((((((((. /(((((((((((((((((* +# /((((((((((((((((( .(((((((((((((((((, +# ,(((((((((((((((((( (((((((((((((((((( +# .(((((((((((((((((((( .((((((((((((((((( +# ((((((((((((((((((((((( ((((((((((((((((/ +# (((((((((((((((((((((((((((/ ,(((((((((((((((* +# .((((((((((((((/ /(((((((((((((. ,((((((((((((((( +# *(((((((((((((( ,(((((((((((((/ *((((((((((((((. +# ((((((((((((((, /(((((((((((((. ((((((((((((((, +# (((((((((((((/ ,(((((((((((((* ,(((((((((((((, +# *((((((((((((( .((((((((((((((( ,((((((((((((( +# ((((((((((((/ /((((((((((((((((((. ,((((((((((((/ +# ((((((((((((( *(((((((((((((((((((((((* *(((((((((((( +# ((((((((((((( ,(((((((((((((..((((((((((((( *(((((((((((( +# ((((((((((((, /((((((((((((* /((((((((((((/ (((((((((((( +# ((((((((((((( /((((((((((((/ (((((((((((((* (((((((((((( +# (((((((((((((/ /(((((((((((( ,((((((((((((, *(((((((((((( +# (((((((((((((( *(((((((((((/ *((((((((((((. ((((((((((((/ +# *((((((((((((((((((((((((((, /((((((((((((((((((((((((( +# ((((((((((((((((((((((((( ((((((((((((((((((((((((, +# .(((((((((((((((((((((((/ ,((((((((((((((((((((((( +# ((((((((((((((((((((((/ ,(((((((((((((((((((((/ +# *((((((((((((((((((((( (((((((((((((((((((((, +# ,(((((((((((((((((((((, ((((((((((((((((((((/ +# ,(((((((((((((((((((((* /(((((((((((((((((((( +# ((((((((((((((((((((((, ,/((((((((((((((((((((, +# ,((((((((((((((((((((((((((((((((((((((((((((((((((( +# .((((((((((((((((((((((((((((((((((((((((((((( +# .((((((((((((((((((((((((((((((((((((,. +# .,(((((((((((((((((((((((((. +# +################################################################################### diff --git a/composer.json b/composer.json index 0c5bcdd406873a666a379cb697e087150cfce241..b552dd723d68be762f179e44c8eebbf75aa8b13d 100644 --- a/composer.json +++ b/composer.json @@ -27,20 +27,18 @@ "patches": { } }, "require": { - "php": "^7.4 || ^8.0", "composer/installers": "~1.0 || ~2.0", "cweagans/composer-patches": "^1.6.0", - "drupal/admin_toolbar": "3.3.0", - "drupal/core-composer-scaffold": "9.5.9", - "drupal/core-project-message": "9.5.9", - "drupal/core-recommended": "9.5.9", + "drupal/core-composer-scaffold": "^10.0", + "drupal/core-project-message": "^10.0", + "drupal/core-recommended": "^10.0", "drupal/knowledge": "1.x-dev", "drupal/module_filter": "^4.0", "drupal/search_api_page": "^1.0", - "drupal/visitors": "^2" + "drupal/visitors": "^2.0" }, "config": { - "sort-packages": true, + "sort-packages": true, "allow-plugins": { "composer/installers": true, "cweagans/composer-patches": true, diff --git a/open_knowledge.info.yml b/open_knowledge.info.yml index 330ef840f055bcecc0ffedb56ce88f05981a79ea..755b582824ddaeecc59f019bd2119fba42d915bb 100644 --- a/open_knowledge.info.yml +++ b/open_knowledge.info.yml @@ -1,11 +1,9 @@ name: Open Knowledge type: profile description: 'Open Knowledge distribution profile.' -core_version_requirement: ^9 -version: '0.0.1' +core_version_requirement: ^9 || ^10 project: open_knowledge -# Dependencies that Open Social can not live without. dependencies: # core - node @@ -38,7 +36,6 @@ dependencies: - file - views - views_ui - - tour - automated_cron - civicrm:civicrm - civicrm:civicrm_entity diff --git a/open_knowledge.install b/open_knowledge.install index 838d458dc94f6a057ccdfa7f526f2f55a8d6d900..1ee0b1368a0f293c99540eb9f030eda41ab02bc6 100644 --- a/open_knowledge.install +++ b/open_knowledge.install @@ -2,11 +2,11 @@ /** * @file - * Install, update and uninstall functions for the open knowledge installation profile. + * Install, update and uninstall functions for the open knowledge profile. */ -use Drupal\user\Entity\User; use Drupal\shortcut\Entity\Shortcut; +use Drupal\user\Entity\User; /** * Implements hook_install(). diff --git a/open_knowledge.profile b/open_knowledge.profile index b3d9bbc7f3711e882119cd6b3af051245d859d04..2151deeb53b8a7332932bb63006566c86ddb7448 100644 --- a/open_knowledge.profile +++ b/open_knowledge.profile @@ -1 +1,6 @@ <?php + +/** + * @file + * Open Knowledge profile. + */