Commit abf5b40a authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Restore options within split rendering test pipeline to avoid conflicts on checkout.

parent f601d4e2
Loading
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -623,6 +623,7 @@ split-rendering-pytest-on-merge-request:
    - mv IVAS_rend IVAS_rend_ref

    # back to source branch
    - git restore lib_com/options.h # Revert changes back before checking out another branch to avoid conflicts
    - git checkout $source_branch_commit_sha
    - make clean
    - *enable-split-rendering