Commit 658088e0 authored by William Wadsworth's avatar William Wadsworth
Browse files

compact ci gltf jobs

parent d7d829b4

.gitlab-ci.yml

+17 −23
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_job:

.render-job:

    extends:

      - .scad-job

      - .rules_common
@@ -275,21 +275,21 @@ prebuild-for-render: 


render_1:

    extends:

      - .render_job

      - .render-job



    script:

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



render_2:

    extends:

      - .render_job

      - .render-job



    script:

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



render_3:

    extends:

      - .render_job

      - .render-job



    script:

      - xvfb-run --auto-servernum --server-args "-screen 0 1024x768x24" ./render.py --force-clean --png-3-only
@@ -297,7 +297,7 @@ render_3: 


# compose GLB 3D models of complete microscopes

# split into two groups running in parallel

gltf_1:

.gltf-job:

    extends:

      - .scad-job

      - .rules_common
@@ -305,6 +305,17 @@ gltf_1: 
    dependencies: ["prebuild-for-render", "version"]

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



    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/gltf/*



gltf_1:

    extends:

      - .gltf-job



    script:

      - mkdir -p docs/gltf

      - pip install scad2gltf
@@ -313,20 +324,9 @@ gltf_1: 
      - scad2gltf complete_microscope_manual.scad

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



    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/gltf/*



gltf_2:

    extends:

      - .scad-job

      - .rules_common

    stage: build

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

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

      - .gltf-job



    script:

      - mkdir -p docs/gltf
@@ -336,12 +336,6 @@ gltf_2: 
      - scad2gltf complete_microscope_low_cost.scad

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



    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/gltf/*



# Build docs- this is at a later stage so it has access to the models

build-docs: