Skip to content

Commit

Permalink
Merge branch 'feature/mkdocs_material' into 'master'
Browse files Browse the repository at this point in the history
Project documentation in Mkdocs

See merge request caimira/caimira!517
  • Loading branch information
lrdossan committed Nov 20, 2024
2 parents 424f4f4 + a34efca commit 6b96d7c
Show file tree
Hide file tree
Showing 56 changed files with 1,954 additions and 2,459 deletions.
32 changes: 32 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ test-cern-caimira-py39:

.test_openshift_config:
stage: test
allow_failure: true
image: registry.cern.ch/docker.io/mambaorg/micromamba
before_script:
- micromamba create --yes -p $HOME/env python=3.9 ruamel.yaml wget -c conda-forge
Expand Down Expand Up @@ -139,6 +140,13 @@ check_openshift_config_prod:
DOCKER_CONTEXT_DIRECTORY: ""
extends: .docker-build

.docker-build-docs:
variables:
IMAGE_NAME: caimira-docs
DOCKERFILE_DIRECTORY: "caimira/docs"
DOCKER_CONTEXT_DIRECTORY: "caimira"
extends: .docker-build

# on push to live/caimira-test
.docker-build-test:
variables:
Expand All @@ -158,6 +166,14 @@ docker-build-calculator-app-test:
rules:
- if: $CI_COMMIT_BRANCH == "live/caimira-test"

docker-build-docs-test:
extends:
- .docker-build-docs
variables:
IMAGE_TAG: caimira-test-docs-latest
rules:
- if: $CI_COMMIT_BRANCH == "live/caimira-test"

# on release
.docker-build-release:
before_script:
Expand All @@ -179,6 +195,15 @@ docker-build-calculator-app-release:
rules:
- if: $CI_COMMIT_TAG

docker-build-docs-release:
extends:
- .docker-build-release
- .docker-build-docs
variables:
IMAGE_TAG: caimira-docs-latest
rules:
- if: $CI_COMMIT_TAG

# ###################################################################################################
# Deploy to OpenShift
.deploy:
Expand Down Expand Up @@ -217,3 +242,10 @@ deploy-calculator-open-app-test:
IMAGE_NAME: calculator-app
OPENSHIFT_DEPLOYMENT: calculator-open-app
OPENSHIFT_CONTAINER_NAME: calculator-open-app

deploy-docs-test:
extends: .deploy
variables:
IMAGE_NAME: caimira-docs
OPENSHIFT_DEPLOYMENT: caimira-test-docs
OPENSHIFT_CONTAINER_NAME: caimira-test-docs
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# 4.17.5 (November 20, 2024)

## Features Added
- Mkdocs documentation
- Folder layout adapted

## Bug Fixes
- N/A

# 4.17.4 (November 05, 2024)

## Features Added
Expand Down
Loading

0 comments on commit 6b96d7c

Please sign in to comment.