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.

Sign up for GitHub

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

Jump to bottom

Upgrade from cmake 3.21.0 to 3.21.2 (#363, #394) #410

Merged
merged 1 commit into from
Aug 30, 2021
Merged

Upgrade from cmake 3.21.0 to 3.21.2 (#363, #394) #410

merged 1 commit into from
Aug 30, 2021

Conversation

bartlettroscoe
Copy link
Member

@bartlettroscoe bartlettroscoe commented Aug 27, 2021 •
edited
Loading

Also remove all of the test disables as cmake 3.21.2 has a patch that fixes all of the test failures.

Fixes #394 and addresses problem first identified in #363 (also see https://gitlab.kitware.com/snl/project-1/-/issues/184).

@bartlettroscoe
Upgrade from cmake 3.21.0 to 3.21.2 (TriBITSPub#363, TriBITSPub#394)
a45727a 
Also remove all of the test disables as cmake 3.21.2 has a patch that fixes
all of the test failures.
@bartlettroscoe bartlettroscoe self-assigned this Aug 27, 2021
@bartlettroscoe
Copy link
Member Author

bartlettroscoe commented Aug 30, 2021 •
edited
Loading

As shown in the PR iteration here we can see all 378 tests running and passing in the CMake 3.21.2 build, same number as in the cmake 3.17.5 builds (excluding the nonfortran build which has several tests disabled). Looking at the detailed configure output here we can see the tests that are being re-enabled like:

-- TriBITS_CTestDriver_PBP_ST_ALL_PASS: Added test (BASIC, PROCESSORS=1)!
...
-- TriBITS_CTestDriver_PBP_PT_ALL_PASS_CALLS_2: Added test (BASIC, PROCESSORS=1)!
-- TriBITS_CTestDriver_PBP_PT_ALL_PASS_CALLS_4: Added test (BASIC, PROCESSORS=1)!
...
-- TriBITS_CTestDriver_PBP_ST_ALL_COVERAGE: Added test (BASIC, PROCESSORS=1)!
-- TriBITS_CTestDriver_PBP_ST_ALL_MEMORY: Added test (BASIC, PROCESSORS=1)!
...
-- TriBITS_CTestDriver_PBP_ST_BreakConfigureOptionalPkg: Added test (BASIC, PROCESSORS=1)!
-- TriBITS_CTestDriver_PBP_ST_BreakBuildLibOptionalPkg: Added test (BASIC, PROCESSORS=1)!
-- TriBITS_CTestDriver_PBP_ST_BreakBuildAllOptionalPkg: Added test (BASIC, PROCESSORS=1)!
-- TriBITS_CTestDriver_PBP_ST_BreakTestPkg: Added test (BASIC, PROCESSORS=1)!
...

That is good enough evidence for me. I will merge this and close #394 and https://gitlab.kitware.com/snl/project-1/-/issues/184.

@bartlettroscoe bartlettroscoe merged commit b7b7792 into TriBITSPub:master Aug 30, 2021
bartlettroscoe added a commit to bartlettroscoe/Trilinos that referenced this pull request Sep 4, 2021
@bartlettroscoe
Merge branch 'tribits_github_snapshot' into tribits-snapshot-2021-09-03
3c77011 
Brings in numerous refactorings to TriBITS over the last 3 months, but there
should be no breaks in backward compatibility.  Almost every file in TriBITS
is changed due to the lower-casing of command, macro and function names in PR
TriBITSPub/TriBITS#379.  But the main driver for this snapshot is to bring in
the change in PR TriBITSPub/TriBITS#413 that should make it so that Kokkos
INTERFACE_COMPILE_OPTIONS get propagated to downstream targets in TriBITS and
therefore to external customers through installed <Package>Config.cmake files
and IMPORTED targets.  I should have done several snapshots in the last few
months and not done a big snapshot like this (but I have been testing with
Trilinos locally along the way).

Overall, this merge brings in changes from a bunch of TriBITS PRs including
(from most recent):

* TriBITSPub/TriBITS#413: Change internal TriBITS target_link_libraries() to
  PUBLIC (TriBITSPub/TriBITS#299) component: core type: enhancement

* TriBITSPub/TriBITS#410: Upgrade from cmake 3.21.0 to 3.21.2
  (TriBITSPub/TriBITS#363, TriBITSPub/TriBITS#394)

* TriBITSPub/TriBITS#394: DO NOT MERGE: Show TriBITS test failures with CMake
  3.21.0 that don't occur with CMake 3.17.5 (TriBITSPub/TriBITS#363)

* TriBITSPub/TriBITS#409: Add getTestDictStatusField() to handle empty
  'status' field (SESW-383) component: ci_support type: enhancement

* TriBITSPub/TriBITS#408: Deal with spaces in CDash url parts (SESW-383)
  component: ci_support type: enhancement

* TriBITSPub/TriBITS#403: Spelling fixes

* TriBITSPub/TriBITS#407: Move tribits_get_build_url_and_write_to_file() to
  stand-alone module (TriBITSPub/TriBITS#154) component: ctest_driver type:
  enhancement

* TriBITSPub/TriBITS#388: Fixing typos (TriBITSPub/TriBITS#377)

* TriBITSPub/TriBITS#406: Fix tribits_ctest_driver() package-by-package mode
  for CMake 3.19+ (TriBITSPub/TriBITS#363, TriBITSPub/TriBITS#394) component:
  ctest_driver type: bug

* TriBITSPub/TriBITS#401: Improve GitHub Actions and CDash integration
  (TriBITSPub/TriBITS#154) type: enhancement

* TriBITSPub/TriBITS#366: CI: draft action yaml

* TriBITSPub/TriBITS#402: Revert some incorrect uppercase->lowercase changes

* TriBITSPub/TriBITS#387: Build and deploy TriBITS documentation with Sphinx
  (TriBITSPub/TriBITS#386) component: documentation type: enhancement

* TriBITSPub/TriBITS#398: Deal with pr null in not preprending build name
  (TriBITSPub/TriBITS#363) type: bug

* TriBITSPub/TriBITS#396: Send PR results to 'Pull Request' CDash group and
  add PR ID to build names (TriBITSPub/TriBITS#363) type: enhancement

* TriBITSPub/TriBITS#397: Print the ninja path and version
  (TriBITSPub/TriBITS#363)

* TriBITSPub/TriBITS#393: GitHub Actions based testing for TriBITS
  (TriBITSPub/TriBITS#363) type: enhancement

* TriBITSPub/TriBITS#389: TriBITS CI testing with GitHub Actions
  (TriBITSPub/TriBITS#363) type: enhancement

* TriBITSPub/TriBITS#392: Fix broken tests for non-Fortran and CMake 3.21
  builds (TriBITSPub/TriBITS#363) component: core

* TriBITSPub/TriBITS#391: Fix up build_docs.sh for Sphinx doc generation
  (TriBITSPub/TriBITS#386) component: documentation type: enhancement

* TriBITSPub/TriBITS#390: Add test for doc generation and fix usage of Python3
  component: documentation type: bug

* TriBITSPub/TriBITS#385: Replace last few references to
  TribitsDevelopersGuide.html (TriBITSPub/TriBITS#381) component:
  documentation type: enhancement

* TriBITSPub/TriBITS#384: Split TribitsDevelopersGuide.* into
  TribitsUsersGuide.* and TribitsMaintainersGuide.* (TriBITSPub/TriBITS#381)
  component: documentation type: enhancement

* TriBITSPub/TriBITS#383: Remove endfunction(<string>) and endmacro(<string>)
  (TriBITSPub/TriBITS#274, TriBITSPub/TriBITS#382) component: common_tpls
  type: bug

* TriBITSPub/TriBITS#380: More package-arch data-structure documentation
  updates (TriBITSPub/TriBITS#63) component: documentation type: enhancement

* TriBITSPub/TriBITS#379: Convert TriBITS to lower-case CMake command, macro,
  and function names (TriBITSPub/TriBITS#274)

The following files were conflicting where I went with what is on the Trilinos
'develop' branch:

* cmake/tribits/common_tpls/FindTPLBLAS.cmake
* cmake/tribits/common_tpls/FindTPLLAPACK.cmake
* cmake/tribits/common_tpls/FindTPLNetcdf.cmake

(It looks like the above changes never made it back into TriBITS proper.  The
conflicts were due to the case changes in cmake command calls in these files
due to TriBITSPub/TriBITS#379.)

There was also a conflict in the file:

* cmake/tribits/core/installation/TribitsProjectConfigTemplate.cmake.in

I looked at that one carefully and I think that may have been due to fixes on
both sides and then the case changes from TriBITSPub/TriBITS#379.
@bartlettroscoe bartlettroscoe mentioned this pull request Sep 4, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@bartlettroscoe bartlettroscoe

Labels
None yet
Projects
TriBITS Refactor
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@bartlettroscoe