From a76678bfcfd40b758302c3cdca39f49af9225023 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:16 +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 641b9e0..fa40a66 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -@Library('eo-jenkins-lib@master') import eo.Utils +@Library('eo-jenkins-lib@main') import eo.Utils pipeline { agent any @@ -41,7 +41,7 @@ pipeline { stage('Packaging') { steps { script { - if (env.JOB_NAME == 'passerelle-atreal-openads' && env.GIT_BRANCH == 'origin/master') { + if (env.JOB_NAME == 'passerelle-atreal-openads' && env.GIT_BRANCH == 'origin/main') { sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder passerelle-atreal-openads' } else if (env.GIT_BRANCH.startsWith('hotfix/')) { sh "sudo -H -u eobuilder /usr/local/bin/eobuilder --branch ${env.GIT_BRANCH} --hotfix passerelle-atreal-openads" diff --git a/tox.ini b/tox.ini index 2fbf078..ec169a1 100644 --- a/tox.ini +++ b/tox.ini @@ -30,7 +30,7 @@ setenv = coverage: COVERAGE=--cov-report xml --cov-report html --cov=atreal_openads/ junit: JUNIT=--junitxml=junit-{envname}.xml deps = - https://git.entrouvert.org/passerelle.git/snapshot/passerelle-master.tar.gz + https://git.entrouvert.org/passerelle.git/snapshot/passerelle-main.tar.gz pytest-cov pytest-django pytest>=3.3.0 @@ -51,6 +51,6 @@ usedevelop = True setenv = DJANGO_SETTINGS_MODULE=passerelle.settings deps = - https://git.entrouvert.org/passerelle.git/snapshot/passerelle-master.tar.gz + https://git.entrouvert.org/passerelle.git/snapshot/passerelle-main.tar.gz commands = python3 ./manage.py {posargs:--help}