From cc9d8760a43d97b9619e9ca88121015360b87380 Mon Sep 17 00:00:00 2001 From: MarkKoz Date: Mon, 13 May 2019 02:13:59 -0700 Subject: Build images if their Dockerfiles change even in PRs The venv image will still not be built in a PR if a Pipfile changes. --- azure-pipelines.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3f4c236..86beadf 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -32,11 +32,11 @@ jobs: - job: build displayName: 'Build' dependsOn: test - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) variables: BASE_CHANGED: true VENV_CHANGED: true + PIPFILE_CHANGED: true steps: - task: Docker@1 @@ -70,10 +70,15 @@ jobs: echo "##vso[task.setvariable variable=BASE_CHANGED]false" fi - if [[ -z "$(git diff $PREV_COMMIT -- Pipfile* docker/venv.Dockerfile)" ]]; then - echo "No changes detected in Pipfile, Pipfile.lock, or docker/venv.Dockerfile. The venv image will not be built." + if [[ -z "$(git diff $PREV_COMMIT -- docker/venv.Dockerfile)" ]]; then + echo "No changes detected in docker/venv.Dockerfile. The venv image will not be built." echo "##vso[task.setvariable variable=VENV_CHANGED]false" fi + + if [[ -z "$(git diff $PREV_COMMIT -- Pipfile*)" ]]; then + echo "No changes detected in Pipfile or Pipfile.lock. The venv image will not be built unless its Dockerfile changed." + echo "##vso[task.setvariable variable=PIPFILE_CHANGED]false" + fi else echo "No previous commit was retrieved. Either the previous build is too old and was deleted or the branch was empty before this build. All images will be built." fi @@ -85,18 +90,19 @@ jobs: - script: docker build -t pythondiscord/snekbox-venv:latest -f docker/venv.Dockerfile . displayName: 'Build Virtual Environment Image' - condition: and(succeeded(), or(eq(variables.BASE_CHANGED, 'true'), eq(variables.VENV_CHANGED, 'true'))) + condition: and(succeeded(), or(eq(variables.BASE_CHANGED, 'true'), eq(variables.VENV_CHANGED, 'true'), and(eq(variables.PIPFILE_CHANGED, 'true'), ne(variables['Build.Reason'], 'PullRequest')))) - script: docker build -t pythondiscord/snekbox:latest -f docker/Dockerfile . displayName: 'Build Final Image' - script: docker push pythondiscord/snekbox-base:latest displayName: 'Push Base Image to Dockerhub' - condition: and(succeeded(), eq(variables.BASE_CHANGED, 'true')) + condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables.BASE_CHANGED, 'true')) - script: docker push pythondiscord/snekbox-venv:latest displayName: 'Push Virtual Environment Image to Dockerhub' - condition: and(succeeded(), or(eq(variables.BASE_CHANGED, 'true'), eq(variables.VENV_CHANGED, 'true'))) + condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), or(eq(variables.BASE_CHANGED, 'true'), eq(variables.VENV_CHANGED, 'true'), eq(variables.PIPFILE_CHANGED, 'true'))) - script: docker push pythondiscord/snekbox:latest displayName: 'Push Final Image to Dockerhub' + condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) -- cgit v1.2.3