Commit 9a4d3534a10ce1984567a4f79b70cfa2aa024676

Authored by Jay Berkenbilt
1 parent ba17370f

Split distfiles into a separate job

azure-pipelines.yml
1 jobs: 1 jobs:
2 -- job: Linux 2 +- job: Distfiles
3 pool: 3 pool:
4 vmImage: ubuntu-16.04 4 vmImage: ubuntu-16.04
5 steps: 5 steps:
6 - - script: build-scripts/build-linux  
7 - displayName: 'Generate, build, and test' 6 + - script: build-scripts/make-distfiles
  7 + displayName: 'Create distfiles.zip'
8 - task: PublishBuildArtifacts@1 8 - task: PublishBuildArtifacts@1
9 inputs: 9 inputs:
10 pathtoPublish: '$(System.DefaultWorkingDirectory)/distfiles.zip' 10 pathtoPublish: '$(System.DefaultWorkingDirectory)/distfiles.zip'
11 artifactName: distfiles 11 artifactName: distfiles
12 displayName: 'Upload extra distribution files' 12 displayName: 'Upload extra distribution files'
13 condition: eq(variables['System.PullRequest.IsFork'], 'False') 13 condition: eq(variables['System.PullRequest.IsFork'], 'False')
  14 +- job: Linux
  15 + pool:
  16 + vmImage: ubuntu-16.04
  17 + steps:
  18 + - script: build-scripts/build-linux
  19 + displayName: 'Generate, build, and test'
14 - task: PublishBuildArtifacts@1 20 - task: PublishBuildArtifacts@1
15 inputs: 21 inputs:
16 pathtoPublish: '$(System.DefaultWorkingDirectory)/distribution' 22 pathtoPublish: '$(System.DefaultWorkingDirectory)/distribution'
@@ -63,7 +69,7 @@ jobs: @@ -63,7 +69,7 @@ jobs:
63 inputs: 69 inputs:
64 testRunTitle: Windows-$(wordsize)$(tool) 70 testRunTitle: Windows-$(wordsize)$(tool)
65 buildPlatform: Windows-$(wordsize)$(tool) 71 buildPlatform: Windows-$(wordsize)$(tool)
66 - dependsOn: Linux 72 + dependsOn: Distfiles
67 condition: succeeded() 73 condition: succeeded()
68 - job: macOS 74 - job: macOS
69 pool: 75 pool:
@@ -81,7 +87,7 @@ jobs: @@ -81,7 +87,7 @@ jobs:
81 inputs: 87 inputs:
82 testRunTitle: MacOS 88 testRunTitle: MacOS
83 buildPlatform: MacOS 89 buildPlatform: MacOS
84 - dependsOn: Linux 90 + dependsOn: Distfiles
85 condition: succeeded() 91 condition: succeeded()
86 - job: AppImage 92 - job: AppImage
87 pool: 93 pool:
@@ -99,8 +105,6 @@ jobs: @@ -99,8 +105,6 @@ jobs:
99 inputs: 105 inputs:
100 testRunTitle: AppImage 106 testRunTitle: AppImage
101 buildPlatform: AppImage 107 buildPlatform: AppImage
102 - dependsOn: Linux  
103 - condition: succeeded()  
104 - job: Linux32 108 - job: Linux32
105 pool: 109 pool:
106 vmImage: ubuntu-16.04 110 vmImage: ubuntu-16.04
@@ -111,16 +115,12 @@ jobs: @@ -111,16 +115,12 @@ jobs:
111 inputs: 115 inputs:
112 testRunTitle: Linux32 116 testRunTitle: Linux32
113 buildPlatform: Linux32 117 buildPlatform: Linux32
114 - dependsOn: Linux  
115 - condition: succeeded()  
116 - job: Fuzzers 118 - job: Fuzzers
117 pool: 119 pool:
118 vmImage: ubuntu-16.04 120 vmImage: ubuntu-16.04
119 steps: 121 steps:
120 - script: build-scripts/build-fuzzer 122 - script: build-scripts/build-fuzzer
121 displayName: 'Build Fuzzer' 123 displayName: 'Build Fuzzer'
122 - dependsOn: Linux  
123 - condition: succeeded()  
124 - job: Sanitizers 124 - job: Sanitizers
125 pool: 125 pool:
126 vmImage: ubuntu-16.04 126 vmImage: ubuntu-16.04
@@ -131,5 +131,3 @@ jobs: @@ -131,5 +131,3 @@ jobs:
131 inputs: 131 inputs:
132 testRunTitle: Sanitizers 132 testRunTitle: Sanitizers
133 buildPlatform: Sanitizers 133 buildPlatform: Sanitizers
134 - dependsOn: Linux  
135 - condition: succeeded()  
build-scripts/build-linux
@@ -12,7 +12,6 @@ for i in $(./qpdf/build/qpdf --show-crypto); do @@ -12,7 +12,6 @@ for i in $(./qpdf/build/qpdf --show-crypto); do
12 echo "*** Running tests with crypto provider $i" 12 echo "*** Running tests with crypto provider $i"
13 env QPDF_CRYPTO_PROVIDER=$i make -k check 13 env QPDF_CRYPTO_PROVIDER=$i make -k check
14 done 14 done
15 -make distfiles.zip  
16 ./make_dist --ci --no-tests 15 ./make_dist --ci --no-tests
17 mkdir distribution 16 mkdir distribution
18 cp /tmp/qpdf*-ci.tar.gz distribution 17 cp /tmp/qpdf*-ci.tar.gz distribution
build-scripts/make-distfiles 0 → 100755
  1 +#!/bin/bash
  2 +set -ex
  3 +sudo apt-get update
  4 +sudo apt-get -y install \
  5 + autoconf build-essential zlib1g-dev libjpeg-dev \
  6 + docbook-xsl fop xsltproc libxml2-utils inkscape imagemagick
  7 +./configure --enable-doc-maintenance
  8 +make -j$(nproc) distfiles.zip