Skip to content

Always use hl2sdk-proxy-repo in checkout-deps#1236

Merged
Headline merged 3 commits intoalliedmodders:masterfrom
peace-maker:checkout-deps-mirror
May 8, 2020
Merged

Always use hl2sdk-proxy-repo in checkout-deps#1236
Headline merged 3 commits intoalliedmodders:masterfrom
peace-maker:checkout-deps-mirror

Conversation

@peace-maker
Copy link
Member

There were two separate issues with the checkout-deps scripts on windows and linux.

Windows didn't use the hl2sdk repository mirror "hl2sdk-proxy-repo" when cloning the different engine branches into their own folders like hl2sdk-csgo, hl2sdk-css, ... but cloned from github.com every time. When rerunning the checkout-deps.ps1 script later it would fail to find the "hl2sdk-proxy-repo" folder and fail to update the sdks.

Linux did use the local mirror repository for the initial clone of the different game sdk branches, but used github.com for later updates of the game sdks instead of using the local mirror.

Fix both scripts to always use the local mirror.

Looks like the AppVeyor config has to be updated too if it doesn't use the checkout-deps.ps1 script. #969

There were two separate issues with the checkout-deps scripts on windows and linux.

Windows didn't use the hl2sdk repository mirror "hl2sdk-proxy-repo" when cloning the different engine branches into their own folders like `hl2sdk-csgo`, `hl2sdk-css`, ... but cloned from github.com every time. When rerunning the checkout-deps.ps1 script later it would fail to find the "hl2sdk-proxy-repo" folder and fail to update the sdks.

Linux did use the local mirror repository for the initial clone of the different game sdk branches, but used github.com for later updates of the game sdks instead of using the local mirror.

Fix both scripts to always use the local mirror.
@peace-maker
Copy link
Member Author

Hm, thinking a little further.
With this change, you won't be able to update single repositories without fetching changes in the hl2sdk-proxy-repo first, which might be confusing.

Maybe a better way would be to only temporarily switch to the local proxy repo when updating the sdks through the checkout-deps scripts and keep the github.com origin when the script is not used?

@dvander
Copy link
Member

dvander commented Apr 21, 2020

That seems reasonable.

Keep the hl2sdk git origin at the remote github.com repository, but shortly switch to the local mirror when using the checkout-deps scripts.

This allows to pull changes for a single hl2sdk by hand without the need to fetch changes in the proxy-repo first.
Copy link
Member

@Headline Headline left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This sped up cloning significantly in some simple tests; thanks PM ❤️

@Headline Headline merged commit bc89e54 into alliedmodders:master May 8, 2020
@peace-maker peace-maker deleted the checkout-deps-mirror branch May 9, 2020 12:56
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.

3 participants