Skip to content

Commit 85c7e82

Browse files
committed
fix: yet another pg var
1 parent 035dc13 commit 85c7e82

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

.github/workflows/ami-release-nix.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ jobs:
7878
run: |
7979
packer init amazon-arm64-nix.pkr.hcl
8080
GIT_SHA=${{github.sha}}
81+
# why is postgresql_major defined here instead of where the _three_ other postgresql_* variables are defined?
8182
packer build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${GITHUB_RUN_ID}" -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl" -var "ansible_arguments=-e postgresql_major=${POSTGRES_MAJOR_VERSION}" amazon-arm64-nix.pkr.hcl
8283
8384
- name: Build AMI stage 2

ebssurrogate/scripts/qemu-bootstrap-nix.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ EOF
3939
ansible-playbook ./ansible/playbook.yml --extra-vars '{"nixpkg_mode": true, "debpkg_mode": false, "stage2_nix": false}' \
4040
--extra-vars "postgresql_version=postgresql_${POSTGRES_MAJOR_VERSION}" \
4141
--extra-vars "postgresql_major_version=${POSTGRES_MAJOR_VERSION}" \
42+
--extra-vars "postgresql_major=${POSTGRES_MAJOR_VERSION}" \
4243
--extra-vars "psql_version=psql_${POSTGRES_MAJOR_VERSION}"
4344
}
4445

@@ -100,6 +101,7 @@ EOF
100101
--extra-vars "git_commit_sha=${GIT_SHA}" \
101102
--extra-vars "postgresql_version=postgresql_${POSTGRES_MAJOR_VERSION}" \
102103
--extra-vars "postgresql_major_version=${POSTGRES_MAJOR_VERSION}" \
104+
--extra-vars "postgresql_major=${POSTGRES_MAJOR_VERSION}" \
103105
--extra-vars "psql_version=psql_${POSTGRES_MAJOR_VERSION}"
104106
}
105107

0 commit comments

Comments
 (0)