Merge branch 'main' of gitlab.com:just-ci/templates into beta (358bb888) · Commits · git-mirror / Templates

.gitlab-ci.yml

+0 −16

Original line number	Diff line number	Diff line
		@@ -29,8 +29,6 @@ jobs:c:
		include:
		- local: tests/jobs/c.yml
		strategy: depend
		rules:
		- if: $CI_OPEN_MERGE_REQUESTS

		jobs:docker:
		stage: test
		@@ -38,8 +36,6 @@ jobs:docker:
		include:
		- local: tests/jobs/docker.yml
		strategy: depend
		rules:
		- if: $CI_OPEN_MERGE_REQUESTS

		jobs:docs:
		stage: test
		@@ -47,8 +43,6 @@ jobs:docs:
		include:
		- local: tests/jobs/docs.yml
		strategy: depend
		rules:
		- if: $CI_OPEN_MERGE_REQUESTS

		jobs:python:
		stage: test
		@@ -56,8 +50,6 @@ jobs:python:
		include:
		- local: tests/jobs/python.yml
		strategy: depend
		rules:
		- if: $CI_OPEN_MERGE_REQUESTS

		# child pipelines to test our off-the-shelves pipelines
		pipelines:c:
		@@ -66,8 +58,6 @@ pipelines:c:
		include:
		- local: tests/pipelines/c.yml
		strategy: depend
		rules:
		- if: $CI_OPEN_MERGE_REQUESTS

		pipelines:docker:
		stage: test
		@@ -75,8 +65,6 @@ pipelines:docker:
		include:
		- local: tests/pipelines/docker.yml
		strategy: depend
		rules:
		- if: $CI_OPEN_MERGE_REQUESTS

		pipelines:python:
		stage: test
		@@ -84,8 +72,6 @@ pipelines:python:
		include:
		- local: tests/pipelines/python.yml
		strategy: depend
		rules:
		- if: $CI_OPEN_MERGE_REQUESTS

		pipelines:python&docker:
		stage: test
		@@ -93,5 +79,3 @@ pipelines:python&docker:
		include:
		- local: tests/pipelines/python-docker.yml
		strategy: depend
		rules:
		- if: $CI_OPEN_MERGE_REQUESTS

+4 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,10 @@
		"plugins": [
		"@semantic-release/commit-analyzer",
		"@semantic-release/release-notes-generator",
		"@semantic-release/gitlab"
		"@semantic-release/gitlab",
		["@semantic-release/git", {
		"assets": ["README.md", "tbump.toml"]
		}]
		],
		"branches": [
		"+([0-9])?(.{+([0-9]),x}).x",

+5 −1

Original line number	Diff line number	Diff line
		# Just CI templates
		# Just CI templates v4.0.1

		Maintainers:
		* Federico Falconieri: @falcorocks
		@@ -42,6 +42,7 @@ Here is an example `.gitlab-ci.yml` importing the python template:
		include:
		- project: 'just-ci/templates'
		file: 'templates/python.yml'
		ref: 'v4.0.1'
		```

		The above is a template for Python projects. Other templates can be found in `templates/`, for example:
		@@ -58,6 +59,7 @@ Templates and pipelines may come with jobs you don't want/need to run. We have c
		include:
		- project: 'just-ci/templates'
		file: 'templates/python.yml'
		ref: 'v4.0.1'

		python:pytest:
		rules:
		@@ -90,6 +92,7 @@ Use [child pipelines](https://docs.gitlab.com/ee/ci/pipelines/parent_child_pipel
		include:
		- project: 'just-ci/templates'
		templates: 'templates/docker.yml'
		ref: 'v4.0.1'
		# root image will build fine without any further change needed

		# child pipeline for second docker image
		@@ -110,6 +113,7 @@ second-image:
		include:
		- project: 'just-ci/templates'
		file: 'templates/docker.yml'
		ref: 'v4.0.1'

		variables:
		KANIKO_REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}/second-image

+0 −1

Original line number	Diff line number	Diff line
		@@ -22,4 +22,3 @@ kaniko:
		script:
		- echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(echo -n ${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD} \| base64)\"}}}" > /kaniko/.docker/config.json
		- /kaniko/executor --cache=${KANIKO_CACHE} --context=${KANIKO_CONTEXT} --dockerfile=${KANIKO_DOCKERFILE} --destination=${KANIKO_REGISTRY_IMAGE}:${KANIKO_DEV_TAG} --destination=${KANIKO_REGISTRY_IMAGE}:${KANIKO_TAG} ${LABELS} ${KANIKO_EXTRA_ARGS}
		needs: []

0 → 100644

+17 −0

Original line number	Diff line number	Diff line
		[version]
		current = "4.0.1"

		regex = '''
		(?P<major>\d+)
		\.
		(?P<minor>\d+)
		\.
		(?P<patch>\d+)
		'''

		[git]
		message_template = "Bump to {new_version}"
		tag_template = "v{new_version}"

		[[file]]
		src = "README.md"