diff --git a/.github/workflows/pr_checks.yaml b/.github/workflows/pr_checks.yaml index 3c21787..f9e61ce 100644 --- a/.github/workflows/pr_checks.yaml +++ b/.github/workflows/pr_checks.yaml @@ -38,7 +38,12 @@ jobs: # NOTE: ``bumpver`` will be looking for this. Futher, this should # match tags in ``./docker/compose.ci.yaml`` which are updated # by bumpver. - tags: acederberg/captura-ci:0.1.5 + # + # NOTE: Adding an image tag that is version specific should not be done + # as this must be consistent with the caching config - updating the + # version string in the caching config requires the ``workflow`` + # permission for the pipeline, which is overkill imo. + tags: acederberg/captura-ci:latest pull: false push: false cache-from: type=gha diff --git a/docker/compose.ci.yaml b/docker/compose.ci.yaml index f478cb3..6a382f8 100644 --- a/docker/compose.ci.yaml +++ b/docker/compose.ci.yaml @@ -2,15 +2,18 @@ name: captura-ci services: server: - # Base should give compose minus volumes and networks (and any references to - # outside). - build: - context: '..' - target: ci + # NOTE: Should build before running for caching. + # build: + # context: '..' + # target: ci extends: file: ./compose.base.yaml service: server - image: acederberg/captura-ci:0.1.5 + # NOTE: Adding an image tag that is version specific should not be done + # as this must be consistent with the caching config - updating the + # version string in the caching config requires the ``workflow`` + # permission for the pipeline, which is overkill imo. + image: acederberg/captura-ci:latest networks: captura: {} db: diff --git a/pyproject.toml b/pyproject.toml index 88f3444..a1fd75b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -143,8 +143,13 @@ push = false "pyproject.toml" = ['current_version = "{version}"', 'version = "{version}"'] "src/captura/__init__.py" = ["{version}"] "docker/compose.yaml" = ["image: acederberg/captura-development:{version}"] -"docker/compose.ci.yaml" = ["image: acederberg/captura-ci:{version}"] -".github/workflows/pr_checks.yaml" = ["tags: acederberg/captura-ci:{version}"] + +# NOTE: Adding an image tag that is version specific should not be done +# as this must be consistent with the caching config - updating the +# version string in the caching config requires the ``workflow`` +# permission for the pipeline, which is overkill imo. +# "docker/compose.ci.yaml" = ["image: acederberg/captura-ci:{version}"] +# ".github/workflows/pr_checks.yaml" = ["tags: acederberg/captura-ci:{version}"] [tool.setuptools_scm]