From c7ef4930fd73b55ddb440d5ef3e1a2833e1d05de Mon Sep 17 00:00:00 2001 From: nick Date: Fri, 23 Feb 2024 13:10:30 -0800 Subject: [PATCH] using proper var source --- .github/workflows/deploy.yaml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index d81ac140..a6643075 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -17,6 +17,7 @@ concurrency: env: REFERENCE: ${{ github.event.pull_request.head.sha || github.event.push.head_commit.id }} + REACT_APP_API_SERVER: ${{ env.REACT_APP_API_SERVER != '' && env.REACT_APP_API_SERVER || vars.REACT_APP_API_SERVER }} jobs: build: @@ -26,7 +27,7 @@ jobs: contents: read strategy: matrix: - image: [build, backend] + image: [backend] steps: - uses: actions/checkout@v4 with: @@ -44,10 +45,10 @@ jobs: - run: make build-${{ matrix.image }} env: AWS_ACCOUNT_ID: ${{ secrets.AWS_ACCOUNT_ID }} - LOG_LEVEL: ${{ vars.SERVER_LOG_LEVEL }} - REACT_APP_API_SERVER: ${{ vars.REACT_APP_API_SERVER }} - PUBLIC_URL: ${{ vars.PUBLIC_URL }} - API_BASE_URL: ${{ vars.API_BASE_URL }} + LOG_LEVEL: ${{ env.SERVER_LOG_LEVEL != '' && env.SERVER_LOG_LEVEL || vars.SERVER_LOG_LEVEL }} + REACT_APP_API_SERVER: ${{ env.REACT_APP_API_SERVER }} + PUBLIC_URL: ${{ env.PUBLIC_URL != '' && env.PUBLIC_URL || vars.PUBLIC_URL }} + API_BASE_URL: ${{ env.API_BASE_URL != '' && env.API_BASE_URL || vars.API_BASE_URL }} deploy: @@ -58,7 +59,7 @@ jobs: contents: read environment: name: ${{ github.event.inputs.env }} - url: ${{ vars.PUBLIC_URL }} + url: ${{ env.PUBLIC_URL != '' && env.PUBLIC_URL || vars.PUBLIC_URL }} env: ENVIRONMENT: ${{ github.event.inputs.env }} steps: @@ -84,4 +85,4 @@ jobs: ARGO_CD_SERVER: ${{ secrets.ARGO_CD_SERVER }} ARGO_CD_USERNAME: ${{ secrets.ARGO_CD_USERNAME }} ARGO_CD_PASSWORD: ${{ secrets.ARGO_CD_PASSWORD }} - API_BASE_URL: ${{ vars.API_BASE_URL }} + API_BASE_URL: ${{ env.API_BASE_URL != '' && env.API_BASE_URL || vars.API_BASE_URL }}