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