1Cloning with 0 retries
0s
2Initialized empty Git repository in /drone/src/.git/
0s
3+ git fetch origin +refs/heads/6.0-dev:
0s
4From https://github.com/joomla/joomla-cms
29s
5 * branch 6.0-dev -> FETCH_HEAD
29s
6 * [new branch] 6.0-dev -> origin/6.0-dev
29s
7+ git checkout 6.0-dev
29s
8Branch '6.0-dev' set up to track remote branch '6.0-dev' from 'origin'.
30s
9Switched to a new branch '6.0-dev'
30s
10+ git fetch origin refs/pull/45020/head:
30s
11From https://github.com/joomla/joomla-cms
30s
12 * branch refs/pull/45020/head -> FETCH_HEAD
30s
13+ git merge f368dfab63eba7c4a6183fd0a0c2c96eb38f5f01
30s
14Updating 289b873c41..f368dfab63
30s
15Fast-forward
31s
16 build/build-modules-js/settings.json | 5 +++++
31s
17 build/media_source/legacy/joomla.asset.json | 17 -----------------
31s
18 build/media_source/legacy/js/jquery-noconflict.es5.js | 1 -
31s
19 .../vendor/jquery/js/jquery-noconflict.es6.js | 2 ++
31s
20 4 files changed, 7 insertions(+), 18 deletions(-)
31s
21 delete mode 100644 build/media_source/legacy/joomla.asset.json
31s
22 delete mode 100644 build/media_source/legacy/js/jquery-noconflict.es5.js
31s
23 create mode 100644 build/media_source/vendor/jquery/js/jquery-noconflict.es6.js
31s
