Skip to content

Commit d15f476

Browse files
committed
Merge release-automation
1 parent d3908b9 commit d15f476

File tree

4 files changed

+20
-26
lines changed

4 files changed

+20
-26
lines changed

.github/actions/build-and-tag-locally/action.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -115,25 +115,25 @@ runs:
115115

116116
- name: Run container
117117
shell: bash
118-
if: ${{ contains(fromJSON('["amd64", "i386", "arm64"]'), steps.platform.outputs.display_name) }}
118+
if: ${{ contains(fromJSON('["amd64", "i386"]'), steps.platform.outputs.display_name) }}
119119
run: |
120120
docker run -d --name sanity-test-${{ steps.platform.outputs.display_name }} ${{ github.sha }}:${{ steps.platform.outputs.display_name }}
121121
122122
- name: Container Logs
123-
if: ${{ contains(fromJSON('["amd64", "i386", "arm64"]'), steps.platform.outputs.display_name) }}
123+
if: ${{ contains(fromJSON('["amd64", "i386"]'), steps.platform.outputs.display_name) }}
124124
shell: bash
125125
run: |
126126
docker logs sanity-test-${{ steps.platform.outputs.display_name }}
127127
128128
- name: Sanity Tests
129-
if: ${{ contains(fromJSON('["amd64", "i386", "arm64"]'), steps.platform.outputs.display_name) }}
129+
if: ${{ contains(fromJSON('["amd64", "i386"]'), steps.platform.outputs.display_name) }}
130130
shell: bash
131131
run: |
132132
docker exec sanity-test-${{ steps.platform.outputs.display_name }} redis-cli ping
133133
docker exec sanity-test-${{ steps.platform.outputs.display_name }} redis-cli info server
134134
135135
- name: Verify installed modules
136-
if: ${{ contains(fromJSON('["amd64", "arm64"]'), steps.platform.outputs.display_name) }}
136+
if: ${{ contains(fromJSON('["amd64"]'), steps.platform.outputs.display_name) }}
137137
shell: bash
138138
run: |
139139
modules=$(docker exec sanity-test-${{ steps.platform.outputs.display_name }} redis-cli module list)
@@ -153,7 +153,7 @@ runs:
153153
fi
154154
155155
- name: Test RedisBloom
156-
if: ${{ contains(fromJSON('["amd64", "arm64"]'), steps.platform.outputs.display_name) }}
156+
if: ${{ contains(fromJSON('["amd64"]'), steps.platform.outputs.display_name) }}
157157
shell: bash
158158
run: |
159159
docker exec sanity-test-${{ steps.platform.outputs.display_name }} redis-cli BF.ADD popular_keys "redis:hash"
@@ -163,7 +163,7 @@ runs:
163163
echo "RedisBloom test passed successfully"
164164
165165
- name: Test RediSearch
166-
if: ${{ contains(fromJSON('["amd64", "arm64"]'), steps.platform.outputs.display_name) }}
166+
if: ${{ contains(fromJSON('["amd64"]'), steps.platform.outputs.display_name) }}
167167
shell: bash
168168
run: |
169169
docker exec sanity-test-${{ steps.platform.outputs.display_name }} redis-cli FT.CREATE redis_commands ON HASH PREFIX 1 cmd: SCHEMA name TEXT SORTABLE description TEXT
@@ -178,7 +178,7 @@ runs:
178178
fi
179179
180180
- name: Test RedisTimeSeries
181-
if: ${{ contains(fromJSON('["amd64", "arm64"]'), steps.platform.outputs.display_name) }}
181+
if: ${{ contains(fromJSON('["amd64"]'), steps.platform.outputs.display_name) }}
182182
shell: bash
183183
run: |
184184
docker exec sanity-test-${{ steps.platform.outputs.display_name }} redis-cli TS.CREATE redis:cpu:usage RETENTION 86400
@@ -194,7 +194,7 @@ runs:
194194
fi
195195
196196
- name: Test ReJSON
197-
if: ${{ contains(fromJSON('["amd64", "arm64"]'), steps.platform.outputs.display_name) }}
197+
if: ${{ contains(fromJSON('["amd64"]'), steps.platform.outputs.display_name) }}
198198
shell: bash
199199
run: |
200200
docker exec sanity-test-${{ steps.platform.outputs.display_name }} redis-cli JSON.SET redis:config $ '{"maxmemory":"2gb","maxmemory-policy":"allkeys-lru"}'
@@ -209,7 +209,7 @@ runs:
209209
210210
- name: Test the entrypoint
211211
id: test_entrypoint
212-
if: ${{ contains(fromJSON('["amd64", "i386", "arm64"]'), steps.platform.outputs.display_name) }}
212+
if: ${{ contains(fromJSON('["amd64", "i386"]'), steps.platform.outputs.display_name) }}
213213
shell: bash
214214
run: >
215215
cd test && env
@@ -241,7 +241,7 @@ runs:
241241
242242
- name: Push image
243243
uses: docker/build-push-action@v6
244-
if: ${{ inputs.publish_image == 'true' && contains(fromJSON('["amd64", "arm64"]'), steps.platform.outputs.display_name) }}
244+
if: ${{ inputs.publish_image == 'true' && contains(fromJSON('["amd64"]'), steps.platform.outputs.display_name) }}
245245
with:
246246
context: ${{ inputs.distribution }}
247247
push: true
@@ -252,7 +252,7 @@ runs:
252252
- name: Save image URL to artifact
253253
shell: bash
254254
run: |
255-
if [[ "${{ inputs.publish_image }}" == "true" && "${{ contains(fromJSON('["amd64", "arm64"]'), steps.platform.outputs.display_name) }}" == "true" ]]; then
255+
if [[ "${{ inputs.publish_image }}" == "true" && "${{ contains(fromJSON('["amd64"]'), steps.platform.outputs.display_name) }}" == "true" ]]; then
256256
# Create a file with the image URL for this specific build
257257
mkdir -p /tmp/image-urls
258258
echo "${{ steps.format-registry-tag.outputs.tag }}" > "/tmp/image-urls/${{ inputs.distribution }}-${{ steps.platform.outputs.display_name }}.txt"
@@ -263,7 +263,7 @@ runs:
263263
264264
- name: Upload image URL artifact
265265
uses: actions/upload-artifact@v4
266-
if: ${{ inputs.publish_image == 'true' && contains(fromJSON('["amd64", "arm64"]'), steps.platform.outputs.display_name) }}
266+
if: ${{ inputs.publish_image == 'true' && contains(fromJSON('["amd64"]'), steps.platform.outputs.display_name) }}
267267
with:
268268
name: image-url-${{ inputs.distribution }}-${{ steps.platform.outputs.display_name }}
269269
path: /tmp/image-urls/${{ inputs.distribution }}-${{ steps.platform.outputs.display_name }}.txt

alpine/Dockerfile

Lines changed: 4 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

alpine/docker-entrypoint.sh

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

debian/Dockerfile

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)