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.

Sign up for GitHub

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

Jump to bottom

fix issue #9228 : Add support to subgroups in gitlab #9248

Merged
merged 3 commits into from
Jul 30, 2020
Merged

fix issue #9228 : Add support to subgroups in gitlab #9248

merged 3 commits into from
Jul 30, 2020

Conversation

RamadanAhmed
Copy link
Contributor

@RamadanAhmed RamadanAhmed commented Dec 8, 2019 •
edited by JackBoosY
Loading

Fixes #9228.

@RamadanAhmed RamadanAhmed changed the title fix issue #9228 : Add support to subgroups in gitlab WIP issue #9228 : Add support to subgroups in gitlab Dec 8, 2019
@RamadanAhmed RamadanAhmed changed the title WIP issue #9228 : Add support to subgroups in gitlab fix issue #9228 : Add support to subgroups in gitlab Dec 8, 2019
@PhoebeHui PhoebeHui self-requested a review December 10, 2019 02:55
@dan-shaw dan-shaw self-assigned this Dec 11, 2019
@RamadanAhmed
Copy link
Contributor Author

@dan-shaw @PhoebeHui does reviewing need the CI to work ?

@dan-shaw
Copy link
Contributor

Thanks for the PR! We aren't quite sure what this PR does. Can you clarify what usecases this change could have?

@RamadanAhmed
Copy link
Contributor Author

RamadanAhmed commented Dec 14, 2019 •
edited
Loading

old vcpkg_from_gitlab didn't support subgroups within organization, so I for example

https://gitlab.com/test-grp3/mysubgroup/test1

vcpkg_download_distfile will fail if we provide the link as
"${_vdud_GITLAB_URL}/${ORG_NAME}/${REPO_NAME}/-/archive/${_vdud_REF}/${REPO_NAME}-${_vdud_REF}.tar.gz"

so I add a group name to previous link, only if gitlab link provided in portfile contain 3 entity(subgroup, repo name, organization) not 2(orgnization, repo name)

so I changed link passed to vcpkg_download_distfile to be like this
"${_vdud_GITLAB_URL}/${ORG_NAME}/${GroupName}/$/{REPO_NAME}/-/archive/${_vdud_REF}/${REPO_NAME}-${_vdud_REF}.tar.gz"

@PhoebeHui PhoebeHui self-assigned this Jan 14, 2020
@RamadanAhmed
Copy link
Contributor Author

RamadanAhmed commented May 12, 2020 •
edited
Loading

Any Updates on the issue @PhoebeHui

@PhoebeHui
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@PhoebeHui
Copy link
Contributor

The CI test pass, @dan-shaw, could you help futher review?

@JackBoosY JackBoosY added the category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed label Jun 9, 2020
@JackBoosY JackBoosY requested a review from dan-shaw June 9, 2020 07:31
@ras0219-msft
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@strega-nil strega-nil merged commit b840d03 into microsoft:master Jul 30, 2020
hellozee pushed a commit to hellozee/vcpkg that referenced this pull request Sep 11, 2020
@RamadanAhmed @hellozee
fix issue microsoft#9228 : Add support to subgroups in gitlab (micros…
b7e6ff1 
…oft#9248)

* fix issue microsoft#9228 : Add support to subgroups in gitlab

* Update vcpkg_from_gitlab.cmake

* Update vcpkg_from_gitlab.cmake
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ras0219-msft ras0219-msft ras0219-msft approved these changes

@PhoebeHui PhoebeHui Awaiting requested review from PhoebeHui

@dan-shaw dan-shaw Awaiting requested review from dan-shaw

Assignees

@PhoebeHui PhoebeHui

@dan-shaw dan-shaw

Labels
category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Bug in vcpkg_from_gitlab
6 participants
@RamadanAhmed @dan-shaw @PhoebeHui @ras0219-msft @strega-nil @JackBoosY