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

ci: Add Fedora build job to GitHub Actions CI #1610

Conversation

matthewfeickert
Copy link
Contributor

@matthewfeickert matthewfeickert commented Feb 5, 2022

Resolves #1609

Following PR #1586, the use of PYTHON_INSTALLED_FILES is regulated to Python 2 builds only. To guard against Python 3 build looking for PYTHON_INSTALLED_FILES when it doesn't exist, have the file only be created under python2only and python2and3 builds. For python3only builds use python3_sitearch.

Superseded by a6a1fda.

Add a Fedora 35 build job to the CI.

@matthewfeickert matthewfeickert force-pushed the fix/remove-PYTHON_INSTALLED_FILES-dep-fedora branch 2 times, most recently from c087c74 to 8952b91 Compare February 5, 2022 06:21
@matthewfeickert
Copy link
Contributor Author

@simonmichal This is ready for review.

@simonmichal
Copy link
Contributor

@matthewfeickert : I just pushed a6a1fda that replaces the use of PYTHON_INSTALLED with %{python3_sitearch}/* and %{python2_sitearch}/*` RPM macros. Could you please remove conflicts and rebase?

@simonmichal
Copy link
Contributor

P. S. I think we don't need anymore the adjustments to the spec file (but please double check), only the test for the CI.

@matthewfeickert matthewfeickert force-pushed the fix/remove-PYTHON_INSTALLED_FILES-dep-fedora branch from 8952b91 to 99a4b85 Compare February 7, 2022 15:51
@matthewfeickert matthewfeickert changed the title fix: Remove PYTHON_INSTALLED_FILES dependency from Python 3 only builds ci: Add Fedora build jobs to GitHub Actions CI Feb 7, 2022
@matthewfeickert matthewfeickert changed the title ci: Add Fedora build jobs to GitHub Actions CI ci: Add Fedora build job to GitHub Actions CI Feb 7, 2022
PYTHON_INSTALLED is no longer used anywhere in the codebase, so there is no need to use the
--record option for deprecated `python setup.py install` installs.
@@ -81,8 +81,7 @@ if ( NOT ${VALID_PIP_EXIT_CODE} EQUAL 0 )
COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install \
${PIP_INSTALL_VERBOSE_FLAG} \
--prefix \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX} \
${DEB_INSTALL_ARGS} \
--record PYTHON_INSTALLED
${DEB_INSTALL_ARGS}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

a6a1fda removed all use of PYTHON_INSTALLED so no need to use --record here anymore.

@matthewfeickert
Copy link
Contributor Author

@simonmichal this is ready for review.

@simonmichal simonmichal merged commit 9f4b13b into xrootd:master Feb 8, 2022
@matthewfeickert matthewfeickert deleted the fix/remove-PYTHON_INSTALLED_FILES-dep-fedora branch February 8, 2022 16:45
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.

Fedora builds broken given dependency on PYTHON_INSTALLED_FILES
2 participants