Skip to content

Conversation

@atn34
Copy link
Collaborator

@atn34 atn34 commented May 23, 2019

Fixes #1483

@atn34 atn34 changed the base branch from master to release-6.1 May 23, 2019 22:16
@atn34 atn34 changed the base branch from release-6.1 to master May 23, 2019 22:18
@atn34
Copy link
Collaborator Author

atn34 commented May 23, 2019

It would be nice if this made it into 6.1. Please bear with me while I figure out how to make a pull request to 6.1

@atn34 atn34 force-pushed the export-libfdb_c branch from d133973 to f2ed961 Compare May 23, 2019 22:22
@atn34 atn34 changed the base branch from master to release-5.1 May 23, 2019 22:23
@atn34 atn34 changed the base branch from release-5.1 to release-6.1 May 23, 2019 22:23
@hgray1 hgray1 requested review from AlvinMooreSr and mpilman May 28, 2019 18:18
FROM centos:6

RUN yum install -y yum-utils upstart initscripts
RUN yum install -y yum-utils upstart initscripts cmake gcc
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These should not install cmake or gcc. These images are meant to test whether FDB can be installed and whether it pulls in the correct dependencies.

You probably should install these in the test scripts

@AlvinMooreSr
Copy link
Contributor

test this build

@AlvinMooreSr
Copy link
Contributor

test bindings

Copy link
Contributor

@AlvinMooreSr AlvinMooreSr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with @mpilman that these runtime images should not install cmake or gcc.

@atn34 atn34 force-pushed the export-libfdb_c branch from 0b7064f to 7bb262d Compare June 9, 2019 22:22
@atn34 atn34 changed the base branch from release-6.1 to master June 9, 2019 22:22
@atn34
Copy link
Collaborator Author

atn34 commented Jun 10, 2019

@AlvinMooreSr I changed the tests so that the docker images do not come with cmake or gcc preinstalled. I also changed the target branch back to master since I realized 6.1 isn't being built with cmake anyway. PTAL

@atn34
Copy link
Collaborator Author

atn34 commented Jun 19, 2019

We should probably also mark this as 6.2, since it fixes the install directory of the headers for the cmake generated client packages

@alexmiller-apple alexmiller-apple added this to the 6.2 milestone Jun 20, 2019
@atn34
Copy link
Collaborator Author

atn34 commented Jun 20, 2019

@AlvinMooreSr Is there anything preventing this from getting merged?

@AlvinMooreSr AlvinMooreSr merged commit 8ff5150 into apple:master Jun 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

FDB packages should also offer pkg-config

4 participants