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

Small fixes for GitHub Actions #1847

Merged
merged 3 commits into from
Dec 3, 2022
Merged

Small fixes for GitHub Actions #1847

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bcf82f9
[CI] Fix typo in build step names
amadio Dec 2, 2022
6ac260c
[CI] Install into /usr on Ubuntu build instead of /usr/local
amadio Dec 2, 2022
c5edd9f
[CI] Fix Ubuntu build on GitHub Actions
amadio Dec 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 7 additions & 15 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ jobs:
run: |
cd ..
cmake \
-DCMAKE_INSTALL_PREFIX=/usr/local/ \
-DCMAKE_INSTALL_PREFIX=/usr \
-DPYTHON_EXECUTABLE=$(command -v python3) \
-DENABLE_TESTS=ON \
-DPIP_OPTIONS="--verbose" \
Expand All @@ -290,9 +290,6 @@ jobs:

- name: Verify Python bindings
run: |
export LD_LIBRARY_PATH="/usr/local/lib:${LD_LIBRARY_PATH}"
export PYTHON_VERSION_MINOR=$(python3 -c 'import sys; print(f"{sys.version_info.minor}")')
export PYTHONPATH="/usr/local/lib/python3.${PYTHON_VERSION_MINOR}/site-packages:${PYTHONPATH}"
python3 --version --version
python3 -m pip list
python3 -m pip show xrootd
Expand Down Expand Up @@ -528,18 +525,13 @@ jobs:

- name: Build .deb
run: |
mv packaging/debian/python3-xrootd.install.new packaging/debian/python3-xrootd.install
cp -R packaging/debian/ .
mk-build-deps --build-dep debian/control
sudo gdebi -n xrootd-build-deps-depends*.deb
version=`./genversion.sh --print-only`
dch --create -v `echo $version | sed 's/^v\(.*\)/\1/'` --package xrootd --urgency low --distribution ${DIST} -M "This package is built and released automatically. For important notices and releases subscribe to our maling lists or visit our website."
dpkg_version=`dpkg-query --showformat='${Version}' --show dpkg`
rc=0 ; dpkg --compare-versions $dpkg_version "ge" "1.18.11" || rc=$?
if [ $rc -eq "0" ]; then
dpkg-buildpackage -b -us -uc -tc --buildinfo-option="-udeb_packages" --changes-option="-udeb_packages" ;
else
dpkg-buildpackage -b -us -uc -tc --changes-option="-udeb_packages" ;
fi
dch --create -v `echo $version | sed 's/^v\(.*\)/\1/'` --package xrootd --urgency low --distribution $(lsb_release -cs) -M "This package is built and released automatically. For important notices and releases subscribe to our maling lists or visit our website."
dpkg-buildpackage -b -us -uc -tc --buildinfo-option="-udeb_packages" --buildinfo-file="deb_packages/xrootd_$(dpkg-parsechangelog -S version)_$(dpkg-architecture -qDEB_BUILD_ARCH).buildinfo" --changes-option="-udeb_packages" --buildinfo-file="deb_packages/xrootd_$(dpkg-parsechangelog -S version)_$(dpkg-architecture -qDEB_BUILD_ARCH).changes"

- name: Install
run: |
Expand Down Expand Up @@ -608,7 +600,7 @@ jobs:
python3 -m pip --verbose install --upgrade ./dist/xrootd-*.tar.gz
python3 -m pip list

- name: Show site-pacakges layout for XRootD modules
- name: Show site-packages layout for XRootD modules
run: |
find $(python3 -c 'import XRootD; import pathlib; print(str(pathlib.Path(XRootD.__path__[0]).parent))') \
-type d \
Expand Down Expand Up @@ -664,7 +656,7 @@ jobs:
python3 -m pip --verbose install --upgrade ./dist/xrootd-*.tar.gz
python3 -m pip list

- name: Show site-pacakges layout for XRootD modules
- name: Show site-packages layout for XRootD modules
run: |
find $(python3 -c 'import XRootD; import pathlib; print(str(pathlib.Path(XRootD.__path__[0]).parent))') \
-type d \
Expand Down Expand Up @@ -718,7 +710,7 @@ jobs:
python3 -m pip --verbose install --upgrade ./dist/xrootd-*.tar.gz
python3 -m pip list

- name: Show site-pacakges layout for XRootD modules
- name: Show site-packages layout for XRootD modules
run: |
find $(python3 -c 'import XRootD; import pathlib; print(str(pathlib.Path(XRootD.__path__[0]).parent))') \
-type d \
Expand Down