Set JEKYLL_ENV for help deploys by puneetlath · Pull Request #90725 · Expensify/App

puneetlath · 2026-05-14T20:10:49Z

Explanation of Change

Sets JEKYLL_ENV=production for both help-site Jekyll deploy build steps. This ensures docs/_includes/CONST.html resolves MAIN_SITE_URL to https://new.expensify.com during deployed builds, so the generated Concierge link points to https://new.expensify.com/concierge instead of https://dev.new.expensify.com:8082/concierge.

Fixed Issues

$ #89309
PROPOSAL: #89309 (comment)

Tests

Deploy the help site with this workflow change.
Load https://help.expensify.com/.
Scroll down to Didn't find what you were looking for?.
Click Send a message.
Verify signed-in users land on the Concierge DM at https://new.expensify.com/concierge.
Verify signed-out users are prompted to sign in at https://new.expensify.com/Home

Verify that no errors appear in the JS console

Offline tests

N/A.

QA Steps

Same as Tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

N/A

Android: mWeb Chrome

N/A

iOS: Native

N/A

iOS: mWeb Safari

N/A

MacOS: Chrome / Safari

N/A

melvin-bot · 2026-05-14T20:11:25Z

@grgia Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

github-actions · 2026-05-14T20:12:25Z

Your New Help changes have been deployed to https://32e991b9.newhelp.pages.dev ⚡️

puneetlath · 2026-05-14T20:19:17Z

@brunovjk @MelvinBot I made the change, but the helpsite looks totally different now. Any idea why?

MelvinBot · 2026-05-14T20:23:41Z

The JEKYLL_ENV=production change shouldn't be causing any visual difference on the new help site. Here's why:

I searched the entire help/ directory — nothing checks jekyll.environment. The layouts (_layouts/default.html, _layouts/product.html), plugins (SitePostRender.rb, SitePostWrite.rb), and _config.yml have zero environment-conditional logic. The CSS (default.css) is a static file with no Liquid templating.

The only place jekyll.environment is checked in the repo is docs/_includes/CONST.html (the old help site), which toggles MAIN_SITE_URL between new.expensify.com and dev.new.expensify.com:8082. That file isn't used by the help/ site at all.

Possible explanations for the visual change:

Caching/stale deployment — the Cloudflare Pages preview might have picked up stale artifacts or a failed build. Try triggering a fresh deploy by pushing an empty commit.
Pre-existing issue — the site may have looked like this in previous preview deploys, and this is the first time it was checked.
Cloudflare Pages preview quirk — preview URLs sometimes behave differently from production (e.g., relative asset paths resolving differently).

I'd suggest comparing against the current production site at newhelp.expensify.com to see if it also looks different, which would confirm the issue predates this PR.

grgia · 2026-05-15T10:47:21Z


      # Manually run Jekyll, bypassing Github Pages
      - name: Build Jekyll site
+        env:


App/docs/_includes/CONST.html

Lines 1 to 7 in 3210e49

{% if jekyll.environment == "production" %}

{% assign MAIN_SITE_URL = "https://new.expensify.com" %}

{% else %}

{% assign MAIN_SITE_URL = "https://dev.new.expensify.com:8082" %}

{% endif %}

{% capture CONCIERGE_CHAT_URL %}{{MAIN_SITE_URL}}/concierge{% endcapture %}

from this, would it be better to flip the if/else and say if its dev, then dev else assume production?

Good point — defaulting to production and only using the dev URL when JEKYLL_ENV is explicitly set to development does sound safer.

cc: @puneetlath

grgia

why do I always comment and forget to do it as a review 🙃 🤠

edit: wait the above says it is a review

puneetlath · 2026-05-19T15:35:31Z

@MelvinBot can you implement that feedback?

MelvinBot · 2026-05-19T15:38:22Z

