Upgrade to Gatsby 3 and fix Heroku caching #2851
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -41,7 +41,6 @@ tags: | |
| - Version Control | ||
| - AI | ||
| --- | ||
| ``` | ||
|
|
||
| - `title` (**required**) - title of the post. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,8 +3,9 @@ | |
| require('dotenv').config() | ||
| const path = require('path') | ||
| const PRODUCTION_PREFIX = 'dvc-org-prod' | ||
| const { mkdirSync } = require('fs') | ||
|
|
||
| const { DEPLOY_OPTIONS, USE_PRODUCTION_CACHE } = process.env | ||
| const clearCloudflareCache = require('./clear-cloudflare-cache') | ||
|
|
||
| // Generate deploy options from a comma separated string in the DEPLOY_OPTIONS | ||
|
|
@@ -20,6 +21,7 @@ const deployOptions = DEPLOY_OPTIONS | |
| : { | ||
| download: true, | ||
| build: true, | ||
| retry: true, | ||
| upload: true, | ||
| clean: true, | ||
| clearCloudflareCache: true | ||
|
|
@@ -69,9 +71,8 @@ const { | |
| cleanEntry | ||
| } = require('./s3-utils') | ||
| const { move } = require('fs-extra') | ||
| const { downloadAllFromS3, uploadAllToS3, cleanAllLocal } = | ||
| withEntries(cacheDirs) | ||
|
|
||
| function run(command) { | ||
| execSync(command, { | ||
|
|
@@ -86,32 +87,42 @@ async function main() { | |
| // This greatly speeds up PR initial build time. | ||
|
|
||
| if (deployOptions.download) { | ||
| if (USE_PRODUCTION_CACHE) { | ||
| console.warn('USE_PRODUCTION_CACHE is set, downloading from production') | ||
| await downloadAllFromS3(PRODUCTION_PREFIX) | ||
| } else if (emptyPrefix) { | ||
| console.warn( | ||
| `The current prefix "${s3Prefix}" is empty! Attempting to fall back on production cache.` | ||
| ) | ||
| await downloadAllFromS3(PRODUCTION_PREFIX) | ||
| } else { | ||
| await downloadAllFromS3(s3Prefix) | ||
| } | ||
| mkdirSync('.cache/json', { recursive: true }) | ||
|
There was a problem hiding this comment. Mitigation for gatsbyjs/gatsby#33262, already a PR to fix it in gatsbyjs/gatsby#33431 |
||
| } | ||
|
|
||
| if (deployOptions.build) { | ||
| try { | ||
| run('yarn build') | ||
| } catch (buildError) { | ||
| if (deployOptions.retry) { | ||
| // Sometimes gatsby build fails because of bad cache. | ||
| // Clear it and try again. | ||
|
|
||
| console.error('------------------------\n\n') | ||
| console.error('The first Gatsby build attempt failed!\n') | ||
| console.error(buildError) | ||
| console.error('\nRetrying with a cleared cache:\n') | ||
|
|
||
| // Clear only .cache so we re-use images | ||
| await cleanEntry(cacheDirs[1]) | ||
|
|
||
| run('yarn build') | ||
| } else { | ||
| throw new Error( | ||
| 'The first Gatsby build attempt failed, and DEPLOY_OPTIONS does not include "retry"' | ||
| ) | ||
| } | ||
|
Comment on lines
+108
to
+125
There was a problem hiding this comment. Just here to debug caching without wasting time on the rebuild if it fails. |
||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| #!/usr/bin/env bash | ||
| NEWPWD="/tmp/gatsby-build" | ||
| mv $OLDPWD $NEWPWD | ||
| ln -s $NEWPWD $OLDPWD | ||
| cd $NEWPWD | ||
| ./scripts/deploy-with-s3.js | ||
|
Comment on lines
+1
to
+6
There was a problem hiding this comment. Moves the unstable Heroku build path (exposed via |
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
At some point between our current pinned versions and now, the default placeholder got changed from blur to a "dominant color" strategy. I've changed the default back to blur for parity.
It doesn't seem there's any hit to build time for doing this, my first attempt looked like it but was a false positive.