From ebb4090212d5ae1f90427072361438650dd6d99d 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 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fb57132..dd6b2a7 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 @@ -21,7 +21,7 @@ pipeline { stage('Packaging') { steps { script { - if (env.JOB_NAME == 'corbo' && env.GIT_BRANCH == 'origin/master') { + if (env.JOB_NAME == 'corbo' && env.GIT_BRANCH == 'origin/main') { sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder corbo' } else if (env.GIT_BRANCH.startsWith('hotfix/')) { sh "sudo -H -u eobuilder /usr/local/bin/eobuilder --branch ${env.GIT_BRANCH} --hotfix corbo" diff --git a/tox.ini b/tox.ini index 1ae8edb..f7d6769 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,7 @@ setenv = deps = django111: django>=1.11,<1.12 django22: django>=2.2,<2.3 - django111: https://git.entrouvert.org/hobo.git/snapshot/hobo-master.tar.gz + django111: https://git.entrouvert.org/hobo.git/snapshot/hobo-main.tar.gz pytest-cov pytest-django pytest