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

Merge branch 'develop' into 'master' 

Develop

See merge request !87
parents d1e874b6 0dbbf4b7
No related branches found
No related tags found
3 merge requests!153merge back master to develop,!124White theme only for git trilogy part 1,!87Develop
Pipeline #29649 passed
Stage: retrieve
    Stage: generate
      Stage: build
        Stage: deploy
          Hide whitespace changes
          Inline Side-by-side
          .ci/deploy.sh
          + 1
          − 1
          View file @ 90d91bac
          ...@@ -7,6 +7,7 @@ echo $rootDir ...@@ -7,6 +7,7 @@ echo $rootDir
          # clean previous builds # clean previous builds
          rm -rf $rootDir/public rm -rf $rootDir/public
          rm -rf $rootDir/theme
          mkdir $rootDir/public mkdir $rootDir/public
          if [[ $CI_COMMIT_BRANCH == "develop" ]]; then if [[ $CI_COMMIT_BRANCH == "develop" ]]; then
          ...@@ -19,7 +20,6 @@ fi ...@@ -19,7 +20,6 @@ fi
          # build the unstable version - can be optimized # build the unstable version - can be optimized
          git submodule update --init --recursive git submodule update --init --recursive
          git submodule foreach --recursive git reset --hard
          # add matomo # add matomo
          sed -i "/matomohead/r./.ci/analytics/head.html" theme/templates/_index.html sed -i "/matomohead/r./.ci/analytics/head.html" theme/templates/_index.html
          ......
          .gitlab-ci.yml
          + 2
          − 0
          View file @ 90d91bac
          ...@@ -61,6 +61,8 @@ build:courses: ...@@ -61,6 +61,8 @@ build:courses:
          rules: rules:
          - if: $CI_COMMIT_BRANCH == "develop" - if: $CI_COMMIT_BRANCH == "develop"
          - if: $CI_COMMIT_BRANCH == "master" - if: $CI_COMMIT_BRANCH == "master"
          before_script:
          - git submodule update --init --recursive
          script: script:
          - bash .ci/deploy.sh - bash .ci/deploy.sh
          artifacts: 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