The feedback from grgia (agreed by brunovjk) is to flip the if/else in docs/_includes/CONST.html so that production is the default and the dev URL is only used when JEKYLL_ENV is explicitly development. This way, if someone forgets to set JEKYLL_ENV, the site defaults to the safe production URL.

Change docs/_includes/CONST.html from:

{% if jekyll.environment == "production" %}
    {% assign MAIN_SITE_URL = "https://new.expensify.com" %}
{% else %}
    {% assign MAIN_SITE_URL = "https://dev.new.expensify.com:8082" %}
{% endif %}

To:

{% if jekyll.environment == "development" %}
    {% assign MAIN_SITE_URL = "https://dev.new.expensify.com:8082" %}
{% else %}
    {% assign MAIN_SITE_URL = "https://new.expensify.com" %}
{% endif %}

With this change, you could also remove the JEKYLL_ENV: production lines you added in the workflow files (.github/workflows/deployExpensifyHelp.yml and .github/workflows/deployNewHelp.yml), since production behavior is now the default.

⚠️ I can't push changes to this PR because I didn't open it and I'm not listed as an assignee. To have me make this fix, add me to the PR assignees and then retry your request.

puneetlath · 2026-05-19T15:41:35Z

@MelvinBot I made you an assignee. Can you push the change now?

Inverts the if/else so production is the default and dev URL is only used when JEKYLL_ENV is explicitly set to development. Removes the now-unnecessary JEKYLL_ENV=production from both deploy workflows. Co-authored-by: Puneet Lath <puneetlath@users.noreply.github.com>

MelvinBot · 2026-05-19T15:44:32Z

Pushed the change in e6dd757. Here's what I did:

Flipped the if/else in docs/_includes/CONST.html — production URL is now the default, dev URL only used when JEKYLL_ENV is explicitly development
Removed JEKYLL_ENV: production from both deployExpensifyHelp.yml and deployNewHelp.yml since it's no longer needed

puneetlath · 2026-05-19T17:30:23Z

@MelvinBot why is the Deploy ExpensifyHelp action failing?

MelvinBot · 2026-05-19T17:32:40Z

The actions-cool/maintain-one-comment action repository has been blocked by GitHub (TOS violation) as of 2026-05-19. This is not related to your PR — it affects all runs of this workflow.

The workflow uses it to post/update a preview comment. You'd need to replace it with an alternative (e.g., peter-evans/create-or-update-comment or marocchino/sticky-pull-request-comment) to unblock this workflow.

puneetlath · 2026-05-19T22:17:45Z

@MelvinBot where do we use actions-cool/maintain-one-comment? And are the other options you mentioned equivalent?

MelvinBot · 2026-05-19T22:19:54Z

It's used in exactly two workflow files, both for posting/updating a Cloudflare Pages preview URL comment on PRs:

deployNewHelp.yml:92 — posts the New Help preview link
deployExpensifyHelp.yml:128 — posts the Expensify Help preview link

Both alternatives I mentioned (peter-evans/create-or-update-comment and marocchino/sticky-pull-request-comment) are functionally equivalent for this use case — they find an existing comment (by marker/header) and update it in place, or create a new one if none exists. The main differences are cosmetic (config field names). marocchino/sticky-pull-request-comment is probably the closest drop-in since it uses a hidden HTML marker to identify the comment, same as actions-cool/maintain-one-comment did.

puneetlath · 2026-05-19T22:21:58Z

@MelvinBot who authored the original workflow that uses actions-cool/maintain-one-comment?

MelvinBot · 2026-05-19T22:27:29Z

AndrewGable added it to deployExpensifyHelp.yml in commit e34b912 ("Add a bit more logic on trigger and commenting").

quinthar (with help from roryabraham) added it to deployNewHelp.yml in commit 689b355 ("With amazing updates from @rory").

brunovjk · 2026-05-20T18:21:58Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

grgia

@puneetlath build is failing but looks like a permissions error

melvin-bot · 2026-05-21T02:14:04Z

@lakchote Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

lakchote

LGTM

