From 153c136804f87960eb4b4a74f8b8cd4339be52ac 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 e25ff1a..ba2a5aa 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 @@ -19,7 +19,7 @@ pipeline { stage('Packaging') { steps { script { - if (env.JOB_NAME == 'combo-plugin-gnm' && env.GIT_BRANCH == 'origin/master') { + if (env.JOB_NAME == 'combo-plugin-gnm' && env.GIT_BRANCH == 'origin/main') { sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder combo-plugin-gnm' } else if (env.GIT_BRANCH.startsWith('hotfix/')) { sh "sudo -H -u eobuilder /usr/local/bin/eobuilder --branch ${env.GIT_BRANCH} --hotfix combo-plugin-gnm" diff --git a/tox.ini b/tox.ini index fb84924..9799e10 100644 --- a/tox.ini +++ b/tox.ini @@ -26,7 +26,7 @@ deps = vobject django-ratelimit<3 django>=2.2,<2.3 - https://git.entrouvert.org/debian/django-ckeditor.git/snapshot/django-ckeditor-master.tar.gz - https://git.entrouvert.org/combo.git/snapshot/combo-master.tar.gz + https://git.entrouvert.org/debian/django-ckeditor.git/snapshot/django-ckeditor-main.tar.gz + https://git.entrouvert.org/combo.git/snapshot/combo-main.tar.gz commands = py.test {posargs: {env:JUNIT:} {env:COVERAGE:} tests/}