Skip to content

Commit 6ad5807

Browse files
committed
chore: pass in pg version var correctly
1 parent 4823c8a commit 6ad5807

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.github/workflows/qemu-image-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ jobs:
7777
PG_VERSION=$(nix run nixpkgs#yq -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
7878
PG_VERSION=$(echo $PG_VERSION | tr -d '"') # Remove any surrounding quotes
7979
echo 'postgres-version = "'$PG_VERSION'"' > common-nix.vars.pkr.hcl
80-
echo 'postgres_major_version = "'$POSTGRES_MAJOR_VERSION'"' >> common-nix.vars.pkr.hcl
81-
echo 'postgresql_major = "'$POSTGRES_MAJOR_VERSION'"' >> common-nix.vars.pkr.hcl
80+
echo 'postgres-major-version = "'$POSTGRES_MAJOR_VERSION'"' >> common-nix.vars.pkr.hcl
81+
# echo 'postgresql_major = "'$POSTGRES_MAJOR_VERSION'"' >> common-nix.vars.pkr.hcl
8282
# Ensure there's a newline at the end of the file
8383
echo "" >> common-nix.vars.pkr.hcl
8484

qemu-arm64-nix.pkr.hcl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ variable "postgres-version" {
2121
default = ""
2222
}
2323

24+
variable "postgres-major-version" {
25+
type = string
26+
default = ""
27+
}
28+
2429
variable "git-head-version" {
2530
type = string
2631
default = "unknown"
@@ -124,7 +129,7 @@ build {
124129

125130
provisioner "shell" {
126131
environment_vars = [
127-
"POSTGRES_MAJOR_VERSION=${var.postgres_major_version}",
132+
"POSTGRES_MAJOR_VERSION=${var.postgres-major-version}",
128133
"POSTGRES_SUPABASE_VERSION=${var.postgres-version}",
129134
"GIT_SHA=${var.git_sha}"
130135
]

0 commit comments

Comments
 (0)