From 40b54229312884121551d8cd9eef75d7cbecd76a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sat, 26 Dec 2020 15:21:15 +0100 Subject: [PATCH] build: update to use origin/main --- Jenkinsfile | 4 ++-- tox.ini | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 95047f8..3a003c3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -@Library('eo-jenkins-lib@master') import eo.Utils +@Library('eo-jenkins-lib@main') import eo.Utils pipeline { agent any @@ -30,7 +30,7 @@ PGPORT=`python -c 'import struct; import socket; s=socket.socket(); s.setsockopt stage('Packaging') { steps { script { - if (env.JOB_NAME == 'authentic2-cut' && env.GIT_BRANCH == 'origin/master') { + if (env.JOB_NAME == 'authentic2-cut' && env.GIT_BRANCH == 'origin/main') { sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder authentic2-cut' } } diff --git a/tox.ini b/tox.ini index 3041578..aedb432 100644 --- a/tox.ini +++ b/tox.ini @@ -32,7 +32,7 @@ passenv= PGPASSWORD usedevelop = true deps = - !local: https://git.entrouvert.org/authentic.git/snapshot/authentic-master.tar.gz + !local: https://git.entrouvert.org/authentic.git/snapshot/authentic-main.tar.gz local: ../authentic2 # dependency constraints for authentic py3: file-magic @@ -62,7 +62,7 @@ commands = usedevelop = true basepython = python2.7 deps = - https://git.entrouvert.org/authentic.git/snapshot/authentic-master.tar.gz + https://git.entrouvert.org/authentic.git/snapshot/authentic-main.tar.gz Django<2.3 pylint<1.8 pylint-django<0.8.1