Skip to content

Commit e7ac7c2

Browse files
authored
Merge pull request #5048 from segmentio/develop
Release 23.29.2
2 parents 15337ad + 3fbedd0 commit e7ac7c2

File tree

37 files changed

+1281
-1937
lines changed

37 files changed

+1281
-1937
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The most interesting ones are:
4141

4242
**Save all images locally! No linking to third-party hosted images!** Images are published to our CDN from the build step, and this means they won't go missing if the hosting service dujour goes out of business.
4343

44-
There are no _enforced_ naming conventions at this time. Files that start with an underscore are ignored by Jekyll. Anything you see with `asset` was dowloaded by a script to migrate it out of Contents.io.
44+
There are no _enforced_ naming conventions at this time. Files that start with an underscore are ignored by Jekyll. Anything you see with `asset` was downloaded by a script to migrate it out of Contents.io.
4545

4646
In general, it's a good practice to name images with a description that helps you (& other docs maintainers) figure out where they should go within a page, or within a larger folder of images.
4747

@@ -101,7 +101,7 @@ Front matter variables have unique functions, including the following:
101101
- `hide-personas-partial`: defaults to false. When true, hides the section of content from `destination-footer.md` that talks about being able to receive personas data.
102102
- `integration_type`: This is set in the `_config.yml` on three paths to add a noun (Source, Destination, or Warehouse) to the end of the title, and the end of the title tag in the html layout. It also controls the layout and icon for some of these.
103103
- `source-type`: These are only used to supplement when a Cloud App in the sources path doesn't appear in the Config API list, and needs its type explicitly set. It runs some logic in the `cloud-app-note.md` to explain which cloud-apps are object vs event sources.
104-
104+
- `private`: Used to indicate that a destination is not publicly available (Private Beta or Pilot status), and is not available in the public catalog. When `private: true`, the build pulls integration metadata from `src/_data/catalog/destinations_private.yml`. To update the list of private destinations, use the `make private_destination` command, and enter the integration's ID when prompted.
105105
#### Utility front matter
106106
- `published`: defaults to true. Set this to "false" to prevent Jekyll from rendering an HTML page for this file. Good for when you're working on something in the repo but aren't ready to release it yet, and don't want to use a Draft PR.
107107
- `hidden`: omits the file from the `sitemap.xml`, adds a `<meta name="robots" content="noindex" />` to the top of the generated HTML file, and drops it from the convenience script for regenerating the nav.

Makefile

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -55,28 +55,7 @@ package: build
5555
serve: package
5656
@docker run -p 4000:80 segment-docs:latest
5757

58-
# gives us user-transparent way to swap between two different systems
59-
.PHONY: catalog
60-
catalog: catalog-papi
61-
62-
# uses the old configapi
63-
.PHONY: capi
64-
capi: vendor/bundle
65-
@node scripts/catalog_capi.js
66-
67-
# shorter alias
68-
.PHONY: catalog-capi
69-
catalog-capi: vendor/bundle
70-
@node scripts/catalog_capi.js
71-
72-
# uses the new public api
73-
.PHONY: catalog-papi
74-
catalog-papi: vendor/bundle
75-
@node scripts/catalog_papi.js
76-
77-
# shorter alias
78-
.PHONY: papi
79-
papi: vendor/bundle
58+
catalog:
8059
@node scripts/catalog_papi.js
8160

8261
# make the list of beta connections

branches.txt

Lines changed: 577 additions & 0 deletions
Large diffs are not rendered by default.

netlify.toml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
[build]
2+
# This line defines the command that is run during production builds
3+
# It first updated the Algolia index through the Algolia plugin for Jekyll
4+
# then runs the standard build command. See package.json for more details
5+
# about the available build targets (develop, develop-inc, build)
26
command = "jekyll algolia && yarn build"
3-
# Ignore builds unless [netlify-build] is present in commit message
4-
# ignore = "git log -1 --pretty=%B | ( ! grep -q '\[netlify\-build\]' )"
5-
# Ignore if [netlify-ignore] is present
6-
7-
# Don't build if there are no changes to src/
8-
## ignore = "git diff --quiet HEAD^ HEAD src/"
97

108
[context.deploy-preview]
9+
# For deploy previews, use the testing Jekyll environment, the develop build target calls
1110
command = "yarn develop"
11+
# Check this file to see if the site should build. ignore.sh checks for the presence of
12+
# [netlify-build] in the commit message
1213
ignore = "./scripts/ignore.sh"
1314

1415
[context.branch-deploy]
@@ -19,20 +20,20 @@
1920
command = "yarn develop"
2021

2122
[[redirects]]
23+
# Don't touch these settings. They are required for the redirect to work, since the docs site
24+
# is located at /docs and not the root of the site.
2225
from = "/docs/*"
2326
to = "/:splat"
2427
status = 200
2528

2629
[[redirects]]
30+
# Sam thing as above, but specifically for the js bundle
2731
from = "/docs/assets/docs.bundle.js"
2832
to = "/assets/docs.bundle.js"
2933
status = 200
3034

3135
# [[plugins]]
32-
# package = "netlify-plugin-jekyll-cache"
33-
34-
# [plugins.inputs]
35-
# jekyllSource = "/src"
36+
# if we want to include plugins, this is where to ensure they run
3637

3738

3839
[[headers]]

scripts/add_id.js

Lines changed: 0 additions & 177 deletions
This file was deleted.

scripts/atom.sh

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)