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

Fix HighFive and HDF5 version #154

Merged
merged 1 commit into from
Jul 2, 2024
Merged

Fix HighFive and HDF5 version #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Install HighFive
run: |
cd /tmp
wget -O HighFive.tar.gz https://github.com/BlueBrain/HighFive/archive/v2.9.0.tar.gz
wget -O HighFive.tar.gz https://github.com/BlueBrain/HighFive/archive/v2.2.2.tar.gz
tar xzf HighFive.tar.gz
rm HighFive.tar.gz
cd HighFive*
Expand Down
33 changes: 0 additions & 33 deletions ci/buildwheel/Dockerfile
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ci/buildwheel/install_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ echo "MACOSX_DEPLOYMENT_TARGET: [$MACOSX_DEPLOYMENT_TARGET]"
echo "PWD: [$PWD]"

brew install --formulae eigen ../highfive.rb catch2
brew uninstall --ignore-dependencies hdf5
brew uninstall --ignore-dependencies hdf5@1.10

./install_hdf5.sh
2 changes: 1 addition & 1 deletion ci/buildwheel/Dockerfile.manylinux → ci/docker/Dockerfile.manylinux
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN yum -y install wget eigen3-devel openblas-devel hdf5-devel && \
yum clean all

#install HighFive
RUN wget -O HighFive.tar.gz https://github.com/BlueBrain/HighFive/archive/v2.2.tar.gz && \
RUN wget -O HighFive.tar.gz https://github.com/BlueBrain/HighFive/archive/v2.2.2.tar.gz && \
tar xzf HighFive.tar.gz && \
rm HighFive.tar.gz && \
cd HighFive* && \
Expand Down
4 changes: 2 additions & 2 deletions ci/buildwheel/Dockerfile.musllinux → ci/docker/Dockerfile.musllinux
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM quay.io/pypa/musllinux_1_2_x86_64

RUN apk add wget eigen openblas hdf5
RUN apk add wget eigen openblas hdf5-dev

#install HighFive
RUN wget -O HighFive.tar.gz https://github.com/BlueBrain/HighFive/archive/v2.2.tar.gz && \
RUN wget -O HighFive.tar.gz https://github.com/BlueBrain/HighFive/archive/v2.2.2.tar.gz && \
tar xzf HighFive.tar.gz && \
rm HighFive.tar.gz && \
cd HighFive* && \
Expand Down
2 changes: 1 addition & 1 deletion ci/ubuntu2204/Dockerfile → ci/docker/Dockerfile.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RUN cd /tmp && \

#install HighFive
RUN cd /tmp && \
wget -O HighFive.tar.gz https://github.com/BlueBrain/HighFive/archive/v2.9.0.tar.gz && \
wget -O HighFive.tar.gz https://github.com/BlueBrain/HighFive/archive/v2.2.2.tar.gz && \
tar xzf HighFive.tar.gz && \
rm HighFive.tar.gz && \
cd HighFive* && \
Expand Down
0 ci/ubuntu2204/build_script.sh → ci/docker/build_script.sh
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ci/highfive.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
class Highfive < Formula
desc "HighFive - Header-only C++ HDF5 interface"
homepage "https://bluebrain.github.io/HighFive/"
url "https://github.com/BlueBrain/HighFive/archive/v2.9.0.tar.gz"
sha256 "6301def8ceb9f4d7a595988612db288b448a3c0546f6c83417dab38c64994d7e"
url "https://github.com/BlueBrain/HighFive/archive/v2.2.2.tar.gz"
sha256 "5bfb356705c6feb9d46a0507573028b289083ec4b4607a6f36187cb916f085a7"

depends_on "cmake" => :build
depends_on "boost" => [ :build, :test ]
depends_on "hdf5"
depends_on "hdf5@1.10"

def install
system "cmake", ".", *std_cmake_args
Expand Down
Loading