diff --git a/README-maintainer b/README-maintainer index 9f1a4a9f..32577195 100644 --- a/README-maintainer +++ b/README-maintainer @@ -326,7 +326,7 @@ When releasing on sourceforge, `external-libs` distributions go in `external-libs/yyyymmdd`, and qpdf distributions go in `qpdf/vvv`. For local iteration on the AppImage generation, it works to just -./azure-pipelines/build-appimage and get the resulting AppImage from +./build-scripts/build-appimage and get the resulting AppImage from the distribution directory. You can also pass -e SKIP_TESTS=1 build-appimage, which passes it along to to docker, to skip the test suite, which useful for rapid iteration. diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2010e184..25b499f7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,7 +3,7 @@ jobs: pool: vmImage: ubuntu-16.04 steps: - - script: azure-pipelines/build-linux + - script: build-scripts/build-linux displayName: 'Generate, build, and test' - task: PublishBuildArtifacts@1 inputs: @@ -51,7 +51,7 @@ jobs: artifactName: distfiles downloadPath: $(System.DefaultWorkingDirectory) condition: eq(variables['System.PullRequest.IsFork'], 'False') - - script: azure-pipelines/build-windows.bat $(wordsize) $(tool) + - script: build-scripts/build-windows.bat $(wordsize) $(tool) displayName: 'Build, test, generate binary distributions' - task: PublishBuildArtifacts@1 inputs: @@ -75,7 +75,7 @@ jobs: artifactName: distfiles downloadPath: $(System.DefaultWorkingDirectory) condition: eq(variables['System.PullRequest.IsFork'], 'False') - - script: azure-pipelines/build-mac + - script: build-scripts/build-mac displayName: 'Mac build and test' - task: PublishTestResults@2 inputs: @@ -87,7 +87,7 @@ jobs: pool: vmImage: ubuntu-16.04 steps: - - script: azure-pipelines/build-appimage + - script: build-scripts/build-appimage displayName: 'Build AppImage' - task: PublishBuildArtifacts@1 inputs: @@ -105,7 +105,7 @@ jobs: pool: vmImage: ubuntu-16.04 steps: - - script: azure-pipelines/build-linux32 + - script: build-scripts/build-linux32 displayName: 'Linux 32-bit' - task: PublishTestResults@2 inputs: @@ -117,7 +117,7 @@ jobs: pool: vmImage: ubuntu-16.04 steps: - - script: azure-pipelines/build-fuzzer + - script: build-scripts/build-fuzzer displayName: 'Build Fuzzer' dependsOn: Linux condition: succeeded() @@ -125,7 +125,7 @@ jobs: pool: vmImage: ubuntu-16.04 steps: - - script: azure-pipelines/test-sanitizers + - script: build-scripts/test-sanitizers displayName: 'Sanitizer Tests' - task: PublishTestResults@2 inputs: diff --git a/azure-pipelines/build-appimage b/build-scripts/build-appimage similarity index 100% rename from azure-pipelines/build-appimage rename to build-scripts/build-appimage diff --git a/azure-pipelines/build-fuzzer b/build-scripts/build-fuzzer similarity index 100% rename from azure-pipelines/build-fuzzer rename to build-scripts/build-fuzzer diff --git a/azure-pipelines/build-linux b/build-scripts/build-linux similarity index 100% rename from azure-pipelines/build-linux rename to build-scripts/build-linux diff --git a/azure-pipelines/build-linux32 b/build-scripts/build-linux32 similarity index 100% rename from azure-pipelines/build-linux32 rename to build-scripts/build-linux32 diff --git a/azure-pipelines/build-mac b/build-scripts/build-mac similarity index 100% rename from azure-pipelines/build-mac rename to build-scripts/build-mac diff --git a/azure-pipelines/build-windows b/build-scripts/build-windows similarity index 100% rename from azure-pipelines/build-windows rename to build-scripts/build-windows diff --git a/azure-pipelines/build-windows.bat b/build-scripts/build-windows.bat similarity index 86% rename from azure-pipelines/build-windows.bat rename to build-scripts/build-windows.bat index e646f0a2..8be269e9 100644 --- a/azure-pipelines/build-windows.bat +++ b/build-scripts/build-windows.bat @@ -7,10 +7,10 @@ if %2 == msvc ( call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat" ) choco install zip - bash ./azure-pipelines/build-windows %1 %2 + bash ./build-scripts/build-windows %1 %2 ) else ( @rem The vs2017-win2016 pool has an ancient 64-bit-only mingw. @rem Install msys2 so we can get current gcc toolchains. choco install msys2 - C:\tools\msys64\usr\bin\env.exe MSYSTEM=MINGW64 /bin/bash -l %CD%/azure-pipelines/build-windows %1 %2 + C:\tools\msys64\usr\bin\env.exe MSYSTEM=MINGW64 /bin/bash -l %CD%/build-scripts/build-windows %1 %2 ) diff --git a/azure-pipelines/test-sanitizers b/build-scripts/test-sanitizers similarity index 100% rename from azure-pipelines/test-sanitizers rename to build-scripts/test-sanitizers diff --git a/fuzz/oss-fuzz-build b/fuzz/oss-fuzz-build index 0a056572..a875edcf 100755 --- a/fuzz/oss-fuzz-build +++ b/fuzz/oss-fuzz-build @@ -4,7 +4,7 @@ # https://github.com/google/oss-fuzz/blob/master/projects/qpdf/build.sh # It should be run from the top level directory of a clean checkout of -# qpdf. It is also exercised in ../azure-pipelines/build-fuzzer +# qpdf. It is also exercised in ../build-scripts/build-fuzzer if [[ $GITHUB_FORK != "" ]]; then git remote add fork https://github.com/$GITHUB_FORK/qpdf