Simplify CI caching (14ee8428) · Commits · Dom Sekotill / Behave Utils

.gitlab-ci.yml

+6 −8

Original line number	Diff line number	Diff line
		@@ -9,18 +9,16 @@ variables:
		PIP_CACHE_DIR: $CI_PROJECT_DIR/cache/pkg
		PRE_COMMIT_HOME: $CI_PROJECT_DIR/cache/pre-commit

		.cached-pkgs:
		.cached:
		cache:
		key: $CI_JOB_IMAGE
		paths: [cache/pkg]
		paths: [cache]


		Code Checks:
		stage: test
		extends: [.cached]
		image: docker.kodo.org.uk/ci-images/pre-commit:2.15.0-1
		cache:
		key: $CI_JOB_NAME
		paths: [cache]
		variables:
		HOOK_STAGE: commit
		FROM_REF: $CI_DEFAULT_BRANCH
		@@ -53,7 +51,7 @@ Commit Graph Check:

		Check Tag:
		stage: test
		extends: [.cached-pkgs]
		extends: [.cached]
		rules:
		- if: $CI_COMMIT_TAG =~ /^v[0-9]/
		script:
		@@ -72,7 +70,7 @@ Check Tag:

		Build Package:
		stage: build
		extends: [.cached-pkgs]
		extends: [.cached]
		script:
		- pip install build
		- python -m build
		@@ -82,7 +80,7 @@ Build Package:

		Upload Package:
		stage: publish
		extends: [.cached-pkgs]
		extends: [.cached]
		rules:
		- if: $CI_COMMIT_TAG =~ /^v[0-9]/
		script: