Skip to content

Commit 3ec6595

Browse files
committed
Use GHA matrix strategy to test Debian OSes
1 parent 3b7a162 commit 3ec6595

File tree

2 files changed

+35
-13
lines changed

2 files changed

+35
-13
lines changed

.github/workflows/release-build-sign-upload.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,14 @@ jobs:
905905
needs:
906906
- setup
907907
- build-linux
908+
strategy:
909+
matrix:
910+
image:
911+
- debian:11
912+
- debian:12
913+
- ubuntu:20.04
914+
- ubuntu:22.04
915+
- ubuntu
908916
runs-on: ubuntu-latest
909917
steps:
910918

@@ -913,21 +921,20 @@ jobs:
913921
with:
914922
name: cf-cli-linux-deb-packages
915923

916-
- name: Display structure of downloaded files and test compression
924+
- name: Display structure and verify
925+
env:
926+
IMAGE: ${{ matrix.image }}
917927
run: |
918-
ls -R
919-
920-
for i in debian:11 debian:12 ubuntu:20.04 ubuntu:22.04 ubuntu; do docker run \
928+
docker run \
921929
--interactive \
922930
--rm \
923931
-v .:/workspace \
924-
${i:?} <<EOC
925-
printf "${i:?} -> "
932+
${IMAGE} <<EOC
933+
printf "${IMAGE} -> "
926934
grep PRETTY_NAME /etc/os-release | cut -d= -f2-
927935
cd workspace
928936
ls *.deb | xargs -n1 dpkg --info
929937
EOC
930-
done
931938
932939
test-macos:
933940
name: Test macOS Artifacts

.github/workflows/release-update-repos.yml

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,14 @@ jobs:
305305
306306
test-deb:
307307
name: Test Debian Repository
308+
strategy:
309+
matrix:
310+
image:
311+
- debian:11
312+
- debian:12
313+
- ubuntu:20.04
314+
- ubuntu:22.04
315+
- ubuntu
308316
runs-on: ubuntu-latest
309317
needs:
310318
- setup
@@ -316,17 +324,23 @@ jobs:
316324
steps:
317325

318326
- name: Install CF CLI via apt
327+
env:
328+
IMAGE: ${{ matrix.image }}
319329
run: |
330+
docker run \
331+
--interactive \
332+
--rm \
333+
${IMAGE} <<EOC
320334
set -o pipefail -e
321335
322-
sudo apt update
323-
sudo apt install -y wget gnupg
336+
apt update
337+
apt install -y wget gnupg
324338
325-
wget -q -O - ${CLAW_URL}/debian/cli.cloudfoundry.org.key | sudo apt-key add -
326-
echo "deb ${CLAW_URL}/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
339+
wget -q -O - ${CLAW_URL}/debian/cli.cloudfoundry.org.key | apt-key add -
340+
echo "deb ${CLAW_URL}/debian stable main" | tee /etc/apt/sources.list.d/cloudfoundry-cli.list
327341
328-
sudo apt update
329-
sudo apt install -y cf${VERSION_MAJOR}-cli
342+
apt update
343+
apt install -y cf${VERSION_MAJOR}-cli
330344
331345
which cf
332346
@@ -336,6 +350,7 @@ jobs:
336350
cf${VERSION_MAJOR} -v
337351
338352
cf -v | grep "${VERSION_BUILD}"
353+
EOC
339354
340355
update-rpm:
341356
name: Update RPM Repository

0 commit comments

Comments
 (0)