Skip to content

Commit e0d2070

Browse files
committed
Use shared setup.yml on azure
Make sure things stay synchronized between different x64 jobs.
1 parent ff7fd3d commit e0d2070

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

azure/coverage_job.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ jobs:
2020
- script: make -j$(/usr/bin/nproc) >/dev/null
2121
displayName: 'Make Build'
2222
- template: install.yml
23-
- script: |
24-
mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
25-
sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
26-
sudo -u postgres psql -c "CREATE DATABASE test;"
27-
displayName: 'Setup'
23+
- template: setup.yml
2824
- template: test.yml
2925
parameters:
3026
configurationName: ${{ parameters.configurationName }}

azure/job.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,7 @@ jobs:
1717
- script: make -j$(/usr/bin/nproc) >/dev/null
1818
displayName: 'Make Build'
1919
- template: install.yml
20-
- script: |
21-
set -e
22-
sudo service mysql start
23-
sudo service postgresql start
24-
mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
25-
sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
26-
sudo -u postgres psql -c "CREATE DATABASE test;"
27-
displayName: 'Setup'
20+
- template: setup.yml
2821
- template: test.yml
2922
parameters:
3023
configurationName: ${{ parameters.configurationName }}

azure/setup.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
steps:
2+
- script: |
3+
set -e
4+
sudo service mysql start
5+
sudo service postgresql start
6+
mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
7+
sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
8+
sudo -u postgres psql -c "CREATE DATABASE test;"
9+
displayName: 'Setup'

0 commit comments

Comments
 (0)