Commit 4aeb80e8 authored by William Wadsworth's avatar William Wadsworth
Browse files

even out ci build times 

Re-order render and ci so that build times of different parts are more even
parent 3ef01cca

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ gltf_1: 
      - pip install scad2gltf

      - cd rendering

      - scad2gltf complete_microscope_rms.scad

      - scad2gltf complete_microscope_low_cost.scad

      - scad2gltf complete_microscope_manual.scad

      - cp complete_microscope_*.glb ../docs/gltf/



    artifacts:
@@ -350,7 +350,7 @@ gltf_2: 
      - pip install scad2gltf

      - cd rendering

      - scad2gltf complete_microscope_upright.scad

      - scad2gltf complete_microscope_manual.scad

      - scad2gltf complete_microscope_low_cost.scad

      - cp complete_microscope_*.glb ../docs/gltf/



    artifacts:

render.py

+4 −4
Original line number Diff line number Diff line
@@ -869,25 +869,25 @@ def main(): 
        register_optics_assembled(rendersystem)

        register_band(rendersystem)

        register_actuator_visualisation(rendersystem)

    if run_all or args.png_2_only:

        #Register openscad renders (and associated post processing)

        register_brim_and_ties(rendersystem)

        register_brim_and_ties_separate_z_actuator(rendersystem)

        register_prepare_separate_z_actuator(rendersystem)

        register_prepare_upright_z_mount(rendersystem)

        register_prepare_nut_trap_test(rendersystem)

        register_prepare_main_body(rendersystem)

    if run_all or args.png_2_only:

        #Register openscad renders (and associated post processing)

        register_prepare_stand(rendersystem)

        register_actuator_assembly(rendersystem)

        register_band_tool_assembly(rendersystem)

    if run_all or args.png_3_only:

        #Register openscad renders (and associated post processing)

        register_picam(rendersystem)

        register_mount_optics(rendersystem)

        register_mount_upright_optics(rendersystem)

        register_mount_microscope(rendersystem)

        register_mount_illumination(rendersystem)

        register_check_actuator_centre(rendersystem)

    if run_all or args.png_3_only:

        #Register openscad renders (and associated post processing)

        register_motor_assembly(rendersystem)

        register_mount_motors(rendersystem)

        register_mount_sample_clips(rendersystem)