Commit e344f66c authored by Ruben ten Hove's avatar Ruben ten Hove
Browse files

Merge branch 'main' of gitlab.com:just-ci/templates into dasel

parents 65a452a0 aeb60688

.gitlab-ci.yml

+6 −8
Original line number Diff line number Diff line
@@ -2,20 +2,18 @@ 
# CI of ci/templates itself



variables:

  SCHEDULE_PIPELINE_PROJECT_IDS:

    30771297 30771293 30771284 30771254 30771239 30933363

  SCHEDULE_PIPELINE_DESCRIPTION: CI Daily Update

  SCHEDULE_PIPELINE_CRON: 0 10 * * * # Every day at 10:00

  GITLAB_RECOMMENDED_AUTO_FIX: "true"

  # SCHEDULE_PIPELINE_PROJECT_IDS:

  #   30771297 30771293 30771284 30771254 30771239 30933363

  # SCHEDULE_PIPELINE_DESCRIPTION: CI Daily Update

  # SCHEDULE_PIPELINE_CRON: 0 10 * * * # Every day at 10:00

  RELEASE_CHANGELOG: "false"

  FF_SCRIPT_SECTIONS: "true"

  I_DONT_PIN_MY_VERSIONS: because we always test latest here



include:

  - local: pipelines/project-automation.yml

  - local: yaml/yamllint.yml

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

  - local: project-automation/gitlab/py-in-ci.yml

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

  # - local: project-automation/gitlab/py-in-ci.yml

  - local: docs/prettier.yml



# child pipeline to unit tests all our jobs

README.md

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

# Just CI templates v6.28.0



### Maintainers
@@ -83,7 +83,7 @@ is an example `.gitlab-ci.yml` importing the python template: 
```yaml

---

include:

  - remote: https://jobs.just-ci.dev/v6.27.3/templates/python.yml

  - remote: https://jobs.just-ci.dev/v6.28.0/templates/python.yml



variables:

  PYVERSION: 3.9-slim
@@ -111,7 +111,7 @@ you want you can always disable specific jobs with custom rules. 
```yaml

---

include:

  - remote: https://jobs.just-ci.dev/v6.27.3/templates/python.yml

  - remote: https://jobs.just-ci.dev/v6.28.0/templates/python.yml



variables:

  PYVERSION: 3.9-slim

container/readme.md

+4 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ monorepo_root 
include:

  - project: just-ci/templates

    file: templates/container.yml

    ref: v6.27.3

    ref: v6.28.0



image:build:subdir_b:

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

  - project: just-ci/templates

    file: templates/container.yml

    ref: v6.27.3

    ref: v6.28.0



variables:

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

  - project: just-ci/templates

    file: templates/container.yml

    ref: v6.27.3

    ref: v6.28.0



.image:build:

  extends: .buildah # All build jobs will now use buildah
@@ -131,7 +131,7 @@ arm64. 
include:

  - project: just-ci/templates

    file: templates/container.yml

    ref: v6.27.3

    ref: v6.28.0



.image:build:

  extends: .docker

pipelines/project-automation.yml

+8 −0
Original line number Diff line number Diff line
@@ -6,6 +6,14 @@ include: 
  - local: project-automation/semantic-release.yml

  - local: project-automation/generic.yaml

  - local: project-automation/tbump.yml

  - local: project-automation/update-check.yml



update:check:ci-templates:

  extends: .update-check

  variables:

    UPDATE_CHECK_CURRENT_VERSION: v6.28.0

    UPDATE_CHECK_REPOSITORY: https://gitlab.com/just-ci/templates.git

    UPDATE_CHECK_NAME: Just CI templates



tbump:

  extends:

project-automation/find-next-release.yml

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ find-next-release: 
  script:

    - !reference [".release:install", script]

    - wget -O .releaserc

      https://gitlab.com/just-ci/templates/-/raw/v6.27.3/project-automation/release/find-next-release.json

      https://gitlab.com/just-ci/templates/-/raw/v6.28.0/project-automation/release/find-next-release.json

    - semantic-release --dry-run --no-ci

    - echo "TBUMP_NEXT_VERSION=$(cat .VERSION 2>/dev/null || echo "[!] No new

      release" 1>&2)" > TBUMP_NEXT_VERSION.env