grgia · 2026-05-25T10:35:09Z

@puneetlath tests failing

allgandalf

LGTM! Lets ship this 🚀

Found this PR cause i reported similar bug here https://expensify.slack.com/archives/C049HHMV9SM/p1779909312136189

brunovjk · 2026-06-01T13:30:56Z

What else is needed to merge this PR? Thank you.

cc: @puneetlath @allgandalf @grgia

grgia · 2026-06-01T13:57:16Z

@brunovjk tests to pass

grgia · 2026-06-04T05:26:01Z

@MelvinBot

confirm if we need to make this suggestion:

add JEKYLL_ENV: production to the build step in .github/workflows/deployExpensifyHelp.yml. The CONST.html change is correct but inert without it — both must land together.

MelvinBot · 2026-06-04T05:29:46Z

Yes, the suggestion is correct and necessary. As it stands, this PR is a no-op for the deployed help site — the Concierge link will still point to dev.new.expensify.com:8082.

Why: Jekyll defaults jekyll.environment to "development" whenever JEKYLL_ENV is unset. The deploy build step runs plain bundle exec jekyll build with no JEKYLL_ENV (deployExpensifyHelp.yml:70-72), so on deploy jekyll.environment == "development" is true, and the flipped CONST.html resolves MAIN_SITE_URL to the dev URL — same broken output as before the flip.

So JEKYLL_ENV: production must be added to the deploy build step for the fix to take effect. Both must land together, exactly as suggested.

One discrepancy worth flagging: the PR body says it "Sets JEKYLL_ENV=production for both help-site Jekyll deploy build steps," but the diff contains only the CONST.html flip — there is no workflow change in this PR. The described change is missing.

Trace + scope notes

New CONST.html logic:

{% if jekyll.environment == "development" %}  → dev.new.expensify.com:8082
{% else %}                                    → new.expensify.com
{% endif %}

Context	Command	`JEKYLL_ENV`	`jekyll.environment`	Resolved URL
Local serve (`docs/README.md:41`)	`jekyll serve`	unset	`development`	dev ✅ correct
Deploy (current)	`jekyll build`	unset	`development`	dev ❌ should be prod
Deploy (with fix)	`jekyll build`	`production`	`production`	prod ✅

So adding JEKYLL_ENV: production only to the deploy build step is the right move — local dev keeps working via Jekyll's default, and the deploy gets the production URL.

On "both build steps": there are two help workflows — deployExpensifyHelp.yml (builds docs/) and deployNewHelp.yml (builds help/). But help/ does not reference MAIN_SITE_URL/Concierge/CONST.html at all, and there's no help/_includes/CONST.html. For this Concierge-link fix, only deployExpensifyHelp.yml needs the change. Adding it to deployNewHelp.yml too is optional (consistency/future-proofing), not required for this fix.

grgia · 2026-06-15T17:01:36Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e6dd757ada

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector · 2026-06-15T17:04:36Z

+{% if jekyll.environment == "development" %}
    {% assign MAIN_SITE_URL = "https://dev.new.expensify.com:8082" %}


Set JEKYLL_ENV where the deploy build runs

In the inspected deployExpensifyHelp workflow, the production push build at .github/workflows/deployExpensifyHelp.yml:70-72 still runs bundle exec jekyll build without exporting JEKYLL_ENV; with Jekyll's default unset environment being development, this branch still assigns MAIN_SITE_URL to https://dev.new.expensify.com:8082 for deployed help builds. As a result, the generated production help pages continue to send users to the dev Concierge URL instead of https://new.expensify.com/concierge unless the workflow is also changed to set JEKYLL_ENV=production.

Useful? React with 👍 / 👎.

# Conflicts: # .github/workflows/deployNewHelp.yml

…eet-help-build # Conflicts: # .github/workflows/deployNewHelp.yml

OSBotify · 2026-06-19T20:50:36Z

A preview of your ExpensifyHelp changes have been deployed to https://de2f9753.helpdot.pages.dev ⚡️

