Skip to content

Commit 0ae91b6

Browse files
committed
Move mooodle-local_ci dependencies to normal
When moodle-plugin-ci was incepted, moodle-local_ci still did not have its own composer dependencies, so it was just installed raw (as a "package" repository). Since then, moodle-local_ci has got its own composer stuff, so we now can change to install its dependencies "normally". So, here we are, simply, switching from a "package" repository to a "vcs" one. Pointing to the v1.0.21 release that is the first supporting installation as a dependency. And then, removing the annoying @composer update that was executed in the post-x steps of composer, not needed anymore. For more information, this issue contains all the related events: moodlehq/moodle-local_ci#280
1 parent d76fc0d commit 0ae91b6

File tree

4 files changed

+90
-18
lines changed

4 files changed

+90
-18
lines changed

composer.json

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,8 @@
3737
},
3838
"repositories": [
3939
{
40-
"type": "package",
41-
"package": {
42-
"name": "moodlehq/moodle-local_ci",
43-
"version": "1.0.17",
44-
"source": {
45-
"url": "https://github.com/moodlehq/moodle-local_ci.git",
46-
"type": "git",
47-
"reference": "v1.0.17"
48-
}
49-
}
40+
"type": "vcs",
41+
"url": "https://github.com/moodlehq/moodle-local_ci.git"
5042
},
5143
{
5244
"type": "package",
@@ -64,7 +56,7 @@
6456
"require": {
6557
"php": ">=7.0.8",
6658
"moodlehq/moodle-cs": "^3.3.3",
67-
"moodlehq/moodle-local_ci": "^1.0.17",
59+
"moodlehq/moodle-local_ci": "^1.0.21",
6860
"moodlehq/moodle-local_moodlecheck": "^1.1.4",
6961
"sebastian/phpcpd": "^3.0",
7062
"sebastian/version": "^2.0.1",
@@ -114,7 +106,6 @@
114106
"post-update-cmd": "@local-ci-install",
115107
"post-create-project-cmd": "@local-ci-install",
116108
"local-ci-install": [
117-
"@composer update --prefer-dist --optimize-autoloader --working-dir=vendor/moodlehq/moodle-local_ci",
118109
"cd vendor/moodlehq/moodle-local_ci && npm install --no-progress"
119110
]
120111
}

composer.lock

Lines changed: 83 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
99
The format of this change log follows the advice given at [Keep a CHANGELOG](http://keepachangelog.com).
1010

1111
## [Unreleased]
12+
### Changed
13+
- Modified `moodle-local_ci` composer dependencies and manage them normally, removing some ancient bits that have [stopped working with Composer 2.6.0 and up](https://github.com/composer/composer/issues/11613).
14+
- Updated project dependencies to current [moodle-local_ci](https://github.com/moodlehq/moodle-local_ci) version.
1215

1316
## [3.4.12] - 2023-05-03
1417
### Changed

tests/FileUpdatesTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class FileUpdatesTest extends \PHPUnit\Framework\TestCase
1717
public function testLocalCIPackageJSON()
1818
{
1919
$this->assertSame(
20-
'060fde69ff2cc75b70fe560c998735b80e2e0942',
20+
'4b37d67998dd06d21c89865641135ed435baf65d',
2121
sha1_file(__DIR__.'/../vendor/moodlehq/moodle-local_ci/package.json'),
2222
'Check changes to vendor/moodlehq/moodle-local_ci/package.json and update MustacheCommand, etc if necessary'
2323
);

0 commit comments

Comments
 (0)