Commit d7d829b4 authored by William Wadsworth's avatar William Wadsworth
Browse files

compact ci render jobs

parent 4aeb80e8

.gitlab-ci.yml

+10 −27
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ prebuild-for-render: 


# render assemblies - uses xvfb as a virtual x-server

# Split into three groups running in parallel

render_1:

.render_job:

    extends:

      - .scad-job

      - .rules_common
@@ -266,9 +266,6 @@ render_1: 
    dependencies: ["prebuild-for-render", "version"]

    needs: ["prebuild-for-render", "version"]



    script:

      - xvfb-run --auto-servernum --server-args "-screen 0 1024x768x24" ./render.py --force-clean --png-1-only



    artifacts:

      expire_in: 1 week

      name: "${CI_PROJECT_NAME}-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}-renders"
@@ -276,41 +273,27 @@ render_1: 
      paths:

        - docs/renders/*.png



render_1:

    extends:

      - .render_job



    script:

      - xvfb-run --auto-servernum --server-args "-screen 0 1024x768x24" ./render.py --force-clean --png-1-only



render_2:

    extends:

      - .scad-job

      - .rules_common

    stage: build

    dependencies: ["prebuild-for-render", "version"]

    needs: ["prebuild-for-render", "version"]

      - .render_job



    script:

      - xvfb-run --auto-servernum --server-args "-screen 0 1024x768x24" ./render.py --force-clean --png-2-only



    artifacts:

      expire_in: 1 week

      name: "${CI_PROJECT_NAME}-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}-renders"

      # saving any rendering csg files. Only remaining files should be when scad2gltf fails

      paths:

        - docs/renders/*.png



render_3:

    extends:

      - .scad-job

      - .rules_common

    stage: build

    dependencies: ["prebuild-for-render", "version"]

    needs: ["prebuild-for-render", "version"]

      - .render_job



    script:

      - xvfb-run --auto-servernum --server-args "-screen 0 1024x768x24" ./render.py --force-clean --png-3-only



    artifacts:

      expire_in: 1 week

      name: "${CI_PROJECT_NAME}-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}-renders"

      # saving any rendering csg files. Only remaining files should be when scad2gltf fails

      paths:

        - docs/renders/*.png



# compose GLB 3D models of complete microscopes

# split into two groups running in parallel