File tree Expand file tree Collapse file tree 2 files changed +16
-14
lines changed Expand file tree Collapse file tree 2 files changed +16
-14
lines changed Original file line number Diff line number Diff line change @@ -63,19 +63,19 @@ jobs:
63
63
sudo chmod o+x /var/lib/docker
64
64
sudo chmod -R o+rwx /var/lib/docker/volumes
65
65
source .env
66
- SENTRY_IMAGE_SHA =$(docker buildx imagetools inspect $SENTRY_IMAGE --format "{{println .Manifest.Digest}}" )
67
- echo "SENTRY_IMAGE_SHA=$SENTRY_IMAGE_SHA " >> $GITHUB_OUTPUT
68
- SNUBA_IMAGE_SHA =$(docker buildx imagetools inspect $SNUBA_IMAGE --format "{{println .Manifest.Digest}}" )
69
- echo "SNUBA_IMAGE_SHA=$SNUBA_IMAGE_SHA " >> $GITHUB_OUTPUT
66
+ SENTRY_MIGRATIONS_MD5 =$(docker run --rm --entrypoint bash $SENTRY_IMAGE -c 'ls -Rv1rpq src/sentry/migrations/' | md5sum | cut -d ' ' -f 1 )
67
+ echo "SENTRY_MIGRATIONS_MD5=$SENTRY_MIGRATIONS_MD5 " >> $GITHUB_OUTPUT
68
+ SNUBA_MIGRATIONS_MD5 =$(docker run --rm --entrypoint bash $SNUBA_IMAGE -c 'ls -Rv1rpq snuba/snuba_migrations/**/*.py' | md5sum | cut -d ' ' -f 1 )
69
+ echo "SNUBA_MIGRATIONS_MD5=$SNUBA_MIGRATIONS_MD5 " >> $GITHUB_OUTPUT
70
70
71
71
- name : Restore DB Volumes Cache
72
72
id : restore_cache
73
73
uses : actions/cache/restore@v4
74
74
with :
75
- key : db-volumes-v4 -${{ steps.cache_key.outputs.SENTRY_IMAGE_SHA }}-${{ steps.cache_key.outputs.SNUBA_IMAGE_SHA }}
75
+ key : db-volumes-v5 -${{ steps.cache_key.outputs.SNUBA_MIGRATIONS_MD5 }}-${{ steps.cache_key.outputs.SENTRY_MIGRATIONS_MD5 }}
76
76
restore-keys : |
77
- db-volumes-v4 -${{ steps.cache_key.outputs.SENTRY_IMAGE_SHA }}
78
- db-volumes-v4 -
77
+ db-volumes-v5 -${{ steps.cache_key.outputs.SNUBA_MIGRATIONS_MD5 }}
78
+ db-volumes-v5 -
79
79
path : |
80
80
/var/lib/docker/volumes/sentry-postgres/_data
81
81
/var/lib/docker/volumes/sentry-clickhouse/_data
Original file line number Diff line number Diff line change @@ -62,19 +62,21 @@ runs:
62
62
sudo chmod o+x /var/lib/docker
63
63
sudo chmod -R o+rwx /var/lib/docker/volumes
64
64
source ${{ github.action_path }}/.env
65
- SENTRY_IMAGE_SHA=$(docker buildx imagetools inspect $SENTRY_IMAGE --format "{{println .Manifest.Digest}}")
66
- echo "SENTRY_IMAGE_SHA=$SENTRY_IMAGE_SHA" >> $GITHUB_OUTPUT
67
- SNUBA_IMAGE_SHA=$(docker buildx imagetools inspect $SNUBA_IMAGE --format "{{println .Manifest.Digest}}")
68
- echo "SNUBA_IMAGE_SHA=$SNUBA_IMAGE_SHA" >> $GITHUB_OUTPUT
65
+ # See https://explainshell.com/explain?cmd=ls%20-Rv1rpq
66
+ # for that long `ls` command
67
+ SENTRY_MIGRATIONS_MD5=$(docker run --rm --entrypoint bash $SENTRY_IMAGE -c 'ls -Rv1rpq src/sentry/migrations/' | md5sum | cut -d ' ' -f 1)
68
+ echo "SENTRY_MIGRATIONS_MD5=$SENTRY_MIGRATIONS_MD5" >> $GITHUB_OUTPUT
69
+ SNUBA_MIGRATIONS_MD5=$(docker run --rm --entrypoint bash $SNUBA_IMAGE -c 'ls -Rv1rpq snuba/snuba_migrations/**/*.py' | md5sum | cut -d ' ' -f 1)
70
+ echo "SNUBA_MIGRATIONS_MD5=$SNUBA_MIGRATIONS_MD5" >> $GITHUB_OUTPUT
69
71
70
72
- name : Restore DB Volumes Cache
71
73
id : restore_cache
72
74
uses : actions/cache/restore@v4
73
75
with :
74
- key : db-volumes-v4 -${{ steps.cache_key.outputs.SENTRY_IMAGE_SHA }}-${{ steps.cache_key.outputs.SNUBA_IMAGE_SHA }}
76
+ key : db-volumes-v5 -${{ steps.cache_key.outputs.SNUBA_MIGRATIONS_MD5 }}-${{ steps.cache_key.outputs.SENTRY_MIGRATIONS_MD5 }}
75
77
restore-keys : |
76
- db-volumes-v4 -${{ steps.cache_key.outputs.SENTRY_IMAGE_SHA }}
77
- db-volumes-v4 -
78
+ db-volumes-v5 -${{ steps.cache_key.outputs.SNUBA_MIGRATIONS_MD5 }}
79
+ db-volumes-v5 -
78
80
path : |
79
81
/var/lib/docker/volumes/sentry-postgres/_data
80
82
/var/lib/docker/volumes/sentry-clickhouse/_data
You can’t perform that action at this time.
0 commit comments