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

Move Azure Pipelines CI to use the CMake build #482

Merged
merged 4 commits into from
Feb 10, 2022
Merged

Move Azure Pipelines CI to use the CMake build #482

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
61b3297
Move Azure Pipelines CI to use the CMake build
ndevenish Feb 10, 2022
9869ada
Rename newsfragments/XXX.misc to newsfragments/482.misc
DiamondLightSource-build-server Feb 10, 2022
dec6ea4
Update .azure-pipelines/unix-build.yml
ndevenish Feb 10, 2022
592af76
Coverage fomro package name directly
ndevenish Feb 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 5 additions & 27 deletions .azure-pipelines/unix-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,32 +13,11 @@ steps:
fetchDepth: 1
displayName: Checkout $(Build.SourceBranch)

# Download other source repositories
- bash: |
set -eux

# Extract the version of cctbx-base from the conda environment file
[[ "$(cat modules/dxtbx/.azure-pipelines/ci-conda-env.txt)" =~ cctbx-base==([^:space:]+) ]]
cctbx_version="$(echo "${BASH_REMATCH[1]}" | xargs)"
echo "Using cctbx conda release ${cctbx_version}"

python3 modules/dxtbx/.azure-pipelines/bootstrap.py update --branch cctbx_project@"v${cctbx_version}"
displayName: Repository checkout
workingDirectory: $(Pipeline.Workspace)

# Download additional source repositories required by cctbx-base (but not dxtbx)
# cf. /~https://github.com/conda-forge/cctbx-base-feedstock/issues/12
- bash: |
set -eux
git clone /~https://github.com/dials/annlib.git modules/annlib
git clone /~https://github.com/dials/annlib_adaptbx.git modules/annlib_adaptbx
displayName: Repository checkout (additional cctbx)
workingDirectory: $(Pipeline.Workspace)

# Create a new conda environment using the bootstrap script
# Extract the dials-data version so we can correctly cache regression data.
- bash: |
set -eux
echo pycbf >> modules/dxtbx/.azure-pipelines/ci-conda-env.txt
Anthchirp marked this conversation as resolved.
Show resolved Hide resolved
python3 modules/dxtbx/.azure-pipelines/bootstrap.py base --clean --python $(PYTHON_VERSION)

set +ux
Expand All @@ -59,8 +38,9 @@ steps:
set -ux
mkdir build
cd build
libtbx.configure dxtbx cbflib_adaptbx
make reconf
cmake ../modules/dxtbx
cmake --build . --target install
pip install ../modules/dxtbx
ndevenish marked this conversation as resolved.
Show resolved Hide resolved
displayName: Build dxtbx
workingDirectory: $(Pipeline.Workspace)

Expand All @@ -86,9 +66,7 @@ steps:
- bash: |
set -e
. conda_base/bin/activate
set -x
. build/setpaths.sh
set -u
set -xu
Anthchirp marked this conversation as resolved.
Show resolved Hide resolved
export DIALS_DATA=${PWD}/data
cd modules/dxtbx
export PYTHONDEVMODE=1
Expand Down
1 change: 1 addition & 0 deletions newsfragments/482.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Use CMake to build dxtbx for Azure Pipelines CI.