Skip to content
Snippets Groups Projects
Commit ab19c5d9 authored by Laurent Heirendt's avatar Laurent Heirendt :airplane:
Browse files

Merge branch 'develop' into 'master' 

Develop

See merge request R3/school/courses!86
parents 0802195f 51b99cbf
No related branches found
No related tags found
3 merge requests!153merge back master to develop,!124White theme only for git trilogy part 1,!86Develop
Pipeline #29641 passed
Stage: retrieve
    Stage: generate
      Stage: build
        Stage: deploy
          Hide whitespace changes
          Inline Side-by-side
          .ci/deploy.sh
          + 4
          − 0
          View file @ ab19c5d9
          ......@@ -17,6 +17,10 @@ else
          version="unstable";
          fi
          # build the unstable version - can be optimized
          git submodule foreach --recursive git reset --hard
          git submodule update --init --recursive
          # add matomo
          sed -i "/matomohead/r./.ci/analytics/head.html" theme/templates/_index.html
          sed -i "/matomopolicy/r./.ci/analytics/policy.html" theme/templates/_index.html
          ......
          .gitlab-ci.yml
          + 0
          − 2
          View file @ ab19c5d9
          ......@@ -61,8 +61,6 @@ build:courses:
          rules:
          - if: $CI_COMMIT_BRANCH == "develop"
          - if: $CI_COMMIT_BRANCH == "master"
          before_script:
          - git submodule update --recursive --init
          script:
          - bash .ci/deploy.sh
          artifacts:
          ......
          0% or .
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment