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

HPCC-31591 Force vcpkg build to use exact version of tools #18525

Merged
merged 1 commit into from
Apr 12, 2024
Merged

HPCC-31591 Force vcpkg build to use exact version of tools #18525

merged 1 commit into from
Apr 12, 2024

Conversation

GordonSmith
Copy link
Member

@GordonSmith GordonSmith commented Apr 11, 2024 •
edited
Loading

Type of change:

  • This change is a bug fix (non-breaking change which fixes an issue).
  • This change is a new feature (non-breaking change which adds functionality).
  • This change improves the code (refactor or other change that does not change the functionality)
  • This change fixes warnings (the fix does not alter the functionality or the generated code)
  • This change is a breaking change (fix or feature that will cause existing behavior to change).
  • This change alters the query API (existing queries will have to be recompiled)

Checklist:

  • My code follows the code style of this project.
    • My code does not create any new warnings from compiler, build system, or lint.
  • The commit message is properly formatted and free of typos.
    • The commit message title makes sense in a changelog, by itself.
    • The commit is signed.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly, or...
    • I have created a JIRA ticket to update the documentation.
    • Any new interfaces or exported functions are appropriately commented.
  • I have read the CONTRIBUTORS document.
  • The change has been fully tested:
    • I have added tests to cover my changes.
    • All new and existing tests passed.
    • I have checked that this change does not introduce memory leaks.
    • I have used Valgrind or similar tools to check for potential issues.
  • I have given due consideration to all of the following potential concerns:
    • Scalability
    • Performance
    • Security
    • Thread-safety
    • Cloud-compatibility
    • Premature optimization
    • Existing deployed queries will not be broken
    • This change fixes the problem, not just the symptom
    • The target branch of this pull request is appropriate for such a change.
  • There are no similar instances of the same problem that should be addressed
    • I have addressed them here
    • I have raised JIRA issues to address them separately
  • This is a user interface / front-end modification
    • I have tested my changes in multiple modern browsers
    • The component(s) render as expected

Smoketest:

  • Send notifications about my Pull Request position in Smoketest queue.
  • Test my draft Pull Request.

Testing:

@github-actions GitHub Actions
Copy link

Jira Issue: https://hpccsystems.atlassian.net//browse/HPCC-31591

Jirabot Action Result:
Workflow Transition: Merge Pending
Additional PR: #18525

@GordonSmith GordonSmith force-pushed the HPCC-31591-FORCE_VCPKG_TOOLS branch 2 times, most recently from 29b671b to b7fc8b3 Compare April 11, 2024 11:38
@GordonSmith GordonSmith force-pushed the HPCC-31591-FORCE_VCPKG_TOOLS branch from b186b9e to 7436567 Compare April 11, 2024 13:54
@GordonSmith GordonSmith marked this pull request as ready for review April 11, 2024 13:55
Michael-Gardner
Michael-Gardner approved these changes Apr 11, 2024
View reviewed changes
dockerfiles/vcpkg/ubuntu-22.10.dockerfile
ENTRYPOINT ["/bin/bash", "--login", "-c"]

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm assuming we moved these additions to the dockerfile image over into the vcpkg repository dockerfile/ files?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes - its only a convenience for testing, both 9.4.x and 9.6.x are setup this way already.

cmake_modules/vcpkg.cmake
set(VCPKG_INSTALLED_DIR "${VCPKG_FILES_DIR}/vcpkg_installed")
set(VCPKG_INSTALL_OPTIONS "--downloads-root=${VCPKG_FILES_DIR}/vcpkg_downloads;--x-buildtrees-root=${VCPKG_FILES_DIR}/vcpkg_buildtrees;--x-packages-root=${VCPKG_FILES_DIR}/vcpkg_packages")
set(VCPKG_INSTALL_OPTIONS "--x-abi-tools-use-exact-versions;--downloads-root=${VCPKG_FILES_DIR}/vcpkg_downloads;--x-buildtrees-root=${VCPKG_FILES_DIR}/vcpkg_buildtrees;--x-packages-root=${VCPKG_FILES_DIR}/vcpkg_packages")
Copy link
Contributor

Choose a reason for hiding this comment

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

Was the behavior before this checking the vcpkgTools.xml file and just using that as the minimum version?

Copy link
Member Author

Choose a reason for hiding this comment

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

Correct it was defaulting to the system version if it was the same or newer. FYI this is also now set for 9.4.x (9.6.x was always using it).

@GordonSmith GordonSmith removed the request for review from ghalliday April 12, 2024 08:23
@GordonSmith GordonSmith merged commit eb039c7 into hpcc-systems:candidate-9.2.x Apr 12, 2024
50 checks passed
@GordonSmith GordonSmith deleted the HPCC-31591-FORCE_VCPKG_TOOLS branch April 12, 2024 08:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Michael-Gardner Michael-Gardner Michael-Gardner approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@GordonSmith @Michael-Gardner