Skip to content

Conversation

@qaisjp
Copy link
Contributor

@qaisjp qaisjp commented Mar 28, 2020

Passing upgrade should say this (bonus: windows not necessary)

➜ ./utils/premake5-macos install_cef upgrade
Running action 'install_cef'...
Checking opensource.spotify.com for an update...
Does version '80.1.2+g9d2a31e+chromium-80.0.3987.149' look OK to you? (Y/n) y
New CEF hash is:	6cbf925620d686cae6549a40bb93ad1fd358a8eb80ec09c9313551c15930fbb0
Update `install_cef.lua` file? (Y/n) y

if you're on windows it will then proceed to install that new cef version

and git diff produces the following patch

diff --git a/utils/buildactions/install_cef.lua b/utils/buildactions/install_cef.lua
index 252cd8788..bea91be20 100644
--- a/utils/buildactions/install_cef.lua
+++ b/utils/buildactions/install_cef.lua
@@ -8,8 +8,8 @@ local CEF_URL_PREFIX = "http://opensource.spotify.com/cefbuilds/cef_binary_"
 local CEF_URL_SUFFIX = "_windows32_minimal.tar.bz2"

 -- Change here to update CEF version
-local CEF_VERSION = "80.0.4+g74f7b0c+chromium-80.0.3987.122"
-local CEF_HASH = "8fd8e24af196f00feaaa1553496bae99d8196ba023d0dd0fe44efeee93b04dfc"
+local CEF_VERSION = "80.1.2+g9d2a31e+chromium-80.0.3987.149"^M
+local CEF_HASH = "6cbf925620d686cae6549a40bb93ad1fd358a8eb80ec09c9313551c15930fbb0"^M

 function make_cef_download_url()
        return CEF_URL_PREFIX..http.escapeUrlParam(CEF_VERSION)..CEF_URL_SUFFIX

If CEF is already up to date (i.e CEF_VERSION matches what the server says)

➜ ./utils/premake5-macos install_cef upgrade
Running action 'install_cef'...
Checking opensource.spotify.com for an update...
CEF is already up to date (80.1.2+g9d2a31e+chromium-80.0.3987.149).

Also now we do a consistency check after download too

@qaisjp qaisjp added the enhancement New feature or request label Mar 28, 2020
@qaisjp qaisjp requested a review from jushar March 28, 2020 11:26
@qaisjp qaisjp force-pushed the feature/cef-upgrade-script branch from 5eb3075 to ff02a52 Compare March 28, 2020 11:29
@qaisjp
Copy link
Contributor Author

qaisjp commented Mar 29, 2020

"but it works on my machine!"

my pc too

@qaisjp qaisjp force-pushed the feature/cef-upgrade-script branch 6 times, most recently from 86539c3 to c7e5cdf Compare March 29, 2020 04:17
qaisjp added 4 commits March 29, 2020 05:18
currently:
- prints new hash and version
- unpacks new version
Revert to old method of computing hash (CertUtil) because escaping batch
scripts is broken
@qaisjp qaisjp force-pushed the feature/cef-upgrade-script branch from c7e5cdf to 9b5dd05 Compare March 29, 2020 04:18
@qaisjp
Copy link
Contributor Author

qaisjp commented Mar 29, 2020

ok, this is ready for review 👍

This change

Also now we do a consistency check after download too

caused issues with CI. It basically boiled down to some inconsistency in executing things in powershell. So i've reverted to the old method of generating SHA256 hashes

@qaisjp qaisjp added this to the 1.6 milestone Mar 30, 2020
@jushar
Copy link
Contributor

jushar commented Apr 2, 2020

I'm currently not able to test it, but it looks good to me. If it works, feel free to merge it!

@qaisjp qaisjp merged commit ed80d57 into multitheftauto:master Apr 2, 2020
@qaisjp qaisjp deleted the feature/cef-upgrade-script branch April 2, 2020 16:55
@qaisjp
Copy link
Contributor Author

qaisjp commented Apr 2, 2020

Thanks! Next task is automated pull requests :-)

@qaisjp qaisjp removed the request for review from jushar April 2, 2020 16:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants