Commit 78fb809e authored by Ruben ten Hove's avatar Ruben ten Hove
Browse files

Merge branch 'main' into 'rhtenhove-main-patch-36831' 

# Conflicts:
#   tbump.toml
parents 8df6d1f6 f912a641

.gitlab-ci.yml

+1 −2
Original line number Diff line number Diff line
@@ -2,11 +2,10 @@ 
# CI of ci/templates itself



variables:

  SCHEDULE_PIPELINE_PROJECT_IDS: "30771297 30771293 30771284 30771254 30771239"

  SCHEDULE_PIPELINE_PROJECT_IDS: 30771297 30771293 30771284 30771254 30771239



include:

  - local: pipelines/project-automation.yml

  - local: pipelines/workflow.yml

  - local: yaml/yamllint.yml

  - local: project-automation/pipeline-scheduler.yml

  - local: project-automation/pages-hugo.yml

.releaserc

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
    "@semantic-release/release-notes-generator",

    "@semantic-release/gitlab",

    ["@semantic-release/git", {

      "assets": ["README.md", "tbump.toml"]

      "assets": ["README.md", "tbump.toml", "pipelines/container.md", "python/*.yml"]

    }]

  ],

  "branches": [

README.md

+3 −3
Original line number Diff line number Diff line 
# Just CI templates v6.0.0

# Just CI templates v6.0.1



Maintainers:
@@ -81,7 +81,7 @@ is an example `.gitlab-ci.yml` importing the python template: 
include:

  - project: just-ci/templates

    file: templates/python.yml

    ref: v6.0.0

    ref: v6.0.1

```



The above is a template for Python projects. Other templates can be found in
@@ -102,7 +102,7 @@ you want you can always disable specific jobs with custom rules. 
include:

  - project: just-ci/templates

    file: templates/python.yml

    ref: v6.0.0

    ref: v6.0.1



python:pytest:

  rules:

pipelines/c.yml

+1 −0
Original line number Diff line number Diff line 
---

include:

  - local: project-automation/workflow.yml

  - local: "python/flawfinder.yml"

  - local: "c/cppcheck.yml"

pipelines/container.md

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ monorepo_root 
include:

  - project: just-ci/templates

    file: templates/container.yml

    ref: v5.6.1

    ref: v6.0.1



image:build:subdir_b:

  extends: .image:build
@@ -56,7 +56,7 @@ subsequent `Dockerfile`, you need to create jobs which extend `.kaniko` and 
include:

  - project: just-ci/templates

    file: templates/container.yml

    ref: v5.6.1

    ref: v6.0.1



variables:

  IMAGE_CONTEXT: subdir_a
@@ -85,7 +85,7 @@ builder template. For example: 
include:

  - project: just-ci/templates

    file: templates/container.yml

    ref: v5.6.1

    ref: v6.0.1



.image:build:

  extends: .buildah # All build jobs will now use buildah