[highfive] fix SHA of downloading patch #29708
Conversation
|
@microsoft-github-policy-service agree |
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
LilyWangLL
added
category:port-bug
LilyWangLL
changed the title
|
Please also modify the |
LilyWangLL
added
info:reviewed
|
What is the delay to merge these kinds of PR ? |
There is a group of people which do review. There is another group of people which do merges. There are also community members. |
ports/highfive/fix-catch2-669.patch
Outdated
| diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml | ||
| index 7f8f8135d..11627bb7e 100644 | ||
| --- a/.github/workflows/ci.yml | ||
| +++ b/.github/workflows/ci.yml | ||
| @@ -28,26 +28,28 @@ jobs: | ||
| # Job testing compiling on several Ubuntu systems + MPI | ||
| # ========================================================= | ||
| # | ||
| - # For 18.04: bare HighFive | ||
| - # For 20.04: activate Boost, OpenCV | ||
| + # For 20.04: bare and activate Boost, OpenCV | ||
| # For latest: activate Boost, Eigen, OpenCV, with Ninja | ||
| # | ||
| # XTensor tests are run for conda/mamba and MacOS | ||
| Linux_MPI: | ||
| - runs-on: ${{matrix.os}} | ||
| + runs-on: ${{matrix.config.os}} | ||
| + name: ${{toJson(matrix.config)}} | ||
| strategy: | ||
| matrix: | ||
| - os: [ubuntu-18.04, ubuntu-20.04, ubuntu-latest] | ||
| include: | ||
| - - os: ubuntu-18.04 | ||
| - pkgs: '' | ||
| - flags: '-DHIGHFIVE_USE_BOOST:Bool=OFF' | ||
| - - os: ubuntu-20.04 | ||
| - pkgs: 'libboost-all-dev libopencv-dev' | ||
| - flags: '-DHIGHFIVE_USE_OPENCV:Bool=ON -GNinja' | ||
| - - os: ubuntu-latest | ||
| - pkgs: 'libboost-all-dev libeigen3-dev libopencv-dev' | ||
| - flags: '-DHIGHFIVE_USE_EIGEN:Bool=ON -DHIGHFIVE_USE_OPENCV:Bool=ON -GNinja' | ||
| + - config: | ||
| + os: ubuntu-20.04 | ||
| + pkgs: '' | ||
| + flags: '-DHIGHFIVE_USE_BOOST:Bool=OFF' | ||
| + - config: | ||
| + os: ubuntu-20.04 | ||
| + pkgs: 'libboost-all-dev libopencv-dev' | ||
| + flags: '-DHIGHFIVE_USE_OPENCV:Bool=ON -GNinja' | ||
| + - config: | ||
| + os: ubuntu-latest | ||
| + pkgs: 'libboost-all-dev libeigen3-dev libopencv-dev' | ||
| + flags: '-DHIGHFIVE_USE_EIGEN:Bool=ON -DHIGHFIVE_USE_OPENCV:Bool=ON -GNinja' | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| @@ -62,11 +64,11 @@ jobs: | ||
| - name: "Install libraries" | ||
| run: | | ||
| sudo apt-get -qq update | ||
| - sudo apt-get -qq install libhdf5-openmpi-dev libsz2 ninja-build ${{ matrix.pkgs }} | ||
| + sudo apt-get -qq install libhdf5-openmpi-dev libsz2 ninja-build ${{ matrix.config.pkgs }} | ||
|
|
||
| - name: Build | ||
| run: | | ||
| - CMAKE_OPTIONS=(-DHIGHFIVE_PARALLEL_HDF5:BOOL=ON ${{ matrix.flags }}) | ||
| + CMAKE_OPTIONS=(-DHIGHFIVE_PARALLEL_HDF5:BOOL=ON ${{ matrix.config.flags }}) | ||
| source $GITHUB_WORKSPACE/.github/build.sh | ||
|
|
||
| - name: Test | ||
| diff --git a/deps/catch2 b/deps/catch2 | ||
| index 182c910b4..ab6c7375b 160000 | ||
| --- a/deps/catch2 | ||
| +++ b/deps/catch2 | ||
| @@ -1 +1 @@ | ||
| -Subproject commit 182c910b4b63ff587a3440e08f84f70497e49a81 | ||
| +Subproject commit ab6c7375be9a8e71ee84c6f8537113f9f47daf99 |
There was a problem hiding this comment.
Patches in vcpkg shall be minimal. These chunks do not belong here.
There was a problem hiding this comment.
I'm not a core developer of highfive and I just made this PR to fix its installation using vcpkg.
It's probably time to ping a core developer o highfive and the maintainer of the vcpkg package.
Do you suggest making a new release with the patch, then?
There was a problem hiding this comment.
Why do I get a ping? The patch here chunks here seem unnecessary for vcpkg and should thus be removed. Alternatively download the patch and apply it instead of vendoring it in vcpkg (although that comes with its own problems)
There was a problem hiding this comment.
FTR this PR exists because the problem already arrived.
@gouarin Let people with vcpkg repo access do the change if you are not willing to do it. They should already be subscribed, and dealing with such issues is their responsibility during review IMO.
There was a problem hiding this comment.
I ping you because you are the author of the update of highfive where you added a patch from a url
vcpkg/ports/highfive/portfile.cmake
Lines 1 to 5 in a325228
This is my first time doing a PR in vcpkg and you probably give me your feedback on why you applied this patch.
@dg0yt suggested me to make a local patch. But this patch is not minimal and refers to another patch.
There was a problem hiding this comment.
@dg0yt I just wanted to help. Sorry if I don't make things as expected. And I like to understand how things work.
JavierMatosD
removed
the
info:reviewed
gouarin
dismissed stale reviews from github-actions and LilyWangLL
via
40533ac
LilyWangLL
added
info:reviewed
fix #29690