From 7b995fa5d2e39a5d7b0d9fd61b922142eda46486 Mon Sep 17 00:00:00 2001 From: Ren Bauer Date: Mon, 21 Mar 2022 18:46:28 +0000 Subject: [PATCH 1/2] Add steps to install mtx in build docker image --- .github/docker/cc7-build/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/docker/cc7-build/Dockerfile b/.github/docker/cc7-build/Dockerfile index 7177f6174..6ffb04a5d 100644 --- a/.github/docker/cc7-build/Dockerfile +++ b/.github/docker/cc7-build/Dockerfile @@ -10,6 +10,9 @@ RUN yum update -y && yum install -y tk # set up rpm build requirements RUN yum install -y rpm-build Python-enstore2.7-16* swig-enstore make gcc RUN yum install -y postgresql11-libs postgresql11-server postgresql11 postgresql11-devel postgresql11-contrib +# don't ask me why getting libmtx.so is so hard +RUN yum --downloadonly --disablerepo='*' --enablerepo=enstore install -y mtx +RUN rpm -i /var/cache/yum/x86_64/7/enstore/packages/mtx-1.3.12-18fnal.el7.x86_64.rpm # add git for running `git log` during patchnote generation RUN yum -y install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm From 2eacbb80200543d9f2e97a88ed6ecc4341bd03e6 Mon Sep 17 00:00:00 2001 From: Ren Bauer Date: Mon, 21 Mar 2022 18:47:02 +0000 Subject: [PATCH 2/2] Bump version for build with new docker image --- rpm_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm_version b/rpm_version index 38754af33..9d63eccf9 100644 --- a/rpm_version +++ b/rpm_version @@ -1,6 +1,6 @@ EVersion=6.3.4 ERelease=16 -ECommit=20 +ECommit=21 export EVersion export ERelease export ECommit