diff options
| -rw-r--r-- | azure/coverage_job.yml | 6 | ||||
| -rw-r--r-- | azure/file_cache_job.yml | 8 | ||||
| -rw-r--r-- | azure/i386/apt.yml | 1 | ||||
| -rw-r--r-- | azure/i386/job.yml | 1 | ||||
| -rw-r--r-- | azure/job.yml | 9 | ||||
| -rw-r--r-- | azure/setup.yml | 9 |
6 files changed, 12 insertions, 22 deletions
diff --git a/azure/coverage_job.yml b/azure/coverage_job.yml index d5720b87f8..01bde10281 100644 --- a/azure/coverage_job.yml +++ b/azure/coverage_job.yml @@ -20,11 +20,7 @@ jobs: - script: make -j$(/usr/bin/nproc) >/dev/null displayName: 'Make Build' - template: install.yml - - script: | - mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test" - sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';" - sudo -u postgres psql -c "CREATE DATABASE test;" - displayName: 'Setup' + - template: setup.yml - template: test.yml parameters: configurationName: ${{ parameters.configurationName }} diff --git a/azure/file_cache_job.yml b/azure/file_cache_job.yml index a52b56a216..614bd8d1a5 100644 --- a/azure/file_cache_job.yml +++ b/azure/file_cache_job.yml @@ -17,13 +17,7 @@ jobs: - script: make -j$(/usr/bin/nproc) >/dev/null displayName: 'Make Build' - template: install.yml - - script: | - set -e - sudo service mysql start - mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test" - sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';" - sudo -u postgres psql -c "CREATE DATABASE test;" - displayName: 'Setup' + - template: script.yml - template: test.yml parameters: configurationName: ${{ parameters.configurationName }} diff --git a/azure/i386/apt.yml b/azure/i386/apt.yml index 44b460ea24..ed2c5d1128 100644 --- a/azure/i386/apt.yml +++ b/azure/i386/apt.yml @@ -40,7 +40,6 @@ steps: libpq-dev:i386 \ libreadline-dev:i386 \ libffi-dev:i386 \ - libfreetype6-dev:i386 \ libsodium-dev:i386 \ ${{ parameters.packages }} displayName: 'APT' diff --git a/azure/i386/job.yml b/azure/i386/job.yml index a0fc707dc2..5d53dab858 100644 --- a/azure/i386/job.yml +++ b/azure/i386/job.yml @@ -29,7 +29,6 @@ jobs: --enable-gd \ --with-jpeg \ --with-webp \ - --with-freetype \ --with-xpm \ --enable-exif \ --with-zip \ diff --git a/azure/job.yml b/azure/job.yml index 25306fa653..04dcf13c39 100644 --- a/azure/job.yml +++ b/azure/job.yml @@ -17,14 +17,7 @@ jobs: - script: make -j$(/usr/bin/nproc) >/dev/null displayName: 'Make Build' - template: install.yml - - script: | - set -e - sudo service mysql start - sudo service postgresql start - mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test" - sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';" - sudo -u postgres psql -c "CREATE DATABASE test;" - displayName: 'Setup' + - template: setup.yml - template: test.yml parameters: configurationName: ${{ parameters.configurationName }} diff --git a/azure/setup.yml b/azure/setup.yml new file mode 100644 index 0000000000..dbf7921c47 --- /dev/null +++ b/azure/setup.yml @@ -0,0 +1,9 @@ +steps: + - script: | + set -e + sudo service mysql start + sudo service postgresql start + mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test" + sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';" + sudo -u postgres psql -c "CREATE DATABASE test;" + displayName: 'Setup' |