search

VandyVRC / srophe-eXist-app

eXist code for Syriaca.org: The Syriac Reference Portal
GNU General Public License v3.0
0 stars 1 forks source link

"dev" server not updating #212

Closed millertg closed 3 years ago

millertg commented 3 years ago

@wsalesky @CliffordAnderson @shubenda After troubleshooting on 08/05/21, we suspect webhooks from the dev branch are not functioning as they do for the production (aka "master") branch. Consequently, we cannot see what the dev updates look like in html. Once we can see changes made to dev displayed on: dev.architectura.sinica.org, then we can switch both China and US development to dev, reserving prod branch for final publication only.

Winona, I think you might be the only one who can make this happen--can you help?

wsalesky commented 3 years ago

Yes I will take a look.

wsalesky commented 3 years ago

@millertg Looks like the db maybe corrupt, getting a fresh install running and then hopefully everything will run as expected.

millertg commented 3 years ago

Ok, great. Thank you so much!

millertg commented 3 years ago

@wsalesky I just checked the dev server again and I am not seeing any data. I assume this is because you are still working on it. We thought we should leave the site (dev and prod) alone until you were done, but are worried that the issues are complex. Do you have a sense of when dev might be functioning?

wsalesky commented 3 years ago

@millertg sorry for the delay, I hope to have an update for you tomorrow.

millertg commented 3 years ago

@wsalesky ok, thanks!

wsalesky commented 3 years ago

@millertg Please take a look now. This should now reflect the development branch for both the application and the data. Let me know if you see any issues, or have trouble with the webhooks.

millertg commented 3 years ago

@wsalesky It looks good! Thank you!!

shubenda commented 3 years ago

Winona,

I have updated k000179 and pushed to the development site: https://github.com/VandyVRC/tcadrt/tree/development/data

But I am getting the: HTTP ERROR 404 Document /db/apps/tcadrt/404.html not found for https://dev.architecturasinica.org/keyword/k000179

When did I do wrong?

Yuh-Fen

