Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 remove invalid buildkite step #4278

Merged
merged 1 commit into from
Dec 10, 2024
+2 −14
Merged

🐛 remove invalid buildkite step #4278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions adminSiteServer/mockSiteRouter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,13 +418,6 @@ getPlainRouteWithROTransaction(
}
)

mockSiteRouter.use(
"/images/published",
express.static(path.join(DEFAULT_LOCAL_BAKE_DIR, "images/published"), {
fallthrough: false,
})
)

mockSiteRouter.use(
// Not all /app/uploads paths are going through formatting
// and being rewritten as /uploads. E.g. blog index images paths
Expand Down
3 changes: 0 additions & 3 deletions ops/buildkite/deploy-content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,6 @@ create_dist() {

"${RSYNC_COMMAND[@]}" live-data/bakedSite/ dist/

# remove .etag of gdoc images from dist
rm dist/images/published/*.etag

# copy over Pages Functions as-is
rsync -havzq --delete owid-grapher/functions dist/
rsync -havzq owid-grapher/wrangler.toml dist/
Expand Down
2 changes: 0 additions & 2 deletions packages/@ourworldindata/types/src/gdocTypes/GdocConstants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ export const RESEARCH_AND_WRITING_ID = "research-writing"

export const RESEARCH_AND_WRITING_DEFAULT_HEADING = "Research & Writing"

export const IMAGES_DIRECTORY = "/images/published/"

/** Works for:
* https://docs.google.com/document/d/abcd1234
* https://docs.google.com/document/d/abcd1234/
Expand Down
4 changes: 2 additions & 2 deletions site/search/searchTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ export interface PageRecord {
date?: string
modifiedDate?: string
tags?: string[]
// Either a URL (for WP posts) or a filepath (for GDocs)
// WP example: https://ourworldindata.org/wp-content/uploads/2021/03/Biodiversity-thumbnail.png
// GDoc example: /images/published/artificial-intelligence-featured-image_100.png
// GDoc example: https://imagedelivery.net/our-id/image-uuid/w=512
// Fallback example: https://ourworldindta.org/default-thumbnail.png
thumbnailUrl: string
documentType?: "wordpress" | "gdoc" | "country-page"
}
Expand Down
Loading