File tree Expand file tree Collapse file tree 1 file changed +6
-8
lines changed Expand file tree Collapse file tree 1 file changed +6
-8
lines changed Original file line number Diff line number Diff line change @@ -99,20 +99,18 @@ jobs:
99
99
name : version-info-${{ matrix.version }}
100
100
path : ./versions/
101
101
102
- # Only run in first matrix job to combine all outputs
103
102
- if : matrix.version == fromJson(needs.prepare.outputs.matrix_config).include[0].version
104
103
id : combine-outputs
105
104
run : |
106
105
# Wait for other matrix jobs to complete by sleeping briefly
107
106
sleep 15
108
107
109
- # Create arrays to hold all versions and tags
110
108
versions_array="["
111
109
tags_array="["
112
110
first=true
113
111
114
112
# 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
116
114
version=$(echo $row | jq -r '.version')
117
115
118
116
if [ "$first" = true ]; then
@@ -122,18 +120,18 @@ jobs:
122
120
tags_array+=","
123
121
fi
124
122
125
- # Get version from vars.yml using same logic as common-nix.vars.pkr.hcl
123
+ # Get version differently based on version type
126
124
if [[ "$version" == "orioledb-17" ]]; then
127
125
PG_VERSION=$(nix run nixpkgs#yq -- '.postgres_release.postgresorioledb-17' ansible/vars.yml)
128
126
else
129
127
PG_VERSION=$(nix run nixpkgs#yq -- '.postgres_release["postgres'$version'"]' ansible/vars.yml)
130
128
fi
131
129
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} \""
135
133
done
136
-
134
+
137
135
versions_array+="]"
138
136
tags_array+="]"
139
137
You can’t perform that action at this time.
0 commit comments