Commit fd6dbaa6 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

some projects don't like ccache

parent 1de00f1c
Pipeline #10573 passed with stage
in 9 minutes and 50 seconds
# Generated by Django 3.0.9 on 2020-08-05 22:27
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('rainboard', '0048_namespace_from_gepetto'),
]
operations = [
migrations.AddField(
model_name='project',
name='ccache',
field=models.BooleanField(default=True),
),
]
...@@ -3,8 +3,6 @@ import logging ...@@ -3,8 +3,6 @@ import logging
import re import re
from subprocess import check_output from subprocess import check_output
import git
import requests
from django.conf import settings from django.conf import settings
from django.db import models from django.db import models
from django.db.models import Q from django.db.models import Q
...@@ -14,6 +12,9 @@ from django.utils import timezone ...@@ -14,6 +12,9 @@ from django.utils import timezone
from django.utils.dateparse import parse_datetime from django.utils.dateparse import parse_datetime
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
import requests
import git
from autoslug import AutoSlugField from autoslug import AutoSlugField
from autoslug.utils import slugify from autoslug.utils import slugify
from github import Github from github import Github
...@@ -207,6 +208,7 @@ class Project(Links, NamedModel, TimeStampedModel): ...@@ -207,6 +208,7 @@ class Project(Links, NamedModel, TimeStampedModel):
allow_format_failure = models.BooleanField(default=True) allow_format_failure = models.BooleanField(default=True)
has_python = models.BooleanField(default=True) has_python = models.BooleanField(default=True)
accept_pr_to_master = models.BooleanField(default=False) accept_pr_to_master = models.BooleanField(default=False)
ccache = models.BooleanField(default=True)
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
self.name = valid_name(self.name) self.name = valid_name(self.name)
...@@ -1253,7 +1255,7 @@ def to_release_in_robotpkg(): ...@@ -1253,7 +1255,7 @@ def to_release_in_robotpkg():
def ordered_projects(): def ordered_projects():
""" helper for gepetto/buildfarm/generate_all.py """ """ helper for gepetto/buildfarm/generate_all.py """
fields = 'category', 'name', 'project__main_namespace__slug' fields = 'category', 'name', 'project__main_namespace__slug', 'project__ccache'
bad_ones = Q(main_namespace__from_gepetto=False) | Q(robotpkg__isnull=True) | Q(archived=True) bad_ones = Q(main_namespace__from_gepetto=False) | Q(robotpkg__isnull=True) | Q(archived=True)
library_bad_ones = Q(library__main_namespace__from_gepetto=False) | Q(library__robotpkg__isnull=True) library_bad_ones = Q(library__main_namespace__from_gepetto=False) | Q(library__robotpkg__isnull=True)
...@@ -1290,4 +1292,4 @@ def ordered_projects(): ...@@ -1290,4 +1292,4 @@ def ordered_projects():
deps.append(pkg[3:]) deps.append(pkg[3:])
return sorted(set(deps)) return sorted(set(deps))
return [[cat, pkg, ns, get_deps(cat, pkg, ns, lst)] for cat, pkg, ns in lst] return [[cat, pkg, ns, get_deps(cat, pkg, ns, lst), ccache] for cat, pkg, ns, ccache in lst]
# https://rainboard.laas.fr/project/{{ project.slug }}/.gitlab-ci.yml # https://rainboard.laas.fr/project/{{ project.slug }}/.gitlab-ci.yml
variables: {% if project.ccache %}variables:
CCACHE_BASEDIR: "${CI_PROJECT_DIR}" CCACHE_BASEDIR: "${CI_PROJECT_DIR}"
cache: cache:
paths: paths:
- ccache - ccache
{% endif %}
{% for robotpkg in project.ordered_robotpkg %}.robotpkg-{{ robotpkg }}: &robotpkg-{{ robotpkg }} {% for robotpkg in project.ordered_robotpkg %}.robotpkg-{{ robotpkg }}: &robotpkg-{{ robotpkg }}
retry: retry:
...@@ -14,9 +15,9 @@ cache: ...@@ -14,9 +15,9 @@ cache:
except: except:
- gh-pages - gh-pages
script: script:
- mkdir -p ccache {% if project.ccache %} - mkdir -p ccache
- echo "CCACHE_DIR=${CI_PROJECT_DIR}/ccache" >> /opt/openrobots/etc/robotpkg.conf - echo "CCACHE_DIR=${CI_PROJECT_DIR}/ccache" >> /opt/openrobots/etc/robotpkg.conf
{% endif %}
- cd /root/robotpkg/{{ robotpkg.category }} - cd /root/robotpkg/{{ robotpkg.category }}
- git pull - git pull
{% if robotpkg.without_py %} - cd {{ robotpkg.without_py }} {% if robotpkg.without_py %} - cd {{ robotpkg.without_py }}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment