From 79b2cdb64a7f8ed261c42658ecb82ee469031bcc Mon Sep 17 00:00:00 2001 From: Edmund Farrow Date: Wed, 6 Mar 2024 13:36:02 +0000 Subject: [PATCH] github-workflow - Tidy up --- .github/workflows/moodle-ci.yml | 5 ++--- classes/cli_helper.php | 2 +- tests/cli_helper_test.php | 1 - tests/create_repo_test.php | 1 - tests/export_repo_test.php | 1 - tests/export_trait_test.php | 1 - tests/import_repo_test.php | 1 - tests/lib_test.php | 1 - tests/tidy_trait_test.php | 2 -- 9 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/moodle-ci.yml b/.github/workflows/moodle-ci.yml index 2d0baa2..afbce1b 100644 --- a/.github/workflows/moodle-ci.yml +++ b/.github/workflows/moodle-ci.yml @@ -30,7 +30,6 @@ jobs: strategy: fail-fast: false matrix: # I don't know why, but mariadb is much slower, so mostly use pgsql. - # We use a mix of SBCL and GCL, but mostly prefer SBCL as it is faster. include: - php: '8.2' moodle-branch: 'master' @@ -95,12 +94,12 @@ jobs: run: moodle-plugin-ci phpmd - name: Moodle Code Checker - continue-on-error: true # Currently fails. We really ought to get this passing. + continue-on-error: true if: ${{ always() }} run: moodle-plugin-ci codechecker --max-warnings 0 - name: Moodle PHPDoc Checker - continue-on-error: true # Currently fails. We really ought to get this passing. + continue-on-error: true if: ${{ always() }} run: moodle-plugin-ci phpdoc diff --git a/classes/cli_helper.php b/classes/cli_helper.php index cda89d6..9a00e13 100644 --- a/classes/cli_helper.php +++ b/classes/cli_helper.php @@ -589,7 +589,7 @@ public function create_gitignore(string $manifestpath):void { /** * Check if the repository has been initialised * - * @param string $manifestpath + * @param string $fullmanifestpath * @return void */ public function check_repo_initialised(string $fullmanifestpath):void { diff --git a/tests/cli_helper_test.php b/tests/cli_helper_test.php index 1ad3a04..262013c 100644 --- a/tests/cli_helper_test.php +++ b/tests/cli_helper_test.php @@ -49,7 +49,6 @@ public static function call_exit():void { * * Some tests are also done in import_repo_test where mocking has * already been set up. - * @runTestsInSeparateProcesses * * @covers \gitsync\cli_helper::class */ diff --git a/tests/create_repo_test.php b/tests/create_repo_test.php index b43f7cd..73d34c3 100644 --- a/tests/create_repo_test.php +++ b/tests/create_repo_test.php @@ -32,7 +32,6 @@ /** * Test the CLI script for creating a repo from questions in Moodle. * @group qbank_gitsync - * @runTestsInSeparateProcesses * * @covers \gitsync\create_repo::class */ diff --git a/tests/export_repo_test.php b/tests/export_repo_test.php index 4ca342d..a572ae9 100644 --- a/tests/export_repo_test.php +++ b/tests/export_repo_test.php @@ -56,7 +56,6 @@ public static function handle_abort():void { /** * Test the CLI script for exporting a repo from Moodle. * @group qbank_gitsync - * @runTestsInSeparateProcesses * * @covers \gitsync\export_repo::class */ diff --git a/tests/export_trait_test.php b/tests/export_trait_test.php index aa485ef..e981971 100644 --- a/tests/export_trait_test.php +++ b/tests/export_trait_test.php @@ -32,7 +32,6 @@ /** * Test the CLI script for exporting a repo from Moodle. * @group qbank_gitsync - * @runTestsInSeparateProcesses * * @covers \gitsync\export_repo::class */ diff --git a/tests/import_repo_test.php b/tests/import_repo_test.php index 9ffd010..ac7037e 100644 --- a/tests/import_repo_test.php +++ b/tests/import_repo_test.php @@ -56,7 +56,6 @@ public static function handle_abort():void { /** * Test the CLI script for importing a repo to Moodle. * @group qbank_gitsync - * @runTestsInSeparateProcesses * * @covers \gitsync\import_repo::class */ diff --git a/tests/lib_test.php b/tests/lib_test.php index 28ff967..641ab06 100644 --- a/tests/lib_test.php +++ b/tests/lib_test.php @@ -35,7 +35,6 @@ /** * Tests for library function in lib.php - * @runTestsInSeparateProcesses * @group qbank_gitsync */ class lib_test extends \advanced_testcase { diff --git a/tests/tidy_trait_test.php b/tests/tidy_trait_test.php index 48dd082..8717bae 100644 --- a/tests/tidy_trait_test.php +++ b/tests/tidy_trait_test.php @@ -33,8 +33,6 @@ * Test the CLI script for exporting a repo from Moodle. * @group qbank_gitsync * - * @runTestsInSeparateProcesses - * * @covers \gitsync\export_repo::class */ class tidy_trait_test extends advanced_testcase {