build: update to use origin/main

This commit is contained in:
Frédéric Péters 2020-12-26 15:21:15 +01:00
parent 65f1c28ea1
commit efddaf617a
2 changed files with 4 additions and 4 deletions

4
Jenkinsfile vendored
View File

@ -1,4 +1,4 @@
@Library('eo-jenkins-lib@master') import eo.Utils
@Library('eo-jenkins-lib@main') import eo.Utils
pipeline {
agent any
@ -38,7 +38,7 @@ PGPORT=`python -c 'import struct; import socket; s=socket.socket(); s.setsockopt
stage('Packaging') {
steps {
script {
if (env.JOB_NAME == 'authentic2-auth-kerberos' && (!env.GIT_BRANCH || env.GIT_BRANCH != 'origin/master')) {
if (env.JOB_NAME == 'authentic2-auth-kerberos' && (!env.GIT_BRANCH || env.GIT_BRANCH != 'origin/main')) {
sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder authentic2-auth-kerberos'
}
}

View File

@ -32,7 +32,7 @@ passenv=
PGPASSWORD
usedevelop = true
deps =
https://git.entrouvert.org/authentic.git/snapshot/authentic-master.tar.gz
https://git.entrouvert.org/authentic.git/snapshot/authentic-main.tar.gz
# dependency constraints for authentic
py2: django-appconf<1.0.4
py2: django-filter<2
@ -63,7 +63,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