entrouvert
/
combo-plugin-gnm
17
0
Fork 0
Code Issues Pull Requests Releases Activity

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 1b523bc8c0
commit 153c136804
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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
@ -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"

4
tox.ini
View File

@ -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/}