Skip to content

Commit e839bbb

Browse files
Modified the test build to accept a list of variants to slimit the build
1 parent 6888da3 commit e839bbb

File tree

4 files changed

+28
-9
lines changed

4 files changed

+28
-9
lines changed

functions.sh

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,29 @@ function get_variants() {
5656
shift
5757

5858
local arch
59-
arch=$(get_arch)
59+
local availablevariants
60+
local variantsfilter
6061
local variants
61-
variants=$(grep "^$arch" "$dir/architectures" | sed -E 's/'"$arch"'[[:space:]]*//' | sed -E 's/,/ /g')
62-
echo "$variants"
62+
63+
arch=$(get_arch)
64+
variantsfilter=( "$@" )
65+
IFS=' ' read -ra availablevariants <<< "$(grep "^$arch" "$dir/architectures" | sed -E 's/'"$arch"'[[:space:]]*//' | sed -E 's/,/ /g')"
66+
67+
if [ ${#variantsfilter[@]} -gt 0 ]; then
68+
for variant1 in "${availablevariants[@]}"; do
69+
for variant2 in "${variantsfilter[@]}"; do
70+
if [[ "$variant1" = "$variant2" ]]; then
71+
variants+=("$variant1")
72+
fi
73+
done
74+
done
75+
76+
if [ ${#variants[@]} -gt 0 ]; then
77+
echo "${variants[@]}"
78+
fi
79+
else
80+
echo "${availablevariants[@]}"
81+
fi
6382
}
6483

6584
# Get supported architectures for a specific version and variant

generate-stackbrew-library.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ for version in "${versions[@]}"; do
7070

7171
# Get supported variants according to the target architecture.
7272
# See details in function.sh
73-
variants=$(get_variants "$(dirname "$version")")
74-
for variant in $variants; do
73+
IFS=' ' read -ra variants <<< "$(get_variants "$(dirname "$version")")"
74+
for variant in "${variants[@]}"; do
7575
# Skip non-docker directories
7676
[ -f "$version/$variant/Dockerfile" ] || continue
7777

test-build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ for version in "${versions[@]}"; do
5353

5454
# Get supported variants according to the target architecture.
5555
# See details in function.sh
56-
variants=$(get_variants "$(dirname "$version")")
56+
IFS=' ' read -ra variants <<< "$(IFS=','; get_variants "$(dirname "$version")" "$2")"
5757

58-
for variant in $variants; do
58+
for variant in "${variants[@]}"; do
5959
# Skip non-docker directories
6060
[ -f "$version/$variant/Dockerfile" ] || continue
6161

update.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ for version in "${versions[@]}"; do
8585

8686
# Get supported variants according the target architecture
8787
# See details in function.sh
88-
variants=$(get_variants "$parentpath")
88+
IFS=' ' read -ra variants <<< "$(get_variants "$parentpath")"
8989

90-
for variant in $variants; do
90+
for variant in "${variants[@]}"; do
9191
# Skip non-docker directories
9292
[ -f "$version/$variant/Dockerfile" ] || continue
9393
add_stage "$baseuri" "$version" "$variant"

0 commit comments

Comments
 (0)