Skip to content

Commit 741a3b5

Browse files
committed
fix(actions): include arch and compose_profiles information on cache keys
Closes #3964
1 parent 663b86c commit 741a3b5

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

action.yaml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,16 @@ runs:
8181
SNUBA_MIGRATIONS_MD5=$(docker run --rm --entrypoint bash $SNUBA_IMAGE -c '{ ls -Rv1rpq snuba/snuba_migrations/**/*.py; grep -Poz "(?s)(?<=class Topic\\(Enum\\):\\n).+?(?=\\n\\n\\n)" snuba/utils/streams/topics.py; }' | md5sum | cut -d ' ' -f 1)
8282
echo "SNUBA_MIGRATIONS_MD5=$SNUBA_MIGRATIONS_MD5" >> $GITHUB_OUTPUT
8383
84+
- name: Get current machine's architecture
85+
id: arch
86+
shell: bash
87+
run: |
88+
echo "ARCH=$(uname -m)" >> $GITHUB_OUTPUT
8489
- name: Restore Sentry Volume Cache
8590
id: restore_cache_sentry
8691
uses: BYK/docker-volume-cache-action/restore@be89365902126f508dcae387a32ec3712df6b1cd
8792
with:
88-
key: db-volumes-sentry-v2-${{ steps.cache_key.outputs.SENTRY_MIGRATIONS_MD5 }}
93+
key: db-volumes-sentry-v2-${{ steps.arch.outputs.ARCH }}-${{ inputs.compose_profiles }}-${{ steps.cache_key.outputs.SENTRY_MIGRATIONS_MD5 }}
8994
restore-keys: |
9095
db-volumes-sentry-v1-
9196
volumes: |
@@ -95,7 +100,7 @@ runs:
95100
id: restore_cache_snuba
96101
uses: BYK/docker-volume-cache-action/restore@be89365902126f508dcae387a32ec3712df6b1cd
97102
with:
98-
key: db-volumes-snuba-v2-${{ steps.cache_key.outputs.SNUBA_MIGRATIONS_MD5 }}
103+
key: db-volumes-snuba-v2-${{ steps.arch.outputs.ARCH }}-${{ inputs.compose_profiles }}-${{ steps.cache_key.outputs.SNUBA_MIGRATIONS_MD5 }}
99104
restore-keys: |
100105
db-volumes-snuba-v1-
101106
volumes: |
@@ -105,10 +110,11 @@ runs:
105110
id: restore_cache_kafka
106111
uses: BYK/docker-volume-cache-action/restore@be89365902126f508dcae387a32ec3712df6b1cd
107112
with:
108-
key: db-volumes-kafka-v1-${{ steps.cache_key.outputs.SENTRY_MIGRATIONS_MD5 }}-${{ steps.cache_key.outputs.SNUBA_MIGRATIONS_MD5 }}
113+
key: db-volumes-kafka-v1-${{ steps.arch.outputs.ARCH }}-${{ inputs.compose_profiles }}-${{ steps.cache_key.outputs.SENTRY_MIGRATIONS_MD5 }}-${{ steps.cache_key.outputs.SNUBA_MIGRATIONS_MD5 }}
109114
restore-keys: |
110-
db-volumes-kafka-v1-${{ steps.cache_key.outputs.SENTRY_MIGRATIONS_MD5 }}-${{ steps.cache_key.outputs.SNUBA_MIGRATIONS_MD5 }}
111-
db-volumes-kafka-v1-${{ steps.cache_key.outputs.SENTRY_MIGRATIONS_MD5 }}-
115+
db-volumes-kafka-v1-${{ steps.arch.outputs.ARCH }}-${{ inputs.compose_profiles }}-${{ steps.cache_key.outputs.SENTRY_MIGRATIONS_MD5 }}-${{ steps.cache_key.outputs.SNUBA_MIGRATIONS_MD5 }}
116+
db-volumes-kafka-v1-${{ steps.arch.outputs.ARCH }}-${{ inputs.compose_profiles }}-${{ steps.cache_key.outputs.SENTRY_MIGRATIONS_MD5 }}-
117+
db-volumes-kafka-v1-${{ steps.arch.outputs.ARCH }}-${{ inputs.compose_profiles }}
112118
db-volumes-kafka-v1-
113119
volumes: |
114120
sentry-kafka

0 commit comments

Comments
 (0)