Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rciti1 #620

Merged
merged 3 commits into from
Mar 11, 2020
Merged

Rciti1 #620

merged 3 commits into from
Mar 11, 2020

Conversation

atton16
Copy link
Contributor

@atton16 atton16 commented Mar 11, 2020

No description provided.

@AmplabJenkins
Copy link

Can one of the admins verify this patch?

@shankari shankari merged commit 31fe33a into e-mission:rciti1 Mar 11, 2020
@shankari
Copy link
Contributor

@asiripanich @atton16 I just deployed this build to the rciti1 channel. It should be live in ~ 10 mins.
Could you test it using
https://e-mission.eecs.berkeley.edu/#/client_setup?new_client=rciti1&clear_usercache=true&clear_local_storage=true

If it works correctly, then I will follow the same procedure to set up the other channels as well so we can make sure the setup stuff is under control. Please let me know ASAP.

@asiripanich
Copy link
Member

asiripanich commented Mar 11, 2020 via email

@shankari
Copy link
Contributor

@asiripanich I debugged this further. This is because the index.html has the line

<script type="text/javascript" src="cordova.js"></script>

That is required for the live-reload in the devapp, but it will break emTripLog. I had already ensured that the master for the deploy code included it properly.
https://github.com/e-mission/e-mission-phone/blob/deploy-upload-master/www/index.html#L64

<script src="cordova.js"></script>

However, @atton16 had edited this line to remove (6040e18) and reinsert (ad230b5) the type="text/javascript" part, so the final merged version had it inserted.

@atton16 since I assume you are not going to be testing live-reload from the rciti1...rciti4 branches, can you remove type="text/javascript" from them? Then any further pulls won't reintroduce it...

@atton16
Copy link
Contributor Author

atton16 commented Mar 12, 2020

Fixed!

@asiripanich
Copy link
Member

@shankari I'm still seeing the white screen. @atton16 mentioned that it worked on the devapp.

@shankari
Copy link
Contributor

I merged and pushed the change, but forgot to launch the build on the ionic dashboard. This is what happens if you try to work on things after midnight. Try again now.

@atton16 mentioned that it worked on the devapp.

This doesn't help because the cause of the WSOD is the one piece of code that needs to be different between devapp and emTripLog.

@asiripanich
Copy link
Member

;) @shankari thank you. It is working now.

@shankari
Copy link
Contributor

great, so I will deploy the other channels as well so that at least that part of the setup is complete.

@shankari
Copy link
Contributor

Just deployed to the rciti2, rciti3 and rciti4 channels. Please test that the setup worked in ~ 10 mins. After this, you should be able to test only on one of the channels, or on the rkunsw channel :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants