Skip to content
Extraits de code Groupes Projets
Valider 19b39c64 rédigé par Rémi - Le Filament's avatar Rémi - Le Filament
Parcourir les fichiers

[FIX] get fix from PR iso extra remote

parent 0ea3ef7e
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -46,9 +46,8 @@ RUN set -x; \ ...@@ -46,9 +46,8 @@ RUN set -x; \
&& git clone --filter=tree:0 --branch "${branch}" "${repo}" /tmp/repo \ && git clone --filter=tree:0 --branch "${branch}" "${repo}" /tmp/repo \
&& commit="$(git -C /tmp/repo rev-parse HEAD)" \ && commit="$(git -C /tmp/repo rev-parse HEAD)" \
# FIX begin: Merge pull request https://github.com/OCA/OCB/pull/1234 # FIX begin: Merge pull request https://github.com/OCA/OCB/pull/1234
&& git -C /tmp/repo remote add odoolf https://github.com/lefilament/odoo \ && git -C /tmp/repo fetch origin pull/1234/head:14.0-fix-crm_lead-email \
&& git -C /tmp/repo fetch odoolf 14.0-fix-crm_lead-email \ && git -C /tmp/repo checkout 14.0-fix-crm_lead-email \
&& git -C /tmp/repo checkout odoolf/14.0-fix-crm_lead-email \
&& git -C /tmp/repo rebase origin/${branch} \ && git -C /tmp/repo rebase origin/${branch} \
# FIX end # FIX end
&& mv /tmp/repo/* /opt/odoo/odoo/ \ && mv /tmp/repo/* /opt/odoo/odoo/ \
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter