Update from 2.15 to 2.16

[andyyy]

Hi,

I do have an issue updating to 2.16. As usual I needed to reset the repro (git reset --hard), but few files are there they prevent updating:

Updating 491f5aa7..26a76f80
error: The following untracked working tree files would be overwritten by merge:
        .github/codecov.yml
        .husky/.gitignore
        .husky/pre-commit
        css/custom.css.sample
        modules/default/weather/providers/envcanada.js
        tests/configs/data/calendar_test_recurring.ics
        tests/configs/data/weatherforecast_data.json
        tests/configs/modules/alert/default.js
        tests/configs/modules/calendar/recurring.js
        tests/configs/modules/weather/forecastweather_units.js
        tests/e2e/ipWhitelist_spec.js
        tests/e2e/modules/alert_spec.js
        tests/unit/mocks/logger.js
Please move or remove them before you merge.

Just removing them wasn’t a good idea. Eventually the update went through but I did end up with black screen even with npm install on all modules.

@sdetweil
Unfortunately your update script didn’t work either.

Any advice?

Thanks!

[sdetweil]

@andyyy black screen is probably because of the removed request and other libs in 2.16

look at the messages where start mm

if npm start, that window
if pm2, the pm2 logs --lines=100

u should see a module not found message

[sdetweil]

@andyyy my script won’t help if u do it manually.
but it does give u the chance to save the files so you can continue ( using git stash )

[andyyy]

@sdetweil

I did revert to the last working backup and tried your update script. And here it failed updating with same error message in the log file.

Should I delete all the files in the error file as I did?

[sdetweil]

@andyyy I’ll check out my script

untracked may be the cause.

wonder how u got the files, but not in git…

but the black screen isn’t because of those

[sdetweil]

@andyyy just do git stash
or delete them if u don’t know what they are.

then try again

[sdetweil]

@andyyy can u send me the ~/MagiMirror/installers/upgrade.log

| doah, not install , upgrade log… yeesh

my email is the same user ID at gmail

[sdetweil]

I can recreate the problem in my script

I bet u tried the develop branch. and switched back to master, and these files aren’t in master on 2.15, but the final versions are different than the develop versions.

[andyyy]

@sdetweil

Solved for now :)

I did:

sudo git fetch --all
sudo git reset --hard origin/master
sudo git pull origin master

My system is still very fragile. When do npm install after that, the screen turn black after reboot.

[sdetweil]

@andyyy said in Update from 2.15 to 2.16:

the screen turn black after reboot.

again, this si because libraries in 2.15 were removed in 2.16 and some modules didn’t document their requirements properly…

find the MM startup messages (npm start or pm2 logs)
and look for ‘module not found’

I REALLY hate reset --hard…