diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-12 15:09:43 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-12 15:41:00 +0200 |
| commit | e0d207010865dc7f23d322f07f1540112da7124c (patch) | |
| tree | 98cfd145186e0f18343f73a68ef00fccdae93daa | |
| parent | ff7fd3dc858eb71234ee2f38f2c2f58050927b8b (diff) | |
| download | php-git-e0d207010865dc7f23d322f07f1540112da7124c.tar.gz | |
Use shared setup.yml on azure
Make sure things stay synchronized between different x64 jobs.
| -rw-r--r-- | azure/coverage_job.yml | 6 | ||||
| -rw-r--r-- | azure/job.yml | 9 | ||||
| -rw-r--r-- | azure/setup.yml | 9 |
3 files changed, 11 insertions, 13 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/job.yml b/azure/job.yml index a262d33f00..2893653b18 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' |