From 4fd0c7afcd21251095eec4c5a994e156bcbe9904 Mon Sep 17 00:00:00 2001 From: Justin Hiemstra Date: Thu, 22 Aug 2024 20:06:50 +0000 Subject: [PATCH 1/2] Update xrds3 to v0.1.5 to fix S3 multipart PUTs --- github_scripts/osx_install.sh | 4 ++-- images/Dockerfile | 2 +- images/dev.Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/github_scripts/osx_install.sh b/github_scripts/osx_install.sh index 43e49440c..c9351a651 100755 --- a/github_scripts/osx_install.sh +++ b/github_scripts/osx_install.sh @@ -58,9 +58,9 @@ sudo mkdir -p /etc/xrootd/client.plugins.d/ sudo cp release_dir/etc/xrootd/client.plugins.d/pelican-plugin.conf /etc/xrootd/client.plugins.d/ popd -git clone --recurse-submodules --branch v0.1.4 https://github.com/PelicanPlatform/xrootd-s3-http.git +git clone --recurse-submodules --branch v0.1.5 https://github.com/PelicanPlatform/xrootd-s3-http.git pushd xrootd-s3-http -git checkout v0.1.4 +git checkout v0.1.5 mkdir build cd build cmake .. -GNinja -DCMAKE_INSTALL_PREFIX=$PWD/release_dir diff --git a/images/Dockerfile b/images/Dockerfile index 93b994b0e..a16f60cfe 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -82,7 +82,7 @@ ADD https://api.github.com/repos/PelicanPlatform/xrootd-s3-http/git/refs/heads/m RUN \ git clone --recurse-submodules https://github.com/PelicanPlatform/xrootd-s3-http.git && \ cd xrootd-s3-http && \ - git checkout v0.1.4 && \ + git checkout v0.1.5 && \ mkdir build && cd build && \ cmake -DLIB_INSTALL_DIR=/usr/lib64 .. && \ make install diff --git a/images/dev.Dockerfile b/images/dev.Dockerfile index 9da0e8a28..05643bfda 100644 --- a/images/dev.Dockerfile +++ b/images/dev.Dockerfile @@ -114,7 +114,7 @@ ADD https://api.github.com/repos/PelicanPlatform/xrootd-s3-http/git/refs/heads/m RUN \ git clone --recurse-submodules https://github.com/PelicanPlatform/xrootd-s3-http.git && \ cd xrootd-s3-http && \ - git checkout v0.1.4 && \ + git checkout v0.1.5 && \ mkdir build && cd build && \ cmake -DLIB_INSTALL_DIR=/usr/lib64 .. && \ make install From b6d3b120ae05d9878e592e4926977e00473d2e4a Mon Sep 17 00:00:00 2001 From: Justin Hiemstra Date: Tue, 27 Aug 2024 20:27:52 +0000 Subject: [PATCH 2/2] Update S3 backend to v0.1.6 --- github_scripts/osx_install.sh | 4 ++-- images/Dockerfile | 2 +- images/dev.Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/github_scripts/osx_install.sh b/github_scripts/osx_install.sh index c9351a651..f62546b89 100755 --- a/github_scripts/osx_install.sh +++ b/github_scripts/osx_install.sh @@ -58,9 +58,9 @@ sudo mkdir -p /etc/xrootd/client.plugins.d/ sudo cp release_dir/etc/xrootd/client.plugins.d/pelican-plugin.conf /etc/xrootd/client.plugins.d/ popd -git clone --recurse-submodules --branch v0.1.5 https://github.com/PelicanPlatform/xrootd-s3-http.git +git clone --recurse-submodules --branch v0.1.6 https://github.com/PelicanPlatform/xrootd-s3-http.git pushd xrootd-s3-http -git checkout v0.1.5 +git checkout v0.1.6 mkdir build cd build cmake .. -GNinja -DCMAKE_INSTALL_PREFIX=$PWD/release_dir diff --git a/images/Dockerfile b/images/Dockerfile index a16f60cfe..8390ad6d3 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -82,7 +82,7 @@ ADD https://api.github.com/repos/PelicanPlatform/xrootd-s3-http/git/refs/heads/m RUN \ git clone --recurse-submodules https://github.com/PelicanPlatform/xrootd-s3-http.git && \ cd xrootd-s3-http && \ - git checkout v0.1.5 && \ + git checkout v0.1.6 && \ mkdir build && cd build && \ cmake -DLIB_INSTALL_DIR=/usr/lib64 .. && \ make install diff --git a/images/dev.Dockerfile b/images/dev.Dockerfile index 05643bfda..527bfd043 100644 --- a/images/dev.Dockerfile +++ b/images/dev.Dockerfile @@ -114,7 +114,7 @@ ADD https://api.github.com/repos/PelicanPlatform/xrootd-s3-http/git/refs/heads/m RUN \ git clone --recurse-submodules https://github.com/PelicanPlatform/xrootd-s3-http.git && \ cd xrootd-s3-http && \ - git checkout v0.1.5 && \ + git checkout v0.1.6 && \ mkdir build && cd build && \ cmake -DLIB_INSTALL_DIR=/usr/lib64 .. && \ make install