puneetlath · 2026-06-19T20:51:21Z

This is no longer needed. It was addressed here: #91119

Set JEKYLL_ENV for help deploys

f47429f

puneetlath self-assigned this May 14, 2026

puneetlath requested a review from a team as a code owner May 14, 2026 20:10

puneetlath requested a review from brunovjk May 14, 2026 20:11

melvin-bot Bot requested review from grgia and removed request for a team May 14, 2026 20:11

puneetlath mentioned this pull request May 14, 2026

Set JEKYLL_ENV for help deploys #90243

Closed

52 tasks

grgia reviewed May 15, 2026

View reviewed changes

puneetlath assigned MelvinBot May 19, 2026

grgia approved these changes May 20, 2026

View reviewed changes

grgia reviewed May 20, 2026

View reviewed changes

brunovjk approved these changes May 21, 2026

View reviewed changes

melvin-bot Bot requested a review from lakchote May 21, 2026 02:14

lakchote approved these changes May 21, 2026

View reviewed changes

allgandalf approved these changes May 27, 2026

View reviewed changes

chatgpt-codex-connector Bot reviewed Jun 15, 2026

View reviewed changes

puneetlath added 2 commits June 19, 2026 16:47

Merge remote-tracking branch 'origin/main' into puneet-help-build

f8ee641

# Conflicts: # .github/workflows/deployNewHelp.yml

Merge branch 'puneet-help-build' of github.com:Expensify/App into pun…

4691aa1

…eet-help-build # Conflicts: # .github/workflows/deployNewHelp.yml

puneetlath closed this Jun 19, 2026

	{% if jekyll.environment == "production" %}
	{% assign MAIN_SITE_URL = "https://new.expensify.com" %}
	{% else %}
	{% assign MAIN_SITE_URL = "https://dev.new.expensify.com:8082" %}
	{% endif %}

	{% capture CONCIERGE_CHAT_URL %}{{MAIN_SITE_URL}}/concierge{% endcapture %}

		{% if jekyll.environment == "development" %}
		{% assign MAIN_SITE_URL = "https://dev.new.expensify.com:8082" %}

Uh oh!

Conversation

puneetlath commented May 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented May 14, 2026

Uh oh!

github-actions Bot commented May 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

puneetlath commented May 14, 2026

Uh oh!

MelvinBot commented May 14, 2026

Uh oh!

grgia May 15, 2026

Choose a reason for hiding this comment

Uh oh!

brunovjk May 19, 2026

Choose a reason for hiding this comment

Uh oh!

grgia left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

puneetlath commented May 19, 2026

Uh oh!

MelvinBot commented May 19, 2026

Uh oh!

puneetlath commented May 19, 2026

Uh oh!

MelvinBot commented May 19, 2026

Uh oh!

puneetlath commented May 19, 2026

Uh oh!

MelvinBot commented May 19, 2026

Uh oh!

puneetlath commented May 19, 2026

Uh oh!

MelvinBot commented May 19, 2026

Uh oh!

puneetlath commented May 19, 2026

Uh oh!

MelvinBot commented May 19, 2026

Uh oh!

brunovjk commented May 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

grgia left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented May 21, 2026

Uh oh!

lakchote left a comment

Choose a reason for hiding this comment

Uh oh!

grgia commented May 25, 2026

Uh oh!

allgandalf left a comment

Choose a reason for hiding this comment

Uh oh!

brunovjk commented Jun 1, 2026

Uh oh!

grgia commented Jun 1, 2026

Uh oh!

grgia commented Jun 4, 2026

Uh oh!

MelvinBot commented Jun 4, 2026

Uh oh!

grgia commented Jun 15, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

puneetlath commented May 14, 2026 •

edited

Loading

github-actions Bot commented May 14, 2026 •

edited

Loading

grgia left a comment •

edited

Loading

brunovjk commented May 20, 2026 •

edited

Loading