Skip to content

Commit

Permalink
ci: fix env var interpolation (#61)
Browse files Browse the repository at this point in the history
Signed-off-by: peterdeme <snypox@gmail.com>
  • Loading branch information
peterdeme authored Sep 13, 2024
1 parent 705ad34 commit 1316726
Showing 3 changed files with 2 additions and 6 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build_gcp_azure_manual.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions azure.pkr.hcl
Original file line number Diff line number Diff line change
@@ -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" {

0 comments on commit 1316726

Please sign in to comment.