From a7cf05e20f77271324f37747bef509e7d81d24f2 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 8 Oct 2024 17:35:48 -0400 Subject: [PATCH] chore: set up more required vars --- .github/workflows/ami-release-nix.yml | 2 +- stage2-nix-psql.pkr.hcl | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ami-release-nix.yml b/.github/workflows/ami-release-nix.yml index 08299246c..706edd727 100644 --- a/.github/workflows/ami-release-nix.yml +++ b/.github/workflows/ami-release-nix.yml @@ -88,7 +88,7 @@ jobs: packer init stage2-nix-psql.pkr.hcl GIT_SHA=${{github.sha}} POSTGRES_MAJOR_VERSION=${{ env.POSTGRES_MAJOR_VERSION }} - packer build -var "git_sha=${GIT_SHA}" -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" stage2-nix-psql.pkr.hcl + packer build -var "git_sha=${GIT_SHA}" -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${GITHUB_RUN_ID}" -var "postgres_major_version=${POSTGRES_MAJOR_VERSION}" -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl" stage2-nix-psql.pkr.hcl - name: Grab release version id: process_release_version diff --git a/stage2-nix-psql.pkr.hcl b/stage2-nix-psql.pkr.hcl index 57ddfd9e7..2897ffd32 100644 --- a/stage2-nix-psql.pkr.hcl +++ b/stage2-nix-psql.pkr.hcl @@ -46,6 +46,11 @@ variable "git_sha" { default = env("GIT_SHA") } +variable "postgres_major_version" { + type = string + default = "" +} + packer { required_plugins { amazon = { @@ -133,7 +138,8 @@ build { provisioner "shell" { environment_vars = [ - "GIT_SHA=${var.git_sha}" + "GIT_SHA=${var.git_sha}", + "POSTGRES_MAJOR_VERSION=${var.postgres_major_version}" ] script = "scripts/nix-provision.sh" }