entrouvert
/
passerelle-atreal-openads
Archived
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:16 +01:00
parent a6b22e6b40
commit a76678bfcf
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

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@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"

4
tox.ini
View File

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