Skip to content

Commit

Permalink
Prepare for iRODS 4.3.0.
Browse files Browse the repository at this point in the history
Depends on a bugfix that should be included in iRODS 4.3.1.
  • Loading branch information
dworkin committed Jun 22, 2022
1 parent b46ac68 commit eb48cb6
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.12)

project(davrods C)

set(IRODSRT_VERSION "4.2.11" CACHE STRING "iRODS client library version")
set(IRODSRT_VERSION "4.3.0" CACHE STRING "iRODS client library version")

set(DAVRODS_FEATURE "1.5.0")
set(DAVRODS_VERSION "${IRODSRT_VERSION}_${DAVRODS_FEATURE}")
Expand Down
12 changes: 5 additions & 7 deletions vagrant/build/.env
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/sh

# Tested/supported box names:
# - centos/7
# - generic/centos7
# - ubuntu/bionic64
BOXNAME=ubuntu/bionic64
BOXNAME=generic/centos7

# Amount of memory for VM (MB)
MEMORY=2048
Expand All @@ -14,17 +14,15 @@ MEMORY=2048
DISKSPACE="41GB"

# Version of iRODS to use
IRODS_VERSION="4.2.11"
IRODS_VERSION="4.3.0"

# URL of the signing key of the iRODS apt repository
APT_IRODS_REPO_SIGNING_KEY_LOC=https://packages.irods.org/irods-signing-key.asc

# Parameters of the iRODS apt repository. As of 2 July 2019, the distribution
# for Ubuntu 18.04 servers (bionic) needs to be set to Ubuntu 16.04 (xenial),
# since packages for Ubuntu 18.04 aren't available yet.
# Parameters of the iRODS apt repository.
APT_IRODS_REPO_URL=https://packages.irods.org/apt/
APT_IRODS_REPO_ARCHITECTURE=amd64
APT_IRODS_REPO_DISTRIBUTION=xenial
APT_IRODS_REPO_DISTRIBUTION=bionic
APT_IRODS_REPO_COMPONENT=main

# Packages to be installed (separated by whitespace).
Expand Down
4 changes: 2 additions & 2 deletions vagrant/build/install-davrods-build-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ function get_package_version()
local package="$1"
local IRODS_VERSION="$2"
local distro="$3"
if [ "$IRODS_VERSION" == "4.2.11" ] && [ "$distro" == "ubuntu" ]
then package_version="4.2.11-1~xenial"
if [ "$IRODS_VERSION" == "4.3.0" ] && [ "$distro" == "ubuntu" ]
then package_version="4.3.0-1~bionic"
else # shellcheck disable=SC2034
package_version="$IRODS_VERSION"
fi
Expand Down

0 comments on commit eb48cb6

Please sign in to comment.