From a55b1251a0bc5fe66eb83673d47f67cd4505657a Mon Sep 17 00:00:00 2001 From: Mathieu Guindon Date: Mon, 3 Feb 2025 21:01:21 -0500 Subject: [PATCH] fix env variable refs --- .github/workflows/dotnet-cd-prod.yml | 7 +++++-- .github/workflows/dotnet-cd.yml | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dotnet-cd-prod.yml b/.github/workflows/dotnet-cd-prod.yml index c132309..a9886ce 100644 --- a/.github/workflows/dotnet-cd-prod.yml +++ b/.github/workflows/dotnet-cd-prod.yml @@ -11,6 +11,9 @@ jobs: runs-on: windows-latest environment: AZ-Prod + env: + ApiRootUrl: $API_ROOT_URL + steps: - uses: actions/checkout@v4 @@ -24,8 +27,8 @@ jobs: - name: configure production front-end environment run: | - set-content "rubberduckvba.client\src\environments\environment.prod.ts" -value "export const environment = { production: true, apiBaseUrl: '${{ env.API_ROOT_URL }}' };" - set-content "rubberduckvba.client\src\environments\environment.ts" -value "export const environment = { production: true, apiBaseUrl: '${{ env.API_ROOT_URL }}' };" + set-content "rubberduckvba.client\src\environments\environment.prod.ts" -value "export const environment = { production: true, apiBaseUrl: '$ApiRootUrl' };" + set-content "rubberduckvba.client\src\environments\environment.ts" -value "export const environment = { production: true, apiBaseUrl: '$ApiRootUrl' };" - name: dotnet build run: dotnet build rubberduckvba.Server --configuration Release diff --git a/.github/workflows/dotnet-cd.yml b/.github/workflows/dotnet-cd.yml index ab7efc5..a2683c4 100644 --- a/.github/workflows/dotnet-cd.yml +++ b/.github/workflows/dotnet-cd.yml @@ -13,6 +13,9 @@ jobs: runs-on: windows-latest environment: AZ-Test + env: + ApiRootUrl: $API_ROOT_URL + steps: - uses: actions/checkout@v4 @@ -26,9 +29,9 @@ jobs: - name: configure test front-end environment run: | - set-content "rubberduckvba.client\src\environments\environment.test.ts" -value "export const environment = { production: false, apiBaseUrl: '${{ env.API_ROOT_URL }}' };" - set-content "rubberduckvba.client\src\environments\environment.prod.ts" -value "export const environment = { production: false, apiBaseUrl: '${{ env.API_ROOT_URL }}' };" - set-content "rubberduckvba.client\src\environments\environment.ts" -value "export const environment = { production: false, apiBaseUrl: '${{ env.API_ROOT_URL }}' };" + set-content "rubberduckvba.client\src\environments\environment.test.ts" -value "export const environment = { production: false, apiBaseUrl: '$ApiRootUrl' };" + set-content "rubberduckvba.client\src\environments\environment.prod.ts" -value "export const environment = { production: false, apiBaseUrl: '$ApiRootUrl' };" + set-content "rubberduckvba.client\src\environments\environment.ts" -value "export const environment = { production: false, apiBaseUrl: '$ApiRootUrl' };" - name: dotnet build run: dotnet build rubberduckvba.Server --configuration Release