Merge branch 'enable-openid' into 'master'

fix pipeline

See merge request training/lab-tools/moodle-local_oauth!5

Author: Rens Sikma

.gitignore

@@ -0,0 +1,2 @@
+/vendor/
+.well-known/

.gitlab-ci.yml

@@ -1,5 +1,6 @@
 ---
 stages:
+  # - prepare
   - test
   - publish
 
@@ -11,51 +12,61 @@ variables:
   COMPOSER_ALLOW_SUPERUSER: 1
   COMPOSER_CACHE_DIR: "$CI_PROJECT_DIR/.cache/composer"
   NPM_CONFIG_CACHE: "$CI_PROJECT_DIR/.cache/npm"
-  MOODLE_BRANCH: 'master'
+  MOODLE_BRANCH: 'main'
   MOODLE_BEHAT_WWWROOT: 'http://localhost:8000'
   MOODLE_BEHAT_WDHOST: 'http://behat:4444/wd/hub'
   MOODLE_START_BEHAT_SERVERS: 'no'
   DB: 'mariadb'
 
 default:
-  # services:
-  #   - name: selenium/standalone-chrome:3
-  #     alias: behat
-  #   - name: mariadb:10.6
-  #     alias: db
-  #     command:
-  #       - '--character-set-server=utf8mb4'
-  #       - '--collation-server=utf8mb4_unicode_ci'
-  #       - '--innodb_file_per_table=On'
-  #       - '--wait-timeout=28800'
-  #       - '--skip-log-bin'
-  #     variables:
-  #       MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: 'yes'
   cache:
     paths:
       - .cache
-  image: moodlehq/moodle-php-apache:8.1
+      - vendor/
+
+  image: moodlehq/moodle-php-apache:8.3
   before_script:
     # move to container
     - mkdir -p /usr/share/man/man1 /usr/share/man/man3 /usr/share/man/man7
-    # - apt-get -qq update
-    # - apt-get -yqq install --no-install-suggests default-jre-headless mariadb-client
+    - 'curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer'
     - 'curl -sS https://raw.githubusercontent.com/creationix/nvm/v0.39.3/install.sh | bash'
     - source ~/.bashrc
     - nvm install --default --latest-npm lts/gallium
-    - 'curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer'
-    - composer create-project -n --no-dev --no-progress --no-ansi  --prefer-dist moodlehq/moodle-plugin-ci /opt/mci ^4
-    - export PATH="/opt/mci/bin:/opt/mci/vendor/bin:$PATH"
+    - composer create-project -n --no-dev --no-progress --no-ansi  --prefer-dist moodlehq/moodle-plugin-ci /opt/moodle-plugin-ci ^4
+    - export PATH="/opt/moodle-plugin-ci/bin:/opt/moodle-plugin-ci/vendor/bin:$PATH"
     # TODO not always needed
     # install moodle
     # - moodle-plugin-ci install --db-host db 
     # - '{ php -S 0.0.0.0:8000 -t "$CI_PROJECT_DIR/moodle" >/dev/null 2>&1 & }'
 
+# install dependencies:
+#   stage: prepare
+#   script:
+#     composer install
+
 test:
   stage: test
+  services:
+    # - name: selenium/standalone-chrome:3
+    #   alias: behat
+    - name: mariadb:11.6
+      alias: db
+      command:
+        - '--character-set-server=utf8mb4'
+        - '--collation-server=utf8mb4_unicode_ci'
+        - '--innodb_file_per_table=On'
+        - '--wait-timeout=28800'
+        - '--skip-log-bin'
+      variables:
+        MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: 'yes'
   script:
+    - composer install
+    - apt update
+    - apt -yqq install --no-install-suggests default-jre-headless mariadb-client
+    - moodle-plugin-ci install --moodle=/opt/moodle  --db-name moodle --db-host db
     - moodle-plugin-ci phplint $CI_PROJECT_DIR
     - moodle-plugin-ci phpunit $CI_PROJECT_DIR
+    - moodle-plugin-ci validate $CI_PROJECT_DIR
     - moodle-plugin-ci behat --auto-rerun 0 --profile chrome $CI_PROJECT_DIR
 
 
@@ -66,8 +77,8 @@ validate:
   # variables:
   #   MOODLE_BRANCH: 'MOODLE_310_STABLE'
   script:
+    - composer install
     # - validate-version # TODO complains about CHANGELOG.md, even if it exist double check
-    # - moodle-plugin-ci validate $CI_PROJECT_DIR # need moodle installed
     - moodle-plugin-ci savepoints $CI_PROJECT_DIR
 
     # TODO
@@ -79,19 +90,21 @@ validate:
 moodle-lint:
   stage: test
   image: moodlehq/moodle-php-apache:8.1
-  # variables:
-  #   MOODLE_BRANCH: 'master'
   script:
+    - composer install
     - moodle-plugin-ci phpcs $CI_PROJECT_DIR --ansi
-
+  allow_failure: true
 
 package plugin:
   stage: publish
-  image: ubuntu:latest
+  image: moodlehq/moodle-php-apache:8.1
   before_script:
     - apt update
     - apt install zip -y
   script:
+    - rm -rf vendor/ .cache
+    - 'curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer'
+    - composer install --no-dev
     - 'version=$(sed -n ''s/\s*$plugin->version\s*=\s\([0-9]*\);.*/\1/p'' version.php)'
     - 'echo "version: ${version}"'
     - 'folder="$(basename $CI_PROJECT_DIR)"'