mirror of
https://github.com/collinbarrett/FilterLists.git
synced 2026-03-11 09:04:27 +00:00
refactor(pipes): ♻🎨 lint pipelines
This commit is contained in:
parent
43d2cdefe0
commit
b094920180
6 changed files with 51 additions and 69 deletions
|
|
@ -7,7 +7,7 @@ trigger:
|
|||
[
|
||||
reverse-proxy/*,
|
||||
docker-compose/docker-compose.yml,
|
||||
docker-compose/docker-compose.prod.yml
|
||||
docker-compose/docker-compose.prod.yml,
|
||||
]
|
||||
|
||||
pr: none
|
||||
|
|
@ -20,27 +20,15 @@ steps:
|
|||
fetchDepth: 5
|
||||
|
||||
- task: CopyFiles@2
|
||||
displayName: stage reverse-proxy config files
|
||||
displayName: stage files
|
||||
inputs:
|
||||
SourceFolder: $(Build.SourcesDirectory)
|
||||
Contents: |
|
||||
docker-compose/docker-compose.yml
|
||||
docker-compose/docker-compose.prod.yml
|
||||
reverse-proxy/server-includes/*
|
||||
reverse-proxy/location-includes/*
|
||||
reverse-proxy/conf.d/*
|
||||
TargetFolder: $(Build.ArtifactStagingDirectory)
|
||||
CleanTargetFolder: true
|
||||
OverWrite: true
|
||||
condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
|
||||
|
||||
- task: CopyFiles@2
|
||||
displayName: stage docker-compose files
|
||||
inputs:
|
||||
SourceFolder: $(Build.SourcesDirectory)/docker-compose
|
||||
Contents: |
|
||||
docker-compose.yml
|
||||
docker-compose.prod.yml
|
||||
TargetFolder: $(Build.ArtifactStagingDirectory)
|
||||
OverWrite: true
|
||||
condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
|
||||
|
||||
- task: PublishBuildArtifacts@1
|
||||
|
|
|
|||
|
|
@ -15,8 +15,9 @@ trigger:
|
|||
services/.dockerignore,
|
||||
docker-compose/docker-compose.yml,
|
||||
docker-compose/docker-compose.prod.yml,
|
||||
docker-compose/docker-compose.prod.build.yml,
|
||||
docker-compose/.env,
|
||||
docker-compose/archival-api.env
|
||||
docker-compose/archival-api.env,
|
||||
]
|
||||
|
||||
pr:
|
||||
|
|
@ -36,17 +37,14 @@ pr:
|
|||
services/.dockerignore,
|
||||
docker-compose/docker-compose.yml,
|
||||
docker-compose/docker-compose.prod.yml,
|
||||
docker-compose/docker-compose.prod.build.yml,
|
||||
docker-compose/.env,
|
||||
docker-compose/archival-api.env
|
||||
docker-compose/archival-api.env,
|
||||
]
|
||||
|
||||
pool:
|
||||
vmImage: ubuntu-latest
|
||||
|
||||
variables:
|
||||
COMPOSE_DOCKER_CLI_BUILD: 1
|
||||
DOCKER_BUILDKIT: 1
|
||||
|
||||
steps:
|
||||
- checkout: self
|
||||
fetchDepth: 5
|
||||
|
|
@ -62,7 +60,8 @@ steps:
|
|||
tags: |
|
||||
latest
|
||||
$(Build.BuildId)
|
||||
addPipelineData: false
|
||||
env:
|
||||
DOCKER_BUILDKIT: 1
|
||||
|
||||
- task: Docker@2
|
||||
displayName: push
|
||||
|
|
@ -73,18 +72,17 @@ steps:
|
|||
tags: |
|
||||
latest
|
||||
$(Build.BuildId)
|
||||
env:
|
||||
DOCKER_BUILDKIT: 1
|
||||
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
|
||||
|
||||
- task: CopyFiles@2
|
||||
displayName: stage docker-compose files
|
||||
inputs:
|
||||
SourceFolder: $(Build.SourcesDirectory)/docker-compose
|
||||
Contents: |
|
||||
docker-compose.yml
|
||||
docker-compose.prod.yml
|
||||
docker-compose/docker-compose.yml
|
||||
docker-compose/docker-compose.prod.yml
|
||||
TargetFolder: $(Build.ArtifactStagingDirectory)
|
||||
CleanTargetFolder: true
|
||||
OverWrite: true
|
||||
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
|
||||
|
||||
- task: PublishBuildArtifacts@1
|
||||
|
|
|
|||
|
|
@ -10,14 +10,15 @@ trigger:
|
|||
services/Directory/FilterLists.Directory.Infrastructure/*,
|
||||
services/Directory/FilterLists.Directory.Infrastructure.Migrations/*,
|
||||
services/Directory/FilterLists.Directory.Api.Contracts/*,
|
||||
services/Directory/FilterLists.Directory.Application/*,
|
||||
services/Directory/FilterLists.Directory.Application/*,
|
||||
services/Directory/FilterLists.Directory.Api/*,
|
||||
services/.dockerignore,
|
||||
docker-compose/docker-compose.yml,
|
||||
docker-compose/docker-compose.prod.yml,
|
||||
docker-compose/docker-compose.prod.build.yml,
|
||||
docker-compose/.env,
|
||||
docker-compose/directory-db.env,
|
||||
docker-compose/directory-api.env
|
||||
docker-compose/directory-api.env,
|
||||
]
|
||||
|
||||
pr:
|
||||
|
|
@ -32,23 +33,20 @@ pr:
|
|||
services/Directory/FilterLists.Directory.Infrastructure/*,
|
||||
services/Directory/FilterLists.Directory.Infrastructure.Migrations/*,
|
||||
services/Directory/FilterLists.Directory.Api.Contracts/*,
|
||||
services/Directory/FilterLists.Directory.Application/*,
|
||||
services/Directory/FilterLists.Directory.Application/*,
|
||||
services/Directory/FilterLists.Directory.Api/*,
|
||||
services/.dockerignore,
|
||||
docker-compose/docker-compose.yml,
|
||||
docker-compose/docker-compose.prod.yml,
|
||||
docker-compose/docker-compose.prod.build.yml,
|
||||
docker-compose/.env,
|
||||
docker-compose/directory-db.env,
|
||||
docker-compose/directory-api.env
|
||||
docker-compose/directory-api.env,
|
||||
]
|
||||
|
||||
pool:
|
||||
vmImage: ubuntu-latest
|
||||
|
||||
variables:
|
||||
COMPOSE_DOCKER_CLI_BUILD: 1
|
||||
DOCKER_BUILDKIT: 1
|
||||
|
||||
steps:
|
||||
- checkout: self
|
||||
fetchDepth: 5
|
||||
|
|
@ -64,7 +62,8 @@ steps:
|
|||
tags: |
|
||||
latest
|
||||
$(Build.BuildId)
|
||||
addPipelineData: false
|
||||
env:
|
||||
DOCKER_BUILDKIT: 1
|
||||
|
||||
- task: Docker@2
|
||||
displayName: push
|
||||
|
|
@ -75,18 +74,17 @@ steps:
|
|||
tags: |
|
||||
latest
|
||||
$(Build.BuildId)
|
||||
env:
|
||||
DOCKER_BUILDKIT: 1
|
||||
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
|
||||
|
||||
- task: CopyFiles@2
|
||||
displayName: stage docker-compose files
|
||||
inputs:
|
||||
SourceFolder: $(Build.SourcesDirectory)/docker-compose
|
||||
Contents: |
|
||||
docker-compose.yml
|
||||
docker-compose.prod.yml
|
||||
docker-compose/docker-compose.yml
|
||||
docker-compose/docker-compose.prod.yml
|
||||
TargetFolder: $(Build.ArtifactStagingDirectory)
|
||||
CleanTargetFolder: true
|
||||
OverWrite: true
|
||||
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
|
||||
|
||||
- task: PublishBuildArtifacts@1
|
||||
|
|
|
|||
|
|
@ -13,8 +13,6 @@ pool:
|
|||
vmImage: ubuntu-latest
|
||||
|
||||
variables:
|
||||
COMPOSE_DOCKER_CLI_BUILD: 1
|
||||
DOCKER_BUILDKIT: 1
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT: true
|
||||
|
||||
steps:
|
||||
|
|
@ -150,6 +148,8 @@ steps:
|
|||
inputs:
|
||||
dockerComposeFile: ./docker-compose/docker-compose.directory.migrations.tests.yml
|
||||
dockerComposeCommand: build directory-migrations-tests
|
||||
env:
|
||||
COMPOSE_DOCKER_CLI_BUILD: 1
|
||||
|
||||
- task: Docker@2
|
||||
displayName: create volume directory-migrations-tests-results
|
||||
|
|
@ -157,6 +157,8 @@ steps:
|
|||
inputs:
|
||||
command: volume
|
||||
arguments: create directory-migrations-tests-results
|
||||
env:
|
||||
DOCKER_BUILDKIT: 1
|
||||
|
||||
- task: DockerCompose@0
|
||||
displayName: up test-migrations db
|
||||
|
|
@ -164,6 +166,8 @@ steps:
|
|||
inputs:
|
||||
dockerComposeFile: ./docker-compose/docker-compose.directory.migrations.tests.yml
|
||||
dockerComposeCommand: up -d directory-db
|
||||
env:
|
||||
COMPOSE_DOCKER_CLI_BUILD: 1
|
||||
|
||||
- task: DockerCompose@0
|
||||
displayName: run test-migrations
|
||||
|
|
@ -171,6 +175,8 @@ steps:
|
|||
inputs:
|
||||
dockerComposeFile: ./docker-compose/docker-compose.directory.migrations.tests.yml
|
||||
dockerComposeCommand: run directory-migrations-tests
|
||||
env:
|
||||
COMPOSE_DOCKER_CLI_BUILD: 1
|
||||
|
||||
- task: Docker@2
|
||||
displayName: create container directory-migrations-tests-results
|
||||
|
|
@ -178,6 +184,8 @@ steps:
|
|||
inputs:
|
||||
command: container
|
||||
arguments: create --name directory-migrations-tests-results -v directory-migrations-tests-results:/results hello-world
|
||||
env:
|
||||
DOCKER_BUILDKIT: 1
|
||||
|
||||
- task: Docker@2
|
||||
displayName: copy out test-migrations results
|
||||
|
|
@ -185,6 +193,8 @@ steps:
|
|||
inputs:
|
||||
command: cp
|
||||
arguments: directory-migrations-tests-results:/results $(System.DefaultWorkingDirectory)
|
||||
env:
|
||||
DOCKER_BUILDKIT: 1
|
||||
|
||||
- task: PublishTestResults@2
|
||||
displayName: publish test results
|
||||
|
|
|
|||
|
|
@ -3,12 +3,7 @@ trigger:
|
|||
branches:
|
||||
include: [master]
|
||||
paths:
|
||||
include:
|
||||
[
|
||||
docker-compose/docker-compose.yml,
|
||||
docker-compose/docker-compose.prod.yml,
|
||||
docker-compose/archival-api.env
|
||||
]
|
||||
include: [docker-compose/docker-compose.yml]
|
||||
|
||||
pr: none
|
||||
|
||||
|
|
@ -20,19 +15,16 @@ steps:
|
|||
fetchDepth: 5
|
||||
|
||||
- task: CopyFiles@2
|
||||
displayName: stage files
|
||||
displayName: stage docker-compose files
|
||||
inputs:
|
||||
SourceFolder: $(Build.SourcesDirectory)/docker-compose
|
||||
Contents: |
|
||||
docker-compose.yml
|
||||
docker-compose.prod.yml
|
||||
docker-compose/docker-compose.yml
|
||||
docker-compose/docker-compose.prod.yml
|
||||
TargetFolder: $(Build.ArtifactStagingDirectory)
|
||||
CleanTargetFolder: true
|
||||
OverWrite: true
|
||||
condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
|
||||
|
||||
- task: PublishBuildArtifacts@1
|
||||
displayName: publish files
|
||||
displayName: publish docker-compose files
|
||||
inputs:
|
||||
PathtoPublish: $(Build.ArtifactStagingDirectory)
|
||||
ArtifactName: drop
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ trigger:
|
|||
include:
|
||||
[
|
||||
web/*,
|
||||
docker-compose/docker-compose.yml,
|
||||
docker-compose/docker-compose.prod.yml,
|
||||
docker-compose/docker-compose.prod.build.yml,
|
||||
]
|
||||
|
||||
pr:
|
||||
|
|
@ -18,17 +18,13 @@ pr:
|
|||
include:
|
||||
[
|
||||
web/*,
|
||||
docker-compose/docker-compose.yml,
|
||||
docker-compose/docker-compose.prod.yml,
|
||||
docker-compose/docker-compose.prod.build.yml,
|
||||
]
|
||||
|
||||
pool:
|
||||
vmImage: ubuntu-latest
|
||||
|
||||
variables:
|
||||
COMPOSE_DOCKER_CLI_BUILD: 1
|
||||
DOCKER_BUILDKIT: 1
|
||||
|
||||
steps:
|
||||
- checkout: self
|
||||
fetchDepth: 5
|
||||
|
|
@ -44,7 +40,8 @@ steps:
|
|||
tags: |
|
||||
latest
|
||||
$(Build.BuildId)
|
||||
addPipelineData: false
|
||||
env:
|
||||
DOCKER_BUILDKIT: 1
|
||||
|
||||
- task: Docker@2
|
||||
displayName: push
|
||||
|
|
@ -55,18 +52,17 @@ steps:
|
|||
tags: |
|
||||
latest
|
||||
$(Build.BuildId)
|
||||
env:
|
||||
DOCKER_BUILDKIT: 1
|
||||
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
|
||||
|
||||
- task: CopyFiles@2
|
||||
displayName: stage docker-compose files
|
||||
inputs:
|
||||
SourceFolder: $(Build.SourcesDirectory)/docker-compose
|
||||
Contents: |
|
||||
docker-compose.yml
|
||||
docker-compose.prod.yml
|
||||
docker-compose/docker-compose.yml
|
||||
docker-compose/docker-compose.prod.yml
|
||||
TargetFolder: $(Build.ArtifactStagingDirectory)
|
||||
CleanTargetFolder: true
|
||||
OverWrite: true
|
||||
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
|
||||
|
||||
- task: PublishBuildArtifacts@1
|
||||
|
|
|
|||
Loading…
Reference in a new issue