Skip to content

Commit

Permalink
CI: move 'distcheck' job from zuul to azure pipelines
Browse files Browse the repository at this point in the history
  • Loading branch information
bagder committed Jan 26, 2022
1 parent 4bf593a commit 28721d2
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 52 deletions.
61 changes: 60 additions & 1 deletion .azure-pipelines.yml
Expand Up @@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
# Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
# Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
Expand Down Expand Up @@ -94,6 +94,65 @@ stages:
AZURE_ACCESS_TOKEN: "$(System.AccessToken)"
TFLAGS: "-r $(tests)"

- stage: distcheck
dependsOn: []
jobs:
- job: ubuntu
timeoutInMinutes: 10
pool:
vmImage: 'ubuntu-latest'
strategy:
matrix:
default:
name: default
install:
steps:
- script: ./buildconf && ./configure --without-ssl
displayName: 'configure $(name)'

- script: make && ./maketgz 99.98.97
displayName: 'make tarball'

- script: |
tar xf curl-99.98.97.tar.gz
cd curl-99.98.97
./configure --prefix=$HOME/temp --without-ssl
make
make TFLAGS=1 test
make install
# basic check of the installed files
cd ..
bash scripts/installcheck.sh $HOME/temp
rm -rf curl-99.98.97
displayName: 'verify in-tree configure build'
- script: |
# verify out-of-tree build
tar xf curl-99.98.97.tar.gz
touch curl-99.98.97/docs/{cmdline-opts,libcurl}/Makefile.inc
mkdir build
cd build
../curl-99.98.97/configure --without-ssl
make
make TFLAGS='-p 1 1139' test
# verify cmake build
cd ..
rm -rf curl-99.98.97
displayName: 'verify out-of-tree configure build'
- script: |
tar xf curl-99.98.97.tar.gz
cd curl-99.98.97
mkdir build
cd build
cmake ..
make
displayName: 'verify out-of-tree cmake build'
##########################################
### Windows jobs below
##########################################
Expand Down
37 changes: 0 additions & 37 deletions scripts/zuul/script.sh
Expand Up @@ -108,43 +108,6 @@ if [ "$T" = "cmake" ]; then
env TFLAGS="!1139 $TFLAGS" cmake --build build --target test-nonflaky
fi

if [ "$T" = "distcheck" ]; then
# find BOM markers and exit if we do
! git grep `printf '\xef\xbb\xbf'`
./configure --without-ssl
make
./maketgz 99.98.97
# verify in-tree build - and install it
tar xf curl-99.98.97.tar.gz
cd curl-99.98.97
./configure --prefix=$HOME/temp --without-ssl
make
make TFLAGS=1 test
make install
# basic check of the installed files
cd ..
bash scripts/installcheck.sh $HOME/temp
rm -rf curl-99.98.97
# verify out-of-tree build
tar xf curl-99.98.97.tar.gz
touch curl-99.98.97/docs/{cmdline-opts,libcurl}/Makefile.inc
mkdir build
cd build
../curl-99.98.97/configure --without-ssl
make
make TFLAGS='-p 1 1139' test
# verify cmake build
cd ..
rm -rf curl-99.98.97
tar xf curl-99.98.97.tar.gz
cd curl-99.98.97
mkdir build
cd build
cmake ..
make
cd ../..
fi

if [ "$T" = "fuzzer" ]; then
# Download the fuzzer to a temporary folder
./tests/fuzz/download_fuzzer.sh /tmp/curl_fuzzer
Expand Down
14 changes: 0 additions & 14 deletions zuul.d/jobs.yaml
Expand Up @@ -379,19 +379,6 @@
CXX: g++-8
T: events

- job:
name: curl-distcheck
parent: curl-base
vars:
curl_apt_packages:
- libpsl-dev
- libbrotli-dev
- libzstd-dev
curl_env:
CC: gcc-8
CXX: g++-8
T: distcheck

- job:
name: curl-fuzzer
parent: curl-base
Expand Down Expand Up @@ -495,7 +482,6 @@
- curl-cmake-ngtcp2
- curl-torture
- curl-events
- curl-distcheck
- curl-fuzzer
- curl-tidy
- curl-scan-build
Expand Down

0 comments on commit 28721d2

Please sign in to comment.