From a6326377192bf86999c033ca933aed01d1169bfd Mon Sep 17 00:00:00 2001 From: Ruslan Kabalin Date: Mon, 29 Jun 2020 21:48:20 +0100 Subject: [PATCH] Travis file cleanup and default build bump to 3.9. --- .travis.dist.yml | 7 +++--- .travis.yml | 23 ++++--------------- docs/CHANGELOG.md | 6 ++--- docs/TravisFileExplained.md | 13 +++++------ .../moodle-local_travis-widget-min.js | 2 +- 5 files changed, 17 insertions(+), 34 deletions(-) diff --git a/.travis.dist.yml b/.travis.dist.yml index 5ac5a8e8..5f35ea69 100644 --- a/.travis.dist.yml +++ b/.travis.dist.yml @@ -1,7 +1,7 @@ language: php addons: - postgresql: "9.4" + postgresql: "9.5" services: - mysql @@ -14,13 +14,12 @@ cache: - $HOME/.npm php: - - 7.1 - 7.2 - 7.3 env: global: - - MOODLE_BRANCH=MOODLE_38_STABLE + - MOODLE_BRANCH=MOODLE_39_STABLE matrix: - DB=pgsql - DB=mysqli @@ -30,7 +29,7 @@ before_install: - nvm install 14.0.0 - nvm use 14.0.0 - cd ../.. - - composer create-project -n --no-dev --prefer-dist blackboard-open-source/moodle-plugin-ci ci ^2 + - composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^2 - export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH" - docker run -d -p 127.0.0.1:4444:4444 --net=host --shm-size=2g -v $HOME/build/moodle:$HOME/build/moodle selenium/standalone-firefox:2.53.1 diff --git a/.travis.yml b/.travis.yml index 30ca70e4..770c2207 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ script: - moodle-plugin-ci validate - moodle-plugin-ci savepoints - moodle-plugin-ci mustache - - moodle-plugin-ci grunt || [ "$MOODLE_BRANCH" != 'master' -a "$MOODLE_BRANCH" != 'MOODLE_38_STABLE' ] + - moodle-plugin-ci grunt || [ "$MOODLE_BRANCH" != 'master' -a "$MOODLE_BRANCH" != 'MOODLE_39_STABLE' ] - moodle-plugin-ci phpdoc - moodle-plugin-ci phpunit --coverage-text - moodle-plugin-ci behat --profile chrome @@ -58,33 +58,18 @@ script: jobs: include: - stage: Tests + php: 7.3 addons: skip install: - make init script: - make validate - stage: Integration tests + - php: 7.3 + env: MOODLE_BRANCH=MOODLE_39_STABLE - php: 7.3 env: MOODLE_BRANCH=MOODLE_38_STABLE - php: 7.3 env: MOODLE_BRANCH=MOODLE_37_STABLE - - php: 7.2 - env: MOODLE_BRANCH=MOODLE_36_STABLE - php: 7.2 env: MOODLE_BRANCH=MOODLE_35_STABLE - - stage: Deploy - addons: skip - install: skip - script: skip - before_deploy: - - make build/moodle-plugin-ci.phar - - php build/moodle-plugin-ci.phar list - deploy: - provider: releases - api_key: - secure: 1A6XanGYBX2fjDfQF96LK8otHz9Sh9g29eq7O+4ntAFyN5hYTVxJBdtp6LFkoeEHeQJtHpl/vmw+htavL5UXcYHqLsX+suXH8JML0Bg5sTA/HIhksetl226PtbdJabD/5AerLzqf+PiHGagzBBqscUqkVl7DdHEVkC/OQCDNcB5onFNqSRlCP50WFyXHBr4TccrUuvHK+jKcG4AFMLU7f2Bo2j5NBQW+ucY/RdNczXrRo4et9JHZJRocPFxQMpOnV7fTrQaHlt+HQe5FikNM28Vh44uVj7ZGYLWZNmtQb9K3Fq9t+atObMcYjsjBbnqypzm8BUNDx2YfsZvcpNOEtksYx6rE58EXQgJCBod7azjt4ulIrKPNOK64A9s6SX/ZQ68VEGYCYlC412kWC6SwPp77iDRLv4Z0MpmvtZfJ1LbkvMx22SRJGBSD24INvLxh4XnfUN0qQ021HUNIbTQ8cBuTGzMWf7W2nYjEGbTVV1fTMcFFy8IXOhnodM1s5kbMDRjASxkNpMBbbhfh4b3WnBhoi+Ecqjq4DFhU7YLHdjLF1pkuRHoBn1I7vNbO+JaEMtTQHokDxBGe4hIehkGxs04Q//2tI7DsWyVLhCTStoC9OqQMTZmAJCUUVV/L9HV7HS6ZqgkBlPBvpld3g8cMqRVN19p4B09WyMQcK8usJEw= - file: build/moodle-plugin-ci.phar - skip_cleanup: true - on: - repo: blackboard-open-source/moodle-plugin-ci - tags: true diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 232fd66d..85f0db08 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -15,11 +15,11 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt [#91](https://github.com/blackboard-open-source/moodle-plugin-ci/issues/91). - Updated verion of `moodlehq/moodle-local_ci` to fix Mustache linting. See [#91](https://github.com/blackboard-open-source/moodle-plugin-ci/issues/91). -- Updated [.travis.dist.yml] to build Moodle 3.8: removed PHP 7.0 and added - 7.2 and 7.3 (per release notes). - Replaced Selenium in-built functionality with docker image for Selenium Standalone server. See [#99](https://github.com/blackboard-open-source/moodle-plugin-ci/issues/99). -- Updated version of `moodlehq/moodle-local_codechecker`. +- Updated version of `moodlehq/moodle-local_codechecker` to 2.9.6 +- Updated [.travis.dist.yml] to build Moodle 3.9 +- Updated [.travis.dist.yml] to use nvm 14.0.0 ### Added - New help document: [CLI commands and options](CLI.md) diff --git a/docs/TravisFileExplained.md b/docs/TravisFileExplained.md index d99cfe50..054cbe7a 100644 --- a/docs/TravisFileExplained.md +++ b/docs/TravisFileExplained.md @@ -13,7 +13,7 @@ language: php # Installs the updated version of PostgreSQL and extra APT packages. addons: - postgresql: "9.4" + postgresql: "9.5" # Ensure DB services are running. services: @@ -30,7 +30,6 @@ cache: # listed here will create a separate build and run the tests against that # version of PHP. php: - - 7.1 - 7.2 - 7.3 @@ -38,12 +37,12 @@ php: env: global: # This line determines which version branch of Moodle to test against. - - MOODLE_BRANCH=MOODLE_38_STABLE + - MOODLE_BRANCH=MOODLE_39_STABLE # This matrix is used for testing against multiple databases. So for # each version of PHP being tested, one build will be created for each -# database listed here. EG: for PHP 7.1, one build will be created -# using PHP 7.1 and pgsql. In addition, another build will be created -# using PHP 7.1 and mysqli. +# database listed here. EG: for PHP 7.3, one build will be created +# using PHP 7.3 and pgsql. In addition, another build will be created +# using PHP 7.3 and mysqli. matrix: - DB=pgsql - DB=mysqli @@ -64,7 +63,7 @@ before_install: # directories to build the project. - cd ../.. # Install this project into a directory called "ci". - - composer create-project -n --no-dev --prefer-dist blackboard-open-source/moodle-plugin-ci ci ^2 + - composer create-project -n --no-dev --prefer-dist moodlehq/plugin-ci ci ^2 # Update the $PATH so scripts from this project can be called easily. - export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH" # Start Selenium Standalone server with Chrome/Firefox installed. If you diff --git a/tests/Fixture/moodle-local_travis/yui/build/moodle-local_travis-widget/moodle-local_travis-widget-min.js b/tests/Fixture/moodle-local_travis/yui/build/moodle-local_travis-widget/moodle-local_travis-widget-min.js index 0f68775c..11dbc4a8 100644 --- a/tests/Fixture/moodle-local_travis/yui/build/moodle-local_travis-widget/moodle-local_travis-widget-min.js +++ b/tests/Fixture/moodle-local_travis/yui/build/moodle-local_travis-widget/moodle-local_travis-widget-min.js @@ -1 +1 @@ -YUI.add("moodle-local_travis-widget",function(e,t){function n(){n.superclass.constructor.apply(this,arguments)}n.NAME="moodle-local_travis-widget",n.ATTRS={contextId:{value:undefined}},e.extend(n,e.Base,{initializer:function(){e.delegate("click",this.handle_click,document,".local_travis .widget",this)},handle_click:function(e){e.preventDefault()}}),M.local_travis.Widget=n,M.local_travis.init_widget=function(e){new n(e)}},"@VERSION@",{requires:["base","node","event"]}); +YUI.add("moodle-local_travis-widget",function(e,t){function i(){i.superclass.constructor.apply(this,arguments)}i.NAME="moodle-local_travis-widget",i.ATTRS={contextId:{value:undefined}},e.extend(i,e.Base,{initializer:function(){e.delegate("click",this.handle_click,document,".local_travis .widget",this)},handle_click:function(e){e.preventDefault()}}),M.local_travis.Widget=i,M.local_travis.init_widget=function(e){new i(e)}},"@VERSION@",{requires:["base","node","event"]}); \ No newline at end of file