Skip to content

Commit 8966bb0

Browse files
committed
ci(apt): use vars.* with inline JSON defaults in matrices to avoid missing-vars errors on fork PRs; preserve master behavior
1 parent ef0a66b commit 8966bb0

File tree

1 file changed

+19
-12
lines changed

1 file changed

+19
-12
lines changed

.github/workflows/apt.yml

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,22 @@ on:
99
- unstable
1010
workflow_call:
1111

12+
env:
13+
BUILD_DISTS: ${{ vars.BUILD_DISTS || '["bookworm"]' }}
14+
BUILD_ARCHS: ${{ vars.BUILD_ARCHS || '["amd64"]' }}
15+
BUILD_EXCLUDE: ${{ vars.BUILD_EXCLUDE || '[]' }}
16+
SMOKE_TEST_IMAGES: ${{ vars.SMOKE_TEST_IMAGES || '["debian:bookworm"]' }}
17+
18+
1219
jobs:
1320
build-source-package:
1421
runs-on: ubuntu-22.04
1522
strategy:
1623
fail-fast: false
1724
matrix:
18-
dist: ${{ fromJSON(vars.BUILD_DISTS) }}
19-
arch: ${{ fromJSON(vars.BUILD_ARCHS) }}
20-
exclude: ${{ fromJSON(vars.BUILD_EXCLUDE) }}
25+
dist: ${{ fromJSON(env.BUILD_DISTS) }}
26+
arch: ${{ fromJSON(env.BUILD_ARCHS) }}
27+
exclude: ${{ fromJSON(env.BUILD_EXCLUDE) }}
2128
steps:
2229
- uses: actions/checkout@v4
2330
with:
@@ -39,22 +46,22 @@ jobs:
3946
mkdir -p redis-${VERSION}
4047
tar --extract --gunzip --file redis_${VERSION}.orig.tar.gz --strip-components=1 -C redis-${VERSION}
4148
sed -i 's/INSTALL_BIN=\$(PREFIX)\/bin/INSTALL_BIN=\$(DESTDIR)\$(PREFIX)\/bin/' redis-${VERSION}/src/Makefile
42-
49+
4350
echo "===== Updating all Redis module versions to 'master' ====="
4451
find redis-${VERSION}/modules -name "Makefile" -type f | while read -r makefile; do
4552
echo "Processing $makefile"
4653
echo " Before change:"
4754
grep "MODULE_VERSION" "$makefile" || echo " No MODULE_VERSION found"
48-
55+
4956
# Update the MODULE_VERSION to 'master'
5057
sed -i 's/MODULE_VERSION = .*/MODULE_VERSION = master/g' "$makefile"
51-
58+
5259
echo " After change:"
5360
grep "MODULE_VERSION" "$makefile" || echo " No MODULE_VERSION found after update"
5461
echo "-----------------------------------"
5562
done
5663
echo "===== Module version updates completed ====="
57-
64+
5865
cp -pr debian redis-${VERSION}
5966
sed -i "s/@RELEASE@/${{ matrix.dist }}/g" redis-${VERSION}/debian/changelog
6067
( cd redis-${VERSION} && dpkg-buildpackage -S )
@@ -72,9 +79,9 @@ jobs:
7279
strategy:
7380
fail-fast: false
7481
matrix:
75-
dist: ${{ fromJSON(vars.BUILD_DISTS) }}
76-
arch: ${{ fromJSON(vars.BUILD_ARCHS) }}
77-
exclude: ${{ fromJSON(vars.BUILD_EXCLUDE) }}
82+
dist: ${{ fromJSON(env.BUILD_DISTS) }}
83+
arch: ${{ fromJSON(env.BUILD_ARCHS) }}
84+
exclude: ${{ fromJSON(env.BUILD_EXCLUDE) }}
7885
needs: build-source-package
7986
steps:
8087
- uses: actions/checkout@v4
@@ -135,8 +142,8 @@ jobs:
135142
strategy:
136143
fail-fast: false
137144
matrix:
138-
image: ${{ fromJSON(vars.SMOKE_TEST_IMAGES) }}
139-
arch: [amd64, arm64]
145+
image: ${{ fromJSON(env.SMOKE_TEST_IMAGES) }}
146+
arch: ${{ fromJSON(env.BUILD_ARCHS) }}
140147
container: ${{ matrix.image }}
141148
steps:
142149
- name: Extract distribution from image

0 commit comments

Comments
 (0)