From 8d409db0359163353cdf33a12e3c49a7254d7841 Mon Sep 17 00:00:00 2001 From: peterdeme Date: Fri, 13 Sep 2024 18:01:44 +0200 Subject: [PATCH] ci: fix env var interpolation Signed-off-by: peterdeme --- .github/workflows/build_gcp_azure_manual.yml | 2 -- .github/workflows/ci.yml | 2 -- azure.pkr.hcl | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_gcp_azure_manual.yml b/.github/workflows/build_gcp_azure_manual.yml index 6d9eee0..8746b90 100644 --- a/.github/workflows/build_gcp_azure_manual.yml +++ b/.github/workflows/build_gcp_azure_manual.yml @@ -23,8 +23,6 @@ jobs: PKR_VAR_client_id: "976e4a6e-c619-417e-9add-50e2d674e2db" PKR_VAR_tenant_id: ${{ secrets.AZURE_TENANT_ID }} PKR_VAR_subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} - PKR_VAR_oidc_request_url: "${ACTIONS_ID_TOKEN_REQUEST_URL}" - PKR_VAR_oidc_request_token: "${ACTIONS_ID_TOKEN_REQUEST_TOKEN}" PKR_VAR_image_resource_group: rg-worker_images-public-westeurope PKR_VAR_packer_work_group: rg-worker_images_packer-public-westeurope PKR_VAR_gallery_resource_group: rg-worker_images-public-westeurope diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4a3f584..416f589 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,8 +30,6 @@ jobs: PKR_VAR_client_id: "433d3ca3-1866-4dfa-b9bf-65d6c4391ec7" PKR_VAR_tenant_id: ${{ secrets.AZURE_TENANT_ID }} PKR_VAR_subscription_id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} - PKR_VAR_oidc_request_url: "${ACTIONS_ID_TOKEN_REQUEST_URL}" - PKR_VAR_oidc_request_token: "${ACTIONS_ID_TOKEN_REQUEST_TOKEN}" PKR_VAR_image_resource_group: rg-worker_images-public-westeurope PKR_VAR_packer_work_group: rg-worker_images_packer-public-westeurope PKR_VAR_gallery_resource_group: rg-worker_images-public-westeurope diff --git a/azure.pkr.hcl b/azure.pkr.hcl index 5e6d3e5..5c6a5da 100644 --- a/azure.pkr.hcl +++ b/azure.pkr.hcl @@ -14,12 +14,12 @@ variable "client_id" { variable "oidc_request_url" { type = string - default = "" + default = env("ACTIONS_ID_TOKEN_REQUEST_URL") // Github built-in variable } variable "oidc_request_token" { type = string - default = "" + default = env("ACTIONS_ID_TOKEN_REQUEST_TOKEN") // Github built-in variable } variable "subscription_id" {