From 03e3d8f4668394d5e0285e9e450b21d5abcbcdbb Mon Sep 17 00:00:00 2001 From: Misha Golenkov Date: Fri, 3 May 2024 12:37:24 +1000 Subject: [PATCH] Add new stable branch for Moodle 4.2+ --- .github/workflows/ci.yml | 8 +++ .github/workflows/master.yml | 126 ----------------------------------- README.md | 9 ++- version.php | 1 + 4 files changed, 13 insertions(+), 131 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 100644 .github/workflows/master.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..ecd6546 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,8 @@ +# .github/workflows/ci.yml +name: ci + +on: [push, pull_request] + +jobs: + ci: + uses: catalyst/catalyst-moodle-workflows/.github/workflows/ci.yml@main diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml deleted file mode 100644 index 39a94ec..0000000 --- a/.github/workflows/master.yml +++ /dev/null @@ -1,126 +0,0 @@ -name: master branch test - -on: [push, pull_request] - -jobs: - citest: - name: CI test - runs-on: 'ubuntu-latest' - - services: - postgres: - image: postgres - env: - POSTGRES_USER: 'postgres' - POSTGRES_HOST_AUTH_METHOD: 'trust' - options: >- - --health-cmd pg_isready - --health-interval 10s - --health-timeout 5s - --health-retries 3 - ports: - - 5432:5432 - - mariadb: - image: mariadb:10.5 - env: - MYSQL_USER: 'root' - MYSQL_ALLOW_EMPTY_PASSWORD: "true" - ports: - - 3306:3306 - options: >- - --health-cmd="mysqladmin ping" - --health-interval 10s - --health-timeout 5s - --health-retries 3 - - strategy: - fail-fast: false - matrix: - database: ['pgsql'] - moodle-branch: ['MOODLE_39_STABLE', 'MOODLE_310_STABLE', 'MOODLE_311_STABLE', 'MOODLE_400_STABLE', 'master'] - php: ['7.2', '7.4'] - exclude: - - moodle-branch: master - php: 7.2 - - moodle-branch: MOODLE_311_STABLE - php: 7.2 - - moodle-branch: MOODLE_400_STABLE - php: 7.2 - include: - - moodle-branch: master - php: 7.4 - database: mariadb - - steps: - - name: Check out repository code - uses: actions/checkout@v2 - with: - path: plugin - - - name: Setup PHP ${{ matrix.php }} - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - ini-values: max_input_vars=5000 - coverage: none - - - name: Initialise moodle-plugin-ci - run: | - composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3 - # Add dirs to $PATH - echo $(cd ci/bin; pwd) >> $GITHUB_PATH - echo $(cd ci/vendor/bin; pwd) >> $GITHUB_PATH - # PHPUnit depends on en_AU.UTF-8 locale - sudo locale-gen en_AU.UTF-8 - echo "NVM_DIR=$HOME/.nvm" >> $GITHUB_ENV - - - name: Install Moodle - run: | - moodle-plugin-ci install -vvv --plugin ./plugin --db-host=127.0.0.1 - env: - DB: ${{ matrix.database }} - MOODLE_BRANCH: ${{ matrix.moodle-branch }} - - - name: Run phplint - if: ${{ always() }} - run: moodle-plugin-ci phplint - - - name: Run phpcpd - continue-on-error: true # This step will show errors but will not fail - if: ${{ always() }} - run: moodle-plugin-ci phpcpd || true - - - name: Run phpmd - continue-on-error: true # This step will show errors but will not fail - if: ${{ always() }} - run: moodle-plugin-ci phpmd - - - name: Run codechecker - if: ${{ always() }} - run: moodle-plugin-ci codechecker - - - name: Run validate - if: ${{ always() }} - run: moodle-plugin-ci validate - - - name: Run savepoints - if: ${{ always() }} - run: moodle-plugin-ci savepoints - - - name: Run mustache - continue-on-error: true # This step will show errors but will not fail - if: ${{ always() }} - run: moodle-plugin-ci phpcpd - - - name: Run grunt - if: ${{ always() }} - run: moodle-plugin-ci grunt - - - name: Run phpunit - if: ${{ always() }} - run: | - moodle-plugin-ci phpunit - cd moodle - vendor/bin/phpunit --fail-on-risky --disallow-test-output --filter tool_dataprivacy_metadata_registry_testcase - vendor/bin/phpunit --fail-on-risky --disallow-test-output --testsuite core_privacy_testsuite --filter provider_testcase diff --git a/README.md b/README.md index b5c762f..b392107 100644 --- a/README.md +++ b/README.md @@ -24,12 +24,11 @@ Moodle is currently Level 0 or in the "swamp of POX". As described be Fowler, Mo This plugin aims to extend the maturity of Moodle's webservice interface to "Level 1: Resources" by making each webservice function available as a discrete URL. ## Supported Moodle Versions -This plugin currently supports Moodle: -* 3.9 -* 3.10 -* 3.11 -* 4.0 +| Moodle version | Branch | +|------------------|-------------------| +| Moodle 4.2 - 4.4 | MOODLE_402_STABLE | +| Moodle 3.9 - 4.1 | master | ## Moodle Plugin Installation The following sections outline how to install the Moodle plugin. diff --git a/version.php b/version.php index 31893ff..5f6ba33 100644 --- a/version.php +++ b/version.php @@ -30,3 +30,4 @@ $plugin->component = 'webservice_restful'; // Full name of the plugin (used for diagnostics). $plugin->requires = 2016052300; // Requires this Moodle version. $plugin->maturity = MATURITY_STABLE; +$plugin->supported = [39, 401]; // A range of branch numbers of supported moodle versions.