aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Leon Sandøy <[email protected]>2018-11-18 01:19:35 +0100
committerGravatar Leon Sandøy <[email protected]>2018-11-18 01:19:35 +0100
commita27004cd49137cda0051ee97ab7189967fd5eacf (patch)
treedbc17bd7bcee3ce77f25816f3aa069a31c5248a0
parentpipe that pepper output to stdout (diff)
Oops, I think this should fix the pipeline.
-rw-r--r--azure-pipelines.yml12
-rwxr-xr-xscripts/deploy-azure.sh2
2 files changed, 10 insertions, 4 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 772655ac..0ae6ab20 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -35,9 +35,6 @@ jobs:
- script: sudo pip install pipenv
displayName: 'Install pipenv'
- - script: sudo pip install salt-pepper
- displayName: 'Install saltstack'
-
- script: pipenv install --dev --deploy --system
displayName: 'Install project using pipenv'
@@ -57,6 +54,15 @@ jobs:
dockerRegistryEndpoint: 'DockerHub'
command: 'login'
+ - task: UsePythonVersion@0
+ displayName: 'Set Python version'
+ inputs:
+ versionSpec: '3.7.x'
+ addToPath: true
+
+ - script: sudo pip install salt-pepper
+ displayName: 'Install saltstack'
+
- task: ShellScript@2
displayName: 'Build and deploy containers'
diff --git a/scripts/deploy-azure.sh b/scripts/deploy-azure.sh
index 5a7f895e..c11b6afa 100755
--- a/scripts/deploy-azure.sh
+++ b/scripts/deploy-azure.sh
@@ -11,7 +11,7 @@ if [[ ($BUILD_SOURCEBRANCHNAME == 'master') && ($SYSTEM_PULLREQUEST_PULLREQUESTI
docker push pythondiscord/seasonalbot:latest
echo "Deploying on server"
- pepper $1 state.apply docker/hacktoberbot --out=no_out --non-interactive
+ pepper $1 state.apply docker/hacktoberbot --out=no_out --non-interactive &> /dev/null
else
echo "Skipping deploy"
fi