Revert "try fixing directory"

This reverts commit 4f07a1cc43.
This commit is contained in:
Collin M. Barrett 2020-02-15 19:41:37 -06:00
parent 1a50b8c960
commit 8c1c792942

View file

@ -24,7 +24,6 @@ jobs:
- task: Bash@3
displayName: checkout source branch
inputs:
workingDirectory: $(Build.SourcesDirectory)
script: |
FORKURI=$(curl -X GET "https://api.github.com/repos/$BUILD_REPOSITORY_NAME/pulls/$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER" | jq -r '.head.repo.clone_url')
git clone "$FORKURI" .
@ -36,7 +35,6 @@ jobs:
env:
GITHUBNAME: $(GITHUBNAME)
inputs:
workingDirectory: $(Build.SourcesDirectory)
script: |
LASTAUTHOR=$(git log -n 1 --pretty=format:"%an")
LASTMSG=$(git log -n 1 --pretty=format:"%s")
@ -78,7 +76,7 @@ jobs:
env:
GITHUBNAME: $(GITHUBNAME)
inputs:
workingDirectory: $(Build.SourcesDirectory)/server/src
workingDirectory: server/src
script: |
MIGLIST=$(dotnet ef migrations list -p FilterLists.Data.Migrations -s FilterLists.Api)
echo "$MIGLIST"
@ -91,7 +89,6 @@ jobs:
- task: Bash@3
displayName: merge upstream data
inputs:
workingDirectory: $(Build.SourcesDirectory)
script: |
git remote add upstream https://github.com/collinbarrett/FilterLists.git
git fetch upstream
@ -108,13 +105,12 @@ jobs:
- task: CmdLine@2
displayName: add migration
inputs:
workingDirectory: $(Build.SourcesDirectory)/server/src
workingDirectory: server/src
script: dotnet ef migrations add $(System.PullRequest.PullRequestNumber) -p FilterLists.Data.Migrations -s FilterLists.Api
- task: Bash@3
displayName: commit or abandon migration
inputs:
workingDirectory: $(Build.SourcesDirectory)
script: |
DIFF=$(git status -s | wc -l)
echo "$DIFF file(s) changed"
@ -136,35 +132,30 @@ jobs:
- task: DockerCompose@0
displayName: build test-data
inputs:
workingDirectory: $(Build.SourcesDirectory)
dockerComposeFile: docker-compose.data.tests.yml
dockerComposeCommand: build api
- task: Docker@2
displayName: create volume test-data-results
inputs:
workingDirectory: $(Build.SourcesDirectory)
command: volume
arguments: create test-data-results
- task: DockerCompose@0
displayName: up test-data db
inputs:
workingDirectory: $(Build.SourcesDirectory)
dockerComposeFile: docker-compose.data.tests.yml
dockerComposeCommand: up -d mariadb
- task: DockerCompose@0
displayName: run test-data
inputs:
workingDirectory: $(Build.SourcesDirectory)
dockerComposeFile: docker-compose.data.tests.yml
dockerComposeCommand: run api
- task: Docker@2
displayName: create container test-data-results
inputs:
workingDirectory: $(Build.SourcesDirectory)
command: container
arguments: create --name test-data-results -v test-data-results:/results hello-world
condition: succeededOrFailed()
@ -172,7 +163,6 @@ jobs:
- task: Docker@2
displayName: copy out test-data results
inputs:
workingDirectory: $(Build.SourcesDirectory)
command: cp
arguments: test-data-results:/results $(System.DefaultWorkingDirectory)
condition: succeededOrFailed()
@ -180,7 +170,6 @@ jobs:
- task: PublishTestResults@2
displayName: publish test results
inputs:
workingDirectory: $(Build.SourcesDirectory)
testResultsFormat: VSTest
testResultsFiles: "**/*.trx"
condition: succeededOrFailed()
@ -196,7 +185,6 @@ jobs:
env:
GITHUBPAT: $(GITHUBPAT)
inputs:
workingDirectory: $(Build.SourcesDirectory)
script: |
git config --global credential.helper store
echo "https://$GITHUBPAT:x-oauth-basic@github.com" >> ~/.git-credentials