diff options
| -rw-r--r-- | azure-pipelines.yml | 24 | ||||
| -rwxr-xr-x | build-scripts/build-linux | 1 | ||||
| -rwxr-xr-x | build-scripts/make-distfiles | 8 |
3 files changed, 19 insertions, 14 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 25b499f7..9de04fbf 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,16 +1,22 @@ jobs: -- job: Linux +- job: Distfiles pool: vmImage: ubuntu-16.04 steps: - - script: build-scripts/build-linux - displayName: 'Generate, build, and test' + - script: build-scripts/make-distfiles + displayName: 'Create distfiles.zip' - task: PublishBuildArtifacts@1 inputs: pathtoPublish: '$(System.DefaultWorkingDirectory)/distfiles.zip' artifactName: distfiles displayName: 'Upload extra distribution files' condition: eq(variables['System.PullRequest.IsFork'], 'False') +- job: Linux + pool: + vmImage: ubuntu-16.04 + steps: + - script: build-scripts/build-linux + displayName: 'Generate, build, and test' - task: PublishBuildArtifacts@1 inputs: pathtoPublish: '$(System.DefaultWorkingDirectory)/distribution' @@ -63,7 +69,7 @@ jobs: inputs: testRunTitle: Windows-$(wordsize)$(tool) buildPlatform: Windows-$(wordsize)$(tool) - dependsOn: Linux + dependsOn: Distfiles condition: succeeded() - job: macOS pool: @@ -81,7 +87,7 @@ jobs: inputs: testRunTitle: MacOS buildPlatform: MacOS - dependsOn: Linux + dependsOn: Distfiles condition: succeeded() - job: AppImage pool: @@ -99,8 +105,6 @@ jobs: inputs: testRunTitle: AppImage buildPlatform: AppImage - dependsOn: Linux - condition: succeeded() - job: Linux32 pool: vmImage: ubuntu-16.04 @@ -111,16 +115,12 @@ jobs: inputs: testRunTitle: Linux32 buildPlatform: Linux32 - dependsOn: Linux - condition: succeeded() - job: Fuzzers pool: vmImage: ubuntu-16.04 steps: - script: build-scripts/build-fuzzer displayName: 'Build Fuzzer' - dependsOn: Linux - condition: succeeded() - job: Sanitizers pool: vmImage: ubuntu-16.04 @@ -131,5 +131,3 @@ jobs: inputs: testRunTitle: Sanitizers buildPlatform: Sanitizers - dependsOn: Linux - condition: succeeded() diff --git a/build-scripts/build-linux b/build-scripts/build-linux index 266b9920..34bf599e 100755 --- a/build-scripts/build-linux +++ b/build-scripts/build-linux @@ -12,7 +12,6 @@ for i in $(./qpdf/build/qpdf --show-crypto); do echo "*** Running tests with crypto provider $i" env QPDF_CRYPTO_PROVIDER=$i make -k check done -make distfiles.zip ./make_dist --ci --no-tests mkdir distribution cp /tmp/qpdf*-ci.tar.gz distribution diff --git a/build-scripts/make-distfiles b/build-scripts/make-distfiles new file mode 100755 index 00000000..6a074aee --- /dev/null +++ b/build-scripts/make-distfiles @@ -0,0 +1,8 @@ +#!/bin/bash +set -ex +sudo apt-get update +sudo apt-get -y install \ + autoconf build-essential zlib1g-dev libjpeg-dev \ + docbook-xsl fop xsltproc libxml2-utils inkscape imagemagick +./configure --enable-doc-maintenance +make -j$(nproc) distfiles.zip |