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
30s
5 * branch 6.0-dev -> FETCH_HEAD
30s
6 * [new branch] 6.0-dev -> origin/6.0-dev
30s
7+ git checkout 6.0-dev
30s
8Branch '6.0-dev' set up to track remote branch '6.0-dev' from 'origin'.
31s
9Switched to a new branch '6.0-dev'
31s
10+ git fetch origin refs/pull/45020/head:
31s
11From https://github.com/joomla/joomla-cms
31s
12 * branch refs/pull/45020/head -> FETCH_HEAD
31s
13+ git merge d262b6a1336368b17309da7a4bdc52fe0c5a9715
31s
14Updating a383988dd9..d262b6a133
31s
15Fast-forward
32s
16 build/build-modules-js/settings.json | 5 +++++
32s
17 build/media_source/legacy/joomla.asset.json | 17 -----------------
32s
18 build/media_source/legacy/js/jquery-noconflict.es5.js | 1 -
32s
19 .../vendor/jquery/js/jquery-noconflict.es6.js | 2 ++
32s
20 4 files changed, 7 insertions(+), 18 deletions(-)
32s
21 delete mode 100644 build/media_source/legacy/joomla.asset.json
32s
22 delete mode 100644 build/media_source/legacy/js/jquery-noconflict.es5.js
32s
23 create mode 100644 build/media_source/vendor/jquery/js/jquery-noconflict.es6.js
32s
