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-31426 CentOS 7 + Python 3.8 #18471

Merged
merged 1 commit into from
Apr 11, 2024
Merged

HPCC-31426 CentOS 7 + Python 3.8 #18471

merged 1 commit into from
Apr 11, 2024

Conversation

GordonSmith
Copy link
Member

@GordonSmith GordonSmith commented Mar 28, 2024 •
edited
Loading

Add custom build to support CentOS 7 + Python 3.8

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-31426

Jirabot Action Result:
Workflow Transition: Merge Pending
Updated PR

ghalliday
ghalliday reviewed Apr 2, 2024
View reviewed changes
dockerfiles/vcpkg/build.sh Outdated
docker pull "hpccsystems/platform-build-base-$1:$VCPKG_REF" || true
docker pull "hpccsystems/platform-build-$1:$VCPKG_REF" || true
docker pull "hpccsystems/platform-build-$1:$GITHUB_BRANCH" || true
# docker pull "hpccsystems/platform-build-base-$1:$VCPKG_REF" || true
Copy link
Member

Choose a reason for hiding this comment

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

Why are these commented out?

Copy link
Member Author

Choose a reason for hiding this comment

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

FYI That build.sh file is only for local testing and used as part of any process - the pull should really be behind an arg flag, I will fix.

Copy link
Member Author

Choose a reason for hiding this comment

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

I rolled back this change

dockerfiles/vcpkg/build.sh
CMAKE_OPTIONS_EXTRA="-DVCPKG_TARGET_TRIPLET=x64-centos-7-dynamic"
elif [ "$1" == "amazonlinux" ]; then
CMAKE_OPTIONS_EXTRA="-DVCPKG_TARGET_TRIPLET=x64-amazonlinux-dynamic"
fi
mkdir -p $HOME/.ccache
docker run --rm \
--mount source="$(pwd)",target=/hpcc-dev/HPCC-Platform,type=bind,consistency=cached \
--mount source="$(realpath ~)/.cache/vcpkg",target=/root/.cache/vcpkg,type=bind,consistency=cached \
Copy link
Member

Choose a reason for hiding this comment

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

What is this change for. Worth documenting related changes in the jira.

Copy link
Member Author

Choose a reason for hiding this comment

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

Moves the cached vcpkg build location into the host machine, which in turn will speed up local calls to build.sh for any "vcpkg_overlay" contents.

Copy link
Member Author

Choose a reason for hiding this comment

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

I added the change information into the commit message.

@GordonSmith GordonSmith force-pushed the HPCC-31426-CENTOS7_PYTHON38 branch from ecfae99 to 665df8f Compare April 4, 2024 15:10
@GordonSmith GordonSmith requested a review from ghalliday April 4, 2024 15:11
@GordonSmith GordonSmith force-pushed the HPCC-31426-CENTOS7_PYTHON38 branch from 665df8f to 2df4561 Compare April 10, 2024 10:24
@GordonSmith
HPCC-31426 CentOS 7 + Python 3.8
bbda0d4 
Add custom build to support CentOS 7 + Python 3.8
Mount local vcpkg cache to avoid rebuilding packages

Signed-off-by: Gordon Smith <[email protected]>
@GordonSmith GordonSmith force-pushed the HPCC-31426-CENTOS7_PYTHON38 branch from 2df4561 to bbda0d4 Compare April 11, 2024 05:02
ghalliday
ghalliday approved these changes Apr 11, 2024
View reviewed changes
Copy link
Member

@ghalliday ghalliday left a comment

Choose a reason for hiding this comment

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

@Michael-Gardner please take a look

@ghalliday ghalliday merged commit 096f08e into hpcc-systems:candidate-9.4.x Apr 11, 2024
50 checks passed
Michael-Gardner
Michael-Gardner reviewed Apr 11, 2024
View reviewed changes
Copy link
Contributor

@Michael-Gardner Michael-Gardner left a comment

Choose a reason for hiding this comment

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

Looks good. Code looks fine. I was having issues updating the vcpkg submodule for this branch when I was trying to test it, but I think that's due to what I have cached locally.

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 left review comments

@ghalliday ghalliday ghalliday 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.
3 participants
@GordonSmith @ghalliday @Michael-Gardner