Skip to content

Commit d11a40e

Browse files
authored
fix(frontend): vars naming add build prefix (#662)
1 parent 65cfa55 commit d11a40e

3 files changed

Lines changed: 12 additions & 8 deletions

File tree

.github/workflows/deploy-worker/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ inputs:
4444
BUILD_AWS_PREFIX:
4545
description: 'AWS_PREFIX used for config storage'
4646
required: true
47-
UMAMI_HOST:
47+
BUILD_UMAMI_HOST:
4848
description: 'Umami analytics host URL'
4949
required: false
50-
UMAMI_WEBSITE_ID:
50+
BUILD_UMAMI_WEBSITE_ID:
5151
description: 'Umami analytics website ID'
5252
required: false
5353

@@ -74,8 +74,8 @@ runs:
7474
BUILD_API_URL: ${{ inputs.BUILD_API_URL }}
7575
BUILD_CDN_URL: ${{ inputs.BUILD_CDN_URL }}
7676
BUILD_AWS_PREFIX: ${{ inputs.BUILD_AWS_PREFIX }}
77-
UMAMI_HOST: ${{ inputs.UMAMI_HOST }}
78-
UMAMI_WEBSITE_ID: ${{ inputs.UMAMI_WEBSITE_ID }}
77+
BUILD_UMAMI_HOST: ${{ inputs.BUILD_UMAMI_HOST }}
78+
BUILD_UMAMI_WEBSITE_ID: ${{ inputs.BUILD_UMAMI_WEBSITE_ID }}
7979

8080
- name: Get worker deploy command
8181
if: ${{ inputs.skip-deploy == 'false' && (inputs.changed == 'true' || inputs.mode == 'production') }}

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ jobs:
170170
BUILD_API_URL: ${{ steps.api.outputs.url }}
171171
BUILD_CDN_URL: ${{ steps.cdn.outputs.url }}
172172
BUILD_AWS_PREFIX: ${{ vars.AWS_PREFIX }}
173-
UMAMI_HOST: ${{ vars.UMAMI_HOST }}
174-
UMAMI_WEBSITE_ID: ${{ vars.UMAMI_WEBSITE_ID }}
173+
BUILD_UMAMI_HOST: ${{ vars.UMAMI_HOST }}
174+
BUILD_UMAMI_WEBSITE_ID: ${{ vars.UMAMI_WEBSITE_ID }}
175175
stagingUrl: ${{ vars.APP_STAGING_URL }}
176176
productionUrl: ${{ vars.APP_PRODUCTION_URL }}
177177
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}

frontend/vite.config.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,12 @@ export default defineConfig(({ mode, isSsrBuild }) => ({
1515
define: {
1616
BUILD_CDN_URL: JSON.stringify(process.env.BUILD_CDN_URL),
1717
BUILD_API_URL: JSON.stringify(process.env.BUILD_API_URL),
18-
BUILD_UMAMI_HOST: JSON.stringify(process.env.UMAMI_HOST),
19-
BUILD_UMAMI_WEBSITE_ID: JSON.stringify(process.env.UMAMI_WEBSITE_ID),
18+
BUILD_UMAMI_HOST: JSON.stringify(
19+
process.env.BUILD_UMAMI_HOST || process.env.UMAMI_HOST,
20+
),
21+
BUILD_UMAMI_WEBSITE_ID: JSON.stringify(
22+
process.env.BUILD_UMAMI_WEBSITE_ID || process.env.UMAMI_WEBSITE_ID,
23+
),
2024
},
2125
plugins: [
2226
cloudflare({

0 commit comments

Comments
 (0)