From: Winona Salesky @.> Sent: Tuesday, August 10, 2021 12:39 PM To: VandyVRC/srophe-eXist-app @.> Cc: Benda, Yuh-Fen @.>; Mention @.> Subject: Re: [VandyVRC/srophe-eXist-app] "dev" server not updating (#212)

@millertghttps://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fmillertg&data=04%7C01%7Cyuh-fen.benda%40Vanderbilt.Edu%7Ca8b0022bb1f84ba2a6b108d95c25bef8%7Cba5a7f39e3be4ab3b45067fa80faecad%7C0%7C0%7C637642139445013381%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=L0tG7gLasTwCwiOvYqGgmvLuzWVE0QHGuKdPFz6AuL8%3D&reserved=0 Please take a look now. This should now reflect the development branch for both the application and the data. Let me know if you see any issues, or have trouble with the webhooks.

- You are receiving this because you were mentioned. Reply to this email directly, view it on GitHubhttps://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FVandyVRC%2Fsrophe-eXist-app%2Fissues%2F212%23issuecomment-896183040&data=04%7C01%7Cyuh-fen.benda%40Vanderbilt.Edu%7Ca8b0022bb1f84ba2a6b108d95c25bef8%7Cba5a7f39e3be4ab3b45067fa80faecad%7C0%7C0%7C637642139445023336%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=U6KtUFZkTARrHG9CwpqZkmxTl%2BKwYGsDVLx1FGyBv5M%3D&reserved=0, or unsubscribehttps://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FACFXEILCC3CZTGDN6Q247XLT4FP3PANCNFSM5BTZJKZA&data=04%7C01%7Cyuh-fen.benda%40Vanderbilt.Edu%7Ca8b0022bb1f84ba2a6b108d95c25bef8%7Cba5a7f39e3be4ab3b45067fa80faecad%7C0%7C0%7C637642139445023336%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=Z4D6QTqJaRfMvHDxvxwa0qyIWGCaOzfj76RHfG%2B5a4I%3D&reserved=0. Triage notifications on the go with GitHub Mobile for iOShttps://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fapps.apple.com%2Fapp%2Fapple-store%2Fid1477376905%3Fct%3Dnotification-email%26mt%3D8%26pt%3D524675&data=04%7C01%7Cyuh-fen.benda%40Vanderbilt.Edu%7Ca8b0022bb1f84ba2a6b108d95c25bef8%7Cba5a7f39e3be4ab3b45067fa80faecad%7C0%7C0%7C637642139445033287%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=c%2FSYXGzb74XGipCGoxW2VpuJMB%2Fv%2BsT%2F0%2BVEmYWxKX4%3D&reserved=0 or Androidhttps://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dcom.github.android%26utm_campaign%3Dnotification-email&data=04%7C01%7Cyuh-fen.benda%40Vanderbilt.Edu%7Ca8b0022bb1f84ba2a6b108d95c25bef8%7Cba5a7f39e3be4ab3b45067fa80faecad%7C0%7C0%7C637642139445033287%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=L5r9KAgrNojON2U5rjkgVYmv0OCq46awyWBEVX0Ln0c%3D&reserved=0.

wsalesky commented 3 years ago

@shubenda can you ty making another change and resubmitting the records? The record on the server has the wrong id (https://architecturasinica.org/keyword/k000173) so there may have been a mix up while I was setting up the dev server. Any minor change should work, even spacing. Then let me know after you submit it.

shubenda commented 3 years ago

Winona,

I just made some changes on k000173 and submitted. Thank you.

Yuh-Fen

From: Winona Salesky @.> Sent: Tuesday, August 10, 2021 1:55 PM To: VandyVRC/srophe-eXist-app @.> Cc: Benda, Yuh-Fen @.>; Mention @.> Subject: Re: [VandyVRC/srophe-eXist-app] "dev" server not updating (#212)

@shubendahttps://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fshubenda&data=04%7C01%7Cyuh-fen.benda%40Vanderbilt.Edu%7C93c4424e19df4c1e4af908d95c3058d4%7Cba5a7f39e3be4ab3b45067fa80faecad%7C0%7C0%7C637642185056430455%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=ZTKSyx%2FRsYeScLhuyVx6UN%2B3E6I9r3DbqKsUdl9804U%3D&reserved=0 can you ty making another change and resubmitting the records? The record on the server has the wrong id (https://architecturasinica.org/keyword/k000173https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Farchitecturasinica.org%2Fkeyword%2Fk000173&data=04%7C01%7Cyuh-fen.benda%40Vanderbilt.Edu%7C93c4424e19df4c1e4af908d95c3058d4%7Cba5a7f39e3be4ab3b45067fa80faecad%7C0%7C0%7C637642185056430455%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=OVWbV7vf6JpHkMnnPDFWa44EsRLEWAEqGLcsMoBd%2BKU%3D&reserved=0) so there may have been a mix up while I was setting up the dev server. Any minor change should work, even spacing. Then let me know after you submit it.

- You are receiving this because you were mentioned. Reply to this email directly, view it on GitHubhttps://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FVandyVRC%2Fsrophe-eXist-app%2Fissues%2F212%23issuecomment-896234686&data=04%7C01%7Cyuh-fen.benda%40Vanderbilt.Edu%7C93c4424e19df4c1e4af908d95c3058d4%7Cba5a7f39e3be4ab3b45067fa80faecad%7C0%7C0%7C637642185056440409%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=y%2FqD%2FOzRUHJcdeYXEgaWlmXSclLD0ZGGBoSkFpgIm3g%3D&reserved=0, or unsubscribehttps://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FACFXEIJD6MV6HTNQD47OZQLT4FYYBANCNFSM5BTZJKZA&data=04%7C01%7Cyuh-fen.benda%40Vanderbilt.Edu%7C93c4424e19df4c1e4af908d95c3058d4%7Cba5a7f39e3be4ab3b45067fa80faecad%7C0%7C0%7C637642185056440409%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=IiEJbi35WEvqOR9mTW55v%2Bpbwvo82SYpYdSOa05oV%2FA%3D&reserved=0. Triage notifications on the go with GitHub Mobile for iOShttps://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fapps.apple.com%2Fapp%2Fapple-store%2Fid1477376905%3Fct%3Dnotification-email%26mt%3D8%26pt%3D524675&data=04%7C01%7Cyuh-fen.benda%40Vanderbilt.Edu%7C93c4424e19df4c1e4af908d95c3058d4%7Cba5a7f39e3be4ab3b45067fa80faecad%7C0%7C0%7C637642185056450365%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=lUs%2B9tzGNG06CFqOtevRWuk7yhF%2BwPga8wF8pESiMT0%3D&reserved=0 or Androidhttps://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dcom.github.android%26utm_campaign%3Dnotification-email&data=04%7C01%7Cyuh-fen.benda%40Vanderbilt.Edu%7C93c4424e19df4c1e4af908d95c3058d4%7Cba5a7f39e3be4ab3b45067fa80faecad%7C0%7C0%7C637642185056450365%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=AnQJWiJeXrX0Vt9cv1Y6Vz1R3o%2FA4LLz2PrEi26SsjE%3D&reserved=0.

wsalesky commented 3 years ago

@shubenda Thank you. There is a problem with the webhooks. I will get back to you shortly.

shubenda commented 3 years ago

Thank you, Winona!

Not sure if you need this info. But there was another new keyword doesn't display on dev. Site: k000154

Yuh-Fen

From: Winona Salesky @.> Sent: Tuesday, August 10, 2021 2:21 PM To: VandyVRC/srophe-eXist-app @.> Cc: Benda, Yuh-Fen @.>; Mention @.> Subject: Re: [VandyVRC/srophe-eXist-app] "dev" server not updating (#212)

@shubendahttps://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fshubenda&data=04%7C01%7Cyuh-fen.benda%40Vanderbilt.Edu%7C5712dc4e427145b48ffe08d95c33fe30%7Cba5a7f39e3be4ab3b45067fa80faecad%7C0%7C0%7C637642200640679995%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=HMq8MzMf5vQcrSR2IPLavoIIah%2FDXedVYfjP%2FWB4Gec%3D&reserved=0 Thank you. There is a problem with the webhooks. I will get back to you shortly.

- You are receiving this because you were mentioned. Reply to this email directly, view it on GitHubhttps://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FVandyVRC%2Fsrophe-eXist-app%2Fissues%2F212%23issuecomment-896253013&data=04%7C01%7Cyuh-fen.benda%40Vanderbilt.Edu%7C5712dc4e427145b48ffe08d95c33fe30%7Cba5a7f39e3be4ab3b45067fa80faecad%7C0%7C0%7C637642200640679995%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=2iBEzMinLSW%2Bnq7G0aBYSVh03XPtVYc1nEkNF%2FARUoI%3D&reserved=0, or unsubscribehttps://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FACFXEIIPKU3RRMBQQTDSQM3T4F3Z3ANCNFSM5BTZJKZA&data=04%7C01%7Cyuh-fen.benda%40Vanderbilt.Edu%7C5712dc4e427145b48ffe08d95c33fe30%7Cba5a7f39e3be4ab3b45067fa80faecad%7C0%7C0%7C637642200640689951%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=OKEXrc3tP1NvvcVWryasVQeE1Aj%2BZcC6u%2FzsS00iI0A%3D&reserved=0. Triage notifications on the go with GitHub Mobile for iOShttps://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fapps.apple.com%2Fapp%2Fapple-store%2Fid1477376905%3Fct%3Dnotification-email%26mt%3D8%26pt%3D524675&data=04%7C01%7Cyuh-fen.benda%40Vanderbilt.Edu%7C5712dc4e427145b48ffe08d95c33fe30%7Cba5a7f39e3be4ab3b45067fa80faecad%7C0%7C0%7C637642200640689951%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=YnhydkBTxauhfdL%2F5zZF4rUPEn8WUPR7OhTuMZWm3IY%3D&reserved=0 or Androidhttps://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dcom.github.android%26utm_campaign%3Dnotification-email&data=04%7C01%7Cyuh-fen.benda%40Vanderbilt.Edu%7C5712dc4e427145b48ffe08d95c33fe30%7Cba5a7f39e3be4ab3b45067fa80faecad%7C0%7C0%7C637642200640699911%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=4LdEkG5j%2F5Jz7t8Bfjk5IgPY3IENT9W2B4nNsVcrVFs%3D&reserved=0.

wsalesky commented 3 years ago

@shubenda I think this has been fixed. (https://dev.architecturasinica.org/keyword/k000179) Please try again with the other missing keyword, and let me know how it goes.

millertg commented 3 years ago

@winona @shubenda I tried to change k000001 from my copy of the dev server, but it shows unresolved conflicts with two records that Yuh Fen changed. These seem up to date in my desktop folder, however. So I am confused.

I can see the change in Dev, however. Yay!!!

So... I think I get it--of course, the two records Yuh-Fen have changed in Dev haven't been pushed to Prod. So, when we want to push all of these changes to Prod, what will we need to do to resolve the conflicts?

Screen Shot 2021-08-10 at 8 59 09 PM Screen Shot 2021-08-10 at 9 05 54 PM Screen Shot 2021-08-10 at 9 09 17 PM

wsalesky commented 3 years ago

@millertg I'm not sure what your process is, but it is very important to do a pull request on the development branch before you start working, or before you commit your work. This will help eliminate merge conflicts. As it is you will need to resolve the current conflicts before you can merge your branch into the development branch. I use the tool mergeTool, but perhaps you can also use the GitHub desktop tool to resolve the conflicts? Another option is to checkout the development branch, do a pull request to make sure it is up to date, create your branch, edit k000001 and then do a new pull request. You may also want to get @CliffordAnderson to walk you through one merge conflict in person, just so you have an idea how to resolve conflicts, as they will arise occasionally.

Only after you have checked your changes on the dev server will you want to merge them into the production server/main branch.

millertg commented 3 years ago

@wsalesky @shubenda I figured out how to fix it (whew!), but probably in the most time-consuming way possible.... Also was able to comment out in-process text in Dev and push to Prod, do that works too. Now, we have 154 and 179 in Prod. Yuh-Fen--will you update your Dev and Prod, then add something in Dev and push to Prod? I want to make sure we can both update both without running into conflicts... Thanks for your patience!

millertg commented 3 years ago

and perseverance ;-)

millertg commented 3 years ago

@wsalesky @shubenda We merged the master back in to development. The result seemed good, but now, although I see the files for both k000179 and k000154 in dev and prod, those two are not displaying on the dev server (404 Error). Could we be back to a webhook issue?

wsalesky commented 3 years ago

I will investigate. -Winona

On Wed, Aug 11, 2021 at 1:43 PM Tracy Miller @.***> wrote:

@wsalesky https://github.com/wsalesky @shubenda https://github.com/shubenda We merged the master back in to development. The result seemed good, but now, although I see the files for both k000179 and k000154 in dev and prod, those two are not displaying on the dev server (404 Error). Could we be back to a webhook issue?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/VandyVRC/srophe-eXist-app/issues/212#issuecomment-897023038, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAI5GTTRUOYGH7IPPNLMKMDT4KZFTANCNFSM5BTZJKZA . Triage notifications on the go with GitHub Mobile for iOS https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675 or Android https://play.google.com/store/apps/details?id=com.github.android&utm_campaign=notification-email .

CliffordAnderson commented 3 years ago

I am happy to assist with handling merge conflicts, but it sounds like @millertg and @shubenda have things under control now.

millertg commented 3 years ago

@CliffordAnderson Thanks for the offer--we may yet have need to take you up on that!

wsalesky commented 3 years ago

@millertg I am working on webhooks this afternoon, if you can not push any new changes while I test that would be great!

millertg commented 3 years ago

@wsalesky @shubenda Of course! We will stay away from the site until you give us the word.

wsalesky commented 3 years ago

@millertg @shubenda Okay, we should be good.

millertg commented 3 years ago

@wsalesky Ok, I can see something to update in 179, so I will give it a try

millertg commented 3 years ago

@wsalesky @shubenda I changed a little bit of the text in k000195. It seems to work very well! Except dev seems to be running an old version of the Zotero library. Can we make it so that the dev server pulls from the most updated version of the Zotero library? Or will we need to run a separate update for dev on Zotero?

This is from the Dev server: Screen Shot 2021-08-13 at 4 06 30 PM

This is from the Prod server: Screen Shot 2021-08-13 at 4 45 50 PM

wsalesky commented 3 years ago

@millertg I updated it for you, but you will need to run periodic updates just like on the production site.

millertg commented 3 years ago

@wsalesky Ok, good--that is what I thought! Would the update url for the development site then be: https://dev.architecturasinica.org/apps/zotero2bibl/index.html Thank you!!

millertg commented 3 years ago

@wsalesky The dev Zotero update works! And only took 9 seconds to complete an update. Thank you!!