Skip to content

Commit 63c0222

Browse files
committed
chore: fixing logic
1 parent 1882226 commit 63c0222

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

.github/workflows/dockerhub-release-matrix.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,20 +99,18 @@ jobs:
9999
name: version-info-${{ matrix.version }}
100100
path: ./versions/
101101

102-
# Only run in first matrix job to combine all outputs
103102
- if: matrix.version == fromJson(needs.prepare.outputs.matrix_config).include[0].version
104103
id: combine-outputs
105104
run: |
106105
# Wait for other matrix jobs to complete by sleeping briefly
107106
sleep 15
108107
109-
# Create arrays to hold all versions and tags
110108
versions_array="["
111109
tags_array="["
112110
first=true
113111
114112
# For each version in the matrix config
115-
for row in $(echo '${{ needs.prepare.outputs.matrix_config }}' | jq -rc '.include[]'); do
113+
for row in $(echo '${{ needs.prepare.outputs.matrix_config }}' | jq -cr '.include[]'); do
116114
version=$(echo $row | jq -r '.version')
117115
118116
if [ "$first" = true ]; then
@@ -122,18 +120,18 @@ jobs:
122120
tags_array+=","
123121
fi
124122
125-
# Get version from vars.yml using same logic as common-nix.vars.pkr.hcl
123+
# Get version differently based on version type
126124
if [[ "$version" == "orioledb-17" ]]; then
127125
PG_VERSION=$(nix run nixpkgs#yq -- '.postgres_release.postgresorioledb-17' ansible/vars.yml)
128126
else
129127
PG_VERSION=$(nix run nixpkgs#yq -- '.postgres_release["postgres'$version'"]' ansible/vars.yml)
130128
fi
131129
PG_VERSION=$(echo $PG_VERSION | tr -d '"')
132-
133-
versions_array+="\"$version\""
134-
tags_array+="\"supabase/postgres:$PG_VERSION\""
130+
131+
versions_array+="\"${version}\""
132+
tags_array+="\"supabase/postgres:${PG_VERSION}\""
135133
done
136-
134+
137135
versions_array+="]"
138136
tags_array+="]"
139137

0 commit comments

Comments
 (0)