diff options
| author | Joe Watkins <krakjoe@php.net> | 2019-06-11 11:09:24 +0200 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-06-11 11:09:24 +0200 |
| commit | f7342e298b5372bf06da7b722f8d84c4b66f91ac (patch) | |
| tree | 4bd26d360838e50cae3aadb199966b6189dacfe1 | |
| parent | f6175955a27b69db98dea1f1f9a35560bf76826f (diff) | |
| parent | a36e381e57bdb1a95707198d3eecc5a209c56c97 (diff) | |
| download | php-git-f7342e298b5372bf06da7b722f8d84c4b66f91ac.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
drop docker until tested locally
| -rw-r--r-- | azure/i386/job.yml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/azure/i386/job.yml b/azure/i386/job.yml index a4feebf6d9..4acf58c74f 100644 --- a/azure/i386/job.yml +++ b/azure/i386/job.yml @@ -77,14 +77,6 @@ jobs: sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';" sudo -u postgres psql -c "CREATE DATABASE test;" displayName: 'Setup' -# - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: this will be uncommented on merge, we don't want to docker pull request builds - - task: Docker@2 - inputs: - containerRegistry: 'phpazuredevops' - repository: ${{ variables['Build.SourceBranch'] }} - command: 'buildAndPush' - Dockerfile: '**/Dockerfile' - tags: ${{ parameters.configurationName }} - template: test.yml parameters: configurationName: ${{ parameters.configurationName }} |