Re: The website is not building correctly (git pull stalled)
Boyuan Yang <[email protected]>
| Newsgroups | gmane.linux.debian.devel.www |
|---|---|
| Organization | the Debian Project |
| Message-ID | <[email protected]> |
在 2019-04-05五的 00:34 +0200,Cyril Brulebois写道: > Hi, > > Laura Arjona Reina <[email protected]> (2019-04-04): > > El 4/4/19 a las 19:54, Boyuan Yang escribió: > > > Is there any possibility that we do a "git reset --hard HEAD; git > > > clean -xdf" before actually "git pull"? > > > > > > > My git skills are not enough to know if this could have unintended > > consequences in www-master.debian.org, or if it would penalise the > > build time. I tend to think that if a normal "git pull" fails, we'd > > like to have a look at where is the issue, as in this case. > > > > In any case, I have created a merge request with your suggestions > > as > > addition to the 2git script in our cron repo: > > > > https://salsa.debian.org/webmaster-team/cron/merge_requests/3 > > > > I hope others can merge or comment on that. > > The first command is similar to “git checkout -f” → forgetting about > all local changes; the second command is basically about removing all > untracked files, meaning killing all generated files. > > This would make sure there are no leftovers, ever. Or let us detect > issues (like some that I reported a few weeks ago) that could be > hidden if a build had happened previously. But the build time > penalties don't seem worth it? I don't have access to the production server thus didn't know how were the generated HTML pages placed; if they are always placed together with all the source code and being ignored by git, the second command does not make sense and we should not remove the generated files using "git clean -xdf" every time. However, the first git command should be okay. -- Thanks, Boyuan Yang
signature.asc
(application/pgp-signature, 858 B)
-----BEGIN PGP SIGNATURE----- iQJFBAABCgAvFiEEfncpR22H1vEdkazLwpPntGGCWs4FAlymkgIRHGJ5YW5nQGRl Ymlhbi5vcmcACgkQwpPntGGCWs6u/A/8DmCGGqhq5NkaD/xv9G4/qGve2x4p7IXT x4DPWqT97bq+a3DBAVC9+Sy4K/GVu7muABm3X4rToHCryF84JW+YMJQuHG7fEUXY 4GqctnkDZDxLJ+Cx1K79Xv18UrLKReAWjNKavry5HWx9OrBdhms0vaixbdZSojjr 6v7DZDsJqPMJlDSGIbY0fHMEAB3CvjfUJwHoXJRVJxP3SP+tZBLxkkpVWT7nzguI T7Y0h2/pacXJShlvxhx931ig/i4RpRYEbItVvPTud6tDsQRETQw4vubnkjRpViNm oHXTOb/q2qEgk3c1oTsB/cxIrkyE6UjT2Emkrf2sE0vfLdPGFooP1fP2bywJqXqP 8cRu+zJcG2xTaNpDwghgeOUV5Ut9BHLqsZcs1roarxeUI0SIazPjUkiTLscR8Rv/ PfSOYwhZNFdsVkB4/D08WfG0AlxOjxbQkZAUuCvvCw60EE3QYbw0i2D0XrA6T6eK +WvgSOYJqGgq9xpjZC1C1nEjKYHLuEuEkm1S3Ix5VOl1Kd/pKYNXm/qNjuxjmk5Q 5nssVBOo23qVlLmDVB7S8KcA+8jhvO2osFd7iDdMCJL0UoxbTlc+ARBFh+NWW738 ZWvqJJW+H+kpQIDwQV58JZNnarooT5bNV0J/sn3nHBhPucxC9Z/t1QobYVgCB5yK 9YVZHd6UAn0= =OZKI -----END PGP SIGNATURE-----