diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 562508dc2..d4ffcb60c 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -17,7 +17,7 @@ stages: strategy: matrix: linux: - imageName: 'ubuntu-22.04' + imageName: 'ubuntu-24.04' python.version: '3.x' CXX: g++ BUILD_PYTHON_API: ON @@ -39,7 +39,7 @@ stages: jobs: - job: Build pool: - vmImage: 'ubuntu-22.04' + vmImage: 'ubuntu-24.04' strategy: matrix: cli: @@ -62,7 +62,7 @@ stages: strategy: matrix: linux: - imageName: 'ubuntu-22.04' + imageName: 'ubuntu-24.04' python.version: '3.x' CXX: g++ BUILD_PYTHON_API: ON @@ -92,7 +92,7 @@ stages: strategy: matrix: ubuntu_18: - imageName: 'ubuntu-22.04' + imageName: 'ubuntu-24.04' pool: vmImage: $(imageName) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 6a720ab74..fb9b3c52e 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, ubuntu-latest] + os: [macos-13, ubuntu-24.04] branches: - {libtiledb: release-2.26, tiledb-py: 0.32.0} - {libtiledb: dev, tiledb-py: dev} @@ -48,6 +48,9 @@ jobs: fetch-depth: 0 # fetch everything for python setuptools_scm - name: Build libtiledb run: bash TileDB-VCF/ci/nightly/build-libtiledb.sh + - name: Setup to build htslib from source (Linux) + if: runner.os == 'Linux' + run: sudo apt-get install --yes automake autoconf libbz2-dev liblzma-dev - name: Setup to build htslib from source (macOS) if: runner.os == 'macOS' run: brew install autoconf automake @@ -65,7 +68,7 @@ jobs: otool -L install/lib/libtiledbvcf.dylib - name: Install bcftools (for tests) (Linux) if: runner.os == 'Linux' - run: sudo apt install bcftools + run: sudo apt-get install --yes bcftools - name: Install bcftools (for tests) (macOS) if: runner.os == 'macOS' run: brew install bcftools diff --git a/ci/azure-linux_mac.yml b/ci/azure-linux_mac.yml index a649bff38..ae4b7bc1a 100755 --- a/ci/azure-linux_mac.yml +++ b/ci/azure-linux_mac.yml @@ -23,7 +23,7 @@ steps: set -e pipefail sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 15CF4D18AF4F7421 sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main' - sudo apt install -y clang-format-15 + sudo apt-get install -y clang-format-15 src=$BUILD_REPOSITORY_LOCALPATH/libtiledbvcf cd $BUILD_REPOSITORY_LOCALPATH ci/run-clang-format.sh $src clang-format-15 0 \ @@ -36,6 +36,12 @@ steps: - bash: | set -e pipefail + + # Install htslib dependencies + if [[ "$AGENT_OS" == "Linux" ]]; then + sudo apt-get update && sudo apt-get install -y automake autoconf libbz2-dev liblzma-dev + fi + # Install bcftools (only required for running the CLI tests) version=1.20 if [[ "$AGENT_OS" == "Linux" ]]; then @@ -51,14 +57,9 @@ steps: brew install bcftools automake fi - # Install autoconf/automake (required for htslib) - if [[ "$AGENT_OS" == "Linux" ]]; then - sudo apt update && sudo apt install -y automake autoconf - fi - # Install some extra dependencies to speed up the core TileDB build if [[ "$AGENT_OS" == "Linux" ]]; then - sudo apt install -y libssl-dev libbz2-dev liblz4-dev libtbb-dev libcurl4-openssl-dev zlib1g-dev + sudo apt-get install -y libssl-dev libbz2-dev liblz4-dev libtbb-dev libcurl4-openssl-dev zlib1g-dev fi displayName: 'Install dependencies' diff --git a/ci/native_libs-linux_osx.yml b/ci/native_libs-linux_osx.yml index 8ef477824..4faca691a 100755 --- a/ci/native_libs-linux_osx.yml +++ b/ci/native_libs-linux_osx.yml @@ -1,6 +1,12 @@ steps: - bash: | set -e pipefail + + # Install htslib dependencies + if [[ "$AGENT_OS" == "Linux" ]]; then + sudo apt-get update && sudo apt-get install -y automake autoconf libbz2-dev liblzma-dev + fi + # Install bcftools (only required for running the CLI tests) version=1.16 if [[ "$AGENT_OS" == "Linux" ]]; then @@ -16,14 +22,9 @@ steps: brew install bcftools automake fi - # Install autoconf/automake (required for htslib) - if [[ "$AGENT_OS" == "Linux" ]]; then - sudo apt update && sudo apt install -y automake autoconf - fi - # Install some extra dependencies to speed up the core TileDB build if [[ "$AGENT_OS" == "Linux" ]]; then - sudo apt install -y libssl-dev libbz2-dev liblz4-dev libtbb-dev libcurl4-openssl-dev zlib1g-dev + sudo apt-get install -y libssl-dev libbz2-dev liblz4-dev libtbb-dev libcurl4-openssl-dev zlib1g-dev fi displayName: 'Install dependencies'