Skip to content

Commit

Permalink
fix(package): No more specific version for compose.ci.yaml.
Browse files Browse the repository at this point in the history
Because this makes bumpver actions requrire the permission \`workflows\`.
  • Loading branch information
acederberg committed Aug 21, 2024
1 parent 3251c77 commit 6ee515d
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 9 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/pr_checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 9 additions & 6 deletions docker/compose.ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 7 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

0 comments on commit 6ee515d

Please sign in to comment.