From faa23cd7b925225d099bb5830488d2a6c6960b9d Mon Sep 17 00:00:00 2001 From: Justus Dieckmann Date: Thu, 7 Nov 2019 15:43:50 +0100 Subject: [PATCH 1/2] Travis: Testing for Moodle 3.8 --- .travis.yml | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e6cce3..dbbc619 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,6 @@ cache: php: - 7.0 - 7.1 - - 7.2 - 7.3 matrix: @@ -31,18 +30,6 @@ matrix: env: DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE - php: 7.3 env: DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE - - php: 7.3 - env: DB=mysqli MOODLE_BRANCH=MOODLE_34_STABLE - - php: 7.3 - env: DB=pgsql MOODLE_BRANCH=MOODLE_34_STABLE - - php: 7.3 - env: DB=mysqli MOODLE_BRANCH=MOODLE_33_STABLE - - php: 7.3 - env: DB=pgsql MOODLE_BRANCH=MOODLE_33_STABLE - - php: 7.2 - env: DB=pgsql MOODLE_BRANCH=MOODLE_33_STABLE - - php: 7.2 - env: DB=mysqli MOODLE_BRANCH=MOODLE_33_STABLE - php: 7.0 env: DB=pgsql MOODLE_BRANCH=MOODLE_37_STABLE - php: 7.0 @@ -58,14 +45,10 @@ env: - IGNORE_PATHS=thirdparty - BEHAT=yes matrix: - - DB=pgsql MOODLE_BRANCH=MOODLE_33_STABLE - - DB=pgsql MOODLE_BRANCH=MOODLE_34_STABLE - DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE - DB=pgsql MOODLE_BRANCH=MOODLE_36_STABLE - DB=pgsql MOODLE_BRANCH=MOODLE_37_STABLE - DB=pgsql MOODLE_BRANCH=master - - DB=mysqli MOODLE_BRANCH=MOODLE_33_STABLE - - DB=mysqli MOODLE_BRANCH=MOODLE_34_STABLE - DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE - DB=mysqli MOODLE_BRANCH=MOODLE_36_STABLE - DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE @@ -83,8 +66,8 @@ jobs: include: # Prechecks against latest Moodle stable only. - stage: static - php: 7.2 - env: DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE + php: 7.3 + env: DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE install: - moodle-plugin-ci install --no-init script: @@ -98,8 +81,8 @@ jobs: - moodle-plugin-ci grunt # Smaller build matrix for development builds - stage: develop - php: 7.2 - env: DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE + php: 7.3 + env: DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE install: - moodle-plugin-ci install script: From b41eadf6ffbde8589fe9dd70eedd7342006d0e19 Mon Sep 17 00:00:00 2001 From: Justus Dieckmann Date: Thu, 21 Nov 2019 12:44:14 +0100 Subject: [PATCH 2/2] Release v3.8-r1, add Moodle 3.8 to Travis Matrix, Use linux lineendings in .travis.yml --- .travis.yml | 222 +++++++++++++++++++++++++++------------------------- version.php | 4 +- 2 files changed, 116 insertions(+), 110 deletions(-) diff --git a/.travis.yml b/.travis.yml index dbbc619..1cc5c40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,108 +1,114 @@ -language: php - -sudo: required -dist: trusty - -addons: - firefox: "47.0.1" - postgresql: "9.4" - apt: - packages: - - oracle-java9-installer - - oracle-java9-set-default - -cache: - directories: - - $HOME/.composer/cache - - $HOME/.npm - -php: - - 7.0 - - 7.1 - - 7.3 - -matrix: - #allow_failures: - #- env: DB=pgsql MOODLE_BRANCH=master - #- env: DB=mysqli MOODLE_BRANCH=master - exclude: - - php: 7.3 - env: DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE - - php: 7.3 - env: DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE - - php: 7.0 - env: DB=pgsql MOODLE_BRANCH=MOODLE_37_STABLE - - php: 7.0 - env: DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE - - php: 7.0 - env: DB=pgsql MOODLE_BRANCH=master - - php: 7.0 - env: DB=mysqli MOODLE_BRANCH=master - fast_finish: true - -env: - global: - - IGNORE_PATHS=thirdparty - - BEHAT=yes - matrix: - - DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE - - DB=pgsql MOODLE_BRANCH=MOODLE_36_STABLE - - DB=pgsql MOODLE_BRANCH=MOODLE_37_STABLE - - DB=pgsql MOODLE_BRANCH=master - - DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE - - DB=mysqli MOODLE_BRANCH=MOODLE_36_STABLE - - DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE - - DB=mysqli MOODLE_BRANCH=master - -before_install: - - phpenv config-rm xdebug.ini - - nvm install 8.9 - - cd ../.. - - composer selfupdate - - composer create-project -n --no-dev --prefer-dist moodlerooms/moodle-plugin-ci ci ^2 - - export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH" - -jobs: - include: - # Prechecks against latest Moodle stable only. - - stage: static - php: 7.3 - env: DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE - install: - - moodle-plugin-ci install --no-init - script: - - moodle-plugin-ci phplint - - moodle-plugin-ci phpcpd - - moodle-plugin-ci phpmd - - moodle-plugin-ci codechecker - - moodle-plugin-ci validate - - moodle-plugin-ci savepoints - - moodle-plugin-ci mustache - - moodle-plugin-ci grunt - # Smaller build matrix for development builds - - stage: develop - php: 7.3 - env: DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE - install: - - moodle-plugin-ci install - script: - - moodle-plugin-ci phpunit --coverage-clover - - moodle-plugin-ci behat - -# Default 'test' stage: Unit tests and behat tests against full matrix. - -install: - - moodle-plugin-ci install -script: - - moodle-plugin-ci phpunit --coverage-clover - - moodle-plugin-ci behat - -after_success: - - bash <(curl -s https://codecov.io/bash) - -stages: - - static - - name: develop - if: branch != master AND (type != pull_request OR head_branch != master) AND (tag IS blank) - - name: test - if: branch = master OR (type = pull_request AND head_branch = master) OR (tag IS present) +language: php + +sudo: required +dist: trusty + +addons: + firefox: "47.0.1" + postgresql: "9.4" + apt: + packages: + - oracle-java9-installer + - oracle-java9-set-default + +cache: + directories: + - $HOME/.composer/cache + - $HOME/.npm + +php: + - 7.0 + - 7.1 + - 7.3 + +matrix: + #allow_failures: + #- env: DB=pgsql MOODLE_BRANCH=master + #- env: DB=mysqli MOODLE_BRANCH=master + exclude: + - php: 7.3 + env: DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE + - php: 7.3 + env: DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE + - php: 7.0 + env: DB=pgsql MOODLE_BRANCH=MOODLE_37_STABLE + - php: 7.0 + env: DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE + - php: 7.0 + env: DB=pgsql MOODLE_BRANCH=MOODLE_38_STABLE + - php: 7.0 + env: DB=mysqli MOODLE_BRANCH=MOODLE_38_STABLE + - php: 7.0 + env: DB=pgsql MOODLE_BRANCH=master + - php: 7.0 + env: DB=mysqli MOODLE_BRANCH=master + fast_finish: true + +env: + global: + - IGNORE_PATHS=thirdparty + - BEHAT=yes + matrix: + - DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE + - DB=pgsql MOODLE_BRANCH=MOODLE_36_STABLE + - DB=pgsql MOODLE_BRANCH=MOODLE_37_STABLE + - DB=pgsql MOODLE_BRANCH=MOODLE_38_STABLE + - DB=pgsql MOODLE_BRANCH=master + - DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE + - DB=mysqli MOODLE_BRANCH=MOODLE_36_STABLE + - DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE + - DB=mysqli MOODLE_BRANCH=MOODLE_38_STABLE + - DB=mysqli MOODLE_BRANCH=master + +before_install: + - phpenv config-rm xdebug.ini + - nvm install 8.9 + - cd ../.. + - composer selfupdate + - composer create-project -n --no-dev --prefer-dist moodlerooms/moodle-plugin-ci ci ^2 + - export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH" + +jobs: + include: + # Prechecks against latest Moodle stable only. + - stage: static + php: 7.3 + env: DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE + install: + - moodle-plugin-ci install --no-init + script: + - moodle-plugin-ci phplint + - moodle-plugin-ci phpcpd + - moodle-plugin-ci phpmd + - moodle-plugin-ci codechecker + - moodle-plugin-ci validate + - moodle-plugin-ci savepoints + - moodle-plugin-ci mustache + - moodle-plugin-ci grunt + # Smaller build matrix for development builds + - stage: develop + php: 7.3 + env: DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE + install: + - moodle-plugin-ci install + script: + - moodle-plugin-ci phpunit --coverage-clover + - moodle-plugin-ci behat + +# Default 'test' stage: Unit tests and behat tests against full matrix. + +install: + - moodle-plugin-ci install +script: + - moodle-plugin-ci phpunit --coverage-clover + - moodle-plugin-ci behat + +after_success: + - bash <(curl -s https://codecov.io/bash) + +stages: + - static + - name: develop + if: branch != master AND (type != pull_request OR head_branch != master) AND (tag IS blank) + - name: test + if: branch = master OR (type = pull_request AND head_branch = master) OR (tag IS present) diff --git a/version.php b/version.php index 0f7736c..a922dd9 100644 --- a/version.php +++ b/version.php @@ -25,6 +25,6 @@ $plugin->component = 'block_qrcode'; // Full name of the plugin. $plugin->maturity = MATURITY_STABLE; -$plugin->release = 'v3.6-r1'; -$plugin->version = 2018112000; // The current plugin version (Date: YYYMMDDXX) +$plugin->release = 'v3.8-r1'; +$plugin->version = 2019112100; // The current plugin version (Date: YYYMMDDXX) $plugin->requires = 2017050500; // Requires this Moodle version.