Skip to content

Commit d61d98f

Browse files
committed
convert compatibility ver val to strings
Signed-off-by: Humair Khan <[email protected]>
1 parent 3a1484c commit d61d98f

File tree

3 files changed

+215
-214
lines changed

3 files changed

+215
-214
lines changed

.github/scripts/release_prep/prereqs.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ git checkout -B ${BRANCH_NAME}
2828
echo "Created branch: ${BRANCH_NAME}"
2929
echo "Checking if compatibility.yaml contains ${TARGET_RELEASE} release...."
3030

31-
contains_rel=$(cat docs/release/compatibility.yaml | rel=${MINOR_RELEASE_WILDCARD} yq '[.[].dsp] | contains([env(rel)])')
31+
# convert rel to string in env(rel) explicitly to avoid comparing str to yq float
32+
contains_rel=$(cat docs/release/compatibility.yaml | rel=${MINOR_RELEASE_WILDCARD} yq '[.[].dsp] | contains([""+env(rel)])')
3233

3334
if [[ "$contains_rel" == "false" ]]; then
3435

docs/release/compatibility.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Each row outlines the versions for individual subcomponents and images that are
66

77
| dsp | kfp | argo | ml-metadata | envoy | ocp-pipelines | oauth-proxy | mariadb-103 | ubi-minimal | ubi-micro | openshift |
88
|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|
9-
| 2.11 | 2.2.0 | 3.4.17 | 1.14.0 | 1.22.11 | N/A | v4.14 | 1 | N/A | N/A | 4.15,4.16,4.17 |
9+
| 2.10 | 2.2.0 | 3.4.17 | 1.14.0 | 1.22.11 | N/A | v4.14 | 1 | N/A | N/A | 4.15,4.16,4.17 |
1010
| 2.9 | 2.2.0 | 3.4.17 | 1.14.0 | 1.22.11 | N/A | v4.14 | 1 | N/A | N/A | 4.15,4.16,4.17 |
1111
| 2.8 | 2.2.0 | 3.4.17 | 1.14.0 | 1.22.11 | N/A | v4.14 | 1 | N/A | N/A | 4.15,4.16,4.17 |
1212
| 2.7 | 2.2.0 | 3.4.17 | 1.14.0 | 1.22.11 | N/A | v4.10 | 1 | N/A | N/A | 4.15,4.16,4.17 |
@@ -20,11 +20,11 @@ Each row outlines the versions for individual subcomponents and images that are
2020
| 2.0-alpha-1 | 2.0.5 | 3.3.10 | 1.14.0 | 1.12.2 | N/A | v4.10 | 1 | N/A | N/A | 4.12,4.13,4.14 |
2121
| 1.6 | 1.5.1 (tktn) | None | 1.5.0 | 1.8.4 | 1.8 | v4.10 | 1 | 8.8 | 8.8 | 4.11,4.12,4.13 |
2222
| 1.5 | 1.5.1 (tktn) | None | 1.5.0 | 1.8.4 | 1.8 | v4.10 | 1 | 8.8 | 8.8 | 4.11,4.12,4.13 |
23-
| 1.4 | 1.5.1 (tktn) | None | 1.5.0 | 1.8.4 | 1.8 | v4.10 | 1 | 8.8 | 8.8 | 4.11,4.12,4.13 |
24-
| 1.3 | 1.5.1 (tktn) | None | 1.5.0 | 1.8.4 | 1.8 | v4.10 | 1 | 8.8 | 8.8 | 4.10,4.11,4.12 |
25-
| 1.2 | 1.5.1 (tktn) | None | 1.5.0 | 1.8.4 | 1.8 | v4.10 | 1 | 8.8 | 8.8 | 4.10,4.11,4.12 |
26-
| 1.1 | 1.5.1 (tktn) | None | 1.5.0 | 1.8.4 | 1.8 | v4.12 | 1 | 8.8 | 8.8 | 4.10,4.11,4.12 |
27-
| 1.0 | 1.5.1 (tktn) | None | 1.5.0 | 1.8.4 | 1.8 | v4.12 | 1 | 8.8 | 8.8 | 4.10,4.11,4.12 |
23+
| 1.4 | 1.5.1 (tktn) | | 1.5.0 | 1.8.4 | 1.8 | v4.10 | 1 | 8.8 | 8.8 | 4.11,4.12,4.13 |
24+
| 1.3 | 1.5.1 (tktn) | | 1.5.0 | 1.8.4 | 1.8 | v4.10 | 1 | 8.8 | 8.8 | 4.10,4.11,4.12 |
25+
| 1.2 | 1.5.1 (tktn) | | 1.5.0 | 1.8.4 | 1.8 | v4.10 | 1 | 8.8 | 8.8 | 4.10,4.11,4.12 |
26+
| 1.1 | 1.5.1 (tktn) | | 1.5.0 | 1.8.4 | 1.8 | v4.12 | 1 | 8.8 | 8.8 | 4.10,4.11,4.12 |
27+
| 1.0 | 1.5.1 (tktn) | | 1.5.0 | 1.8.4 | 1.8 | v4.12 | 1 | 8.8 | 8.8 | 4.10,4.11,4.12 |
2828

2929

3030

0 commit comments

Comments
 (0)