Commit 609456d5 authored by Thomas Boni's avatar Thomas Boni
Browse files

Merge branch 'latest' into '32-create-contributing-guidelines' 

# Conflicts:
#   .gitlab-ci.yml
parents 1613b03f 5e3aca7e

.gitignore

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ site/ 
docs/jobs/**/*.md

docs/images/jobs

**/.DS_Store

.idea
 
 No newline at end of file

.gitlab-ci.yml

+18 −8
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ stages: 
  - deploy



include:

  - remote: 'https://jobs.r2devops.io/links_checker.yml?scope=0.yml'

  - remote: 'https://jobs.r2devops.io/spell_check.yml?scope=0.yml'

  - remote: 'https://jobs.r2devops.io/0.1.0/links_checker.yml?scope=0.yml'

  - remote: 'https://jobs.r2devops.io/0.1.0/spell_check.yml?scope=0.yml'

  - remote: 'https://jobs.r2devops.io/1.4.0/mkdocs.yml?scope=0.yml'

  - remote: 'https://jobs.r2devops.io/0.3.0/pages.yml?scope=0.yml'
@@ -45,6 +45,7 @@ job_structure: 
  variables:

    PIPENV_PIPFILE: tools/job_structure/Pipfile

    JOB_LOGFILE: "job_structure.log"

    PYTHONPATH: "./:$PYTHONPATH"

  before_script:

    - pip install --ignore-installed distlib pipenv

    - pipenv install
@@ -62,6 +63,7 @@ job_customs: 
  variables:

    PIPENV_PIPFILE: tools/job_customs/Pipfile

    JOB_LOGFILE: "job_customs.log"

    PYTHONPATH: "./:$PYTHONPATH"

  before_script:

    - pip install --ignore-installed distlib pipenv

    - pipenv install
@@ -83,6 +85,7 @@ job_image_scan: 
    PIPENV_PIPFILE: tools/job_image/Pipfile

    JOB_LOGFILE: "job_image.log"

    OUTPUT_DIR: "scan_output"

    PYTHONPATH: "./:$PYTHONPATH"



    TRIVY_EXIT_ON_SEVERITY: ""

    TRIVY_SEVERITY: "LOW,MEDIUM,HIGH,CRITICAL"
@@ -146,32 +149,39 @@ job_image_scan: 
    expire_in: 30 days

    when: always



links_checker:

  variables:

    LICHE_EXCLUDE: "^[^http]"

    FAIL_ON_BROKEN: "true"

  allow_failure: true



# See https://docs.gitlab.com/ee/api/labels.html

job_labels:

job_gitlab_labels:

  image: python:3.9.1-alpine

  stage: project_setup

  variables:

    PIPENV_PIPFILE: tools/job_labels/Pipfile

    JOB_LOGFILE: "job_labels.log"

    PIPENV_PIPFILE: tools/job_gitlab_labels/Pipfile

    JOB_LOGFILE: "job_gitlab_labels.log"

    PYTHONPATH: "./:$PYTHONPATH"

  before_script:

    - pip install --ignore-installed distlib pipenv

    - pipenv install

  script:

    - pipenv run python3 tools/job_labels/job_labels.py

    - pipenv run python3 tools/job_gitlab_labels/job_gitlab_labels.py

  artifacts:

    expose_as: "job_labels"

    expose_as: "job_gitlab_labels"

    paths:

      - ${JOB_LOGFILE}

    expire_in: 30 days

    when: always

  rules:

    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_PATH_SLUG == "r2devops/hub"'

    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_PATH_SLUG == "r2devops-hub"'





mkdocs:

  variables:

    PIPENV_PIPFILE: tools/builder/Pipfile

    PYTHONPATH: "./:$PYTHONPATH"

  before_script:

    - pip install pipenv && pipenv install

    - pipenv run python tools/builder/builder.py

docs/css/extra.css

+23 −6
Original line number Diff line number Diff line
@@ -215,11 +215,6 @@ 
    border-color: var(--md-primary-bg-color);

}



.z-index-1000{

  z-index: 1000;

}





.border-radius-10{

  border-radius: 10px !important;

}
@@ -241,7 +236,6 @@ button.md-button-center { 
    display:block !important;

    margin:0 auto !important;

    padding-bottom:1em !important;

    padding-top:0.8em !important

    padding-top:0.8em !important;

}
@@ -303,3 +297,26 @@ opacity: .8; 
  width: 11em;

  box-shadow: 8px 8px 12px #aaa;

}



.label{

  display: inline-flex;

  border-radius: 5px;

  background-color: #00B1D2;

  margin-right: 0.1rem;

  padding: 0.0rem 0.4rem 0.0rem 0.4rem;

  margin-bottom:0.4rem;

  opacity: 1;

  color:white;



}

.label > a{

  color:white;

  cursor: pointer;

}

.labels_zone{

  font-size:0.6rem;

}



.md-header {

    z-index: 3;

}

docs/css/juxtapose/juxtapose.css

+4 −4
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ div.jx-handle { 
	height: 100%;

	width: 40px;

	cursor: col-resize;

	z-index: 15;

	z-index: 2;

	margin-left: -20px;

}
@@ -163,7 +163,7 @@ div.jx-image { 


div.jx-image img {

	height: 100%;

	z-index: 3;

	z-index: 1;

	position: absolute;



	max-height: none;
@@ -225,7 +225,7 @@ div.jx-image div.jx-label { 
	background-color: #000; /* IE 8 */

	background-color: rgba(0,0,0,.7);

	color: white;

	z-index: 10;

	z-index: 2;

	white-space: nowrap;

	line-height: 18px;

	vertical-align: middle;
@@ -293,7 +293,7 @@ a.jx-knightlab { 
	position: absolute;

	right: 0;

	text-decoration: none;

	z-index: 10;

	z-index: 2;

}



a.jx-knightlab div.knightlab-logo {

docs/images/jobs/spell_check/screenshots/spell_check-pipeline.png

0 → 100644
+15.9 KiB
Loading image diff...