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.

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

[3.1 -> main] fix libff in 3.1 tester cmakes #530

Merged
merged 6 commits into from
Jun 24, 2022
Merged

Conversation

oschwaldp-oci
Copy link
Contributor

@oschwaldp-oci oschwaldp-oci commented Jun 24, 2022

Fix issues seen with libff when trying to use mandel with mandel.cdt.

Update CMakeLists.txt to create a parallel mandel-config.cmake for use until mandel goes through renaming.

Update path to libff in fc libraries when using build from src.

Add install directions for current mandel use with mandel.cdt (or others).

Resolves: #426
Resolves: #420

Supersedes: #421

Relates to mandel.cdt issue/PR:
eosnetworkfoundation/mandel.cdt#25
eosnetworkfoundation/mandel.cdt#26

…el.cdt.

Update CMakeLists.txt to create a parallel mandel-config.cmake for use until mandel goes through renaming.

Update path to libff in fc libraries when using build from src.

Add install directions for current mandel use with mandel.cdt (or others).
Mandel dev install is no longer the recommendation.

For users utilizing native contract unit testing, make install no longer installs the required header and libraries. It's recommended to utilize the headers and libraries directly from mandel's build directory, or to use the mandel-dev package. Installation of these headers and libraries can still be performed with a make dev-install if absolutely needed.
@oschwaldp-oci oschwaldp-oci changed the title Release/3.1.x fix libff in 3.1 tester cmakes Jun 24, 2022
@oschwaldp-oci oschwaldp-oci changed the title fix libff in 3.1 tester cmakes fix libff in 3.1 tester cmakes [3.2] Jun 24, 2022
@oschwaldp-oci oschwaldp-oci merged commit dba8805 into main Jun 24, 2022
@heifner heifner added the OCI OCI working this issue... label Jun 25, 2022
@arhag arhag changed the title fix libff in 3.1 tester cmakes [3.2] [3.1 -> main] fix libff in 3.1 tester cmakes Jul 1, 2022
@arhag
Copy link
Member

arhag commented Jul 1, 2022

@oschwaldp-oci: For the future, don't create a PR to directly merge in a release/* branch into main. From my experience, there are problems that could arise with that approach. In addition, if you need to make changes to resolve conflicts specific to main, you will be forced to switch to another branch anyway.

So always create a branch off of main with some appropriate name and then merge the release branch into it. Then resolve any issues within that branch and create a PR from that branch to the main branch.

@heifner
Copy link
Member

heifner commented Jul 1, 2022

To be clear you are saying you want this approach:

  1. Bug fix PR foo-3.1 -> release/3.1.x.
  2. git checkout main
  3. git checkout -b foo-3.2
  4. git merge release/3.1.x
  5. resolve any conflicts and commit
  6. Create PR of foo-3.2 into main

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
OCI OCI working this issue...
Projects
None yet
Development

Successfully merging this pull request may close these issues.

fix libff in 3.1 tester cmakes Fixes for mandel.cdt integration tests
4 participants