Skip to content

Commit 6f87073

Browse files
authored
Merge pull request #6075 from influxdata/6072-update-the-latest-stable-oss-callout-to-3-core
6072 update the latest stable oss callout to 3 core
2 parents 2cd8687 + 8a7edf0 commit 6f87073

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+3238
-537
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
command: cd api-docs && bash generate-api-docs.sh
3232
- run:
3333
name: Inject Flux stdlib frontmatter
34-
command: node ./flux-build-scripts/inject-flux-stdlib-frontmatter.js
34+
command: node ./flux-build-scripts/inject-flux-stdlib-frontmatter.cjs
3535
- run:
3636
name: Update Flux/InfluxDB versions
37-
command: node ./flux-build-scripts/update-flux-versions.js
37+
command: node ./flux-build-scripts/update-flux-versions.cjs
3838
- save_cache:
3939
key: install-{{ .Environment.CACHE_VERSION }}-{{ checksum ".circleci/config.yml" }}
4040
paths:

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ node_modules
1616
!telegraf-build/scripts
1717
!telegraf-build/README.md
1818
/cypress/screenshots/*
19+
/cypress/videos/*
20+
test-results.xml
1921
/influxdb3cli-build-scripts/content
2022
.vscode/*
2123
.idea

.husky/_/serve

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
#!/bin/sh
2+
3+
if [ "$LEFTHOOK_VERBOSE" = "1" -o "$LEFTHOOK_VERBOSE" = "true" ]; then
4+
set -x
5+
fi
6+
7+
if [ "$LEFTHOOK" = "0" ]; then
8+
exit 0
9+
fi
10+
11+
call_lefthook()
12+
{
13+
if test -n "$LEFTHOOK_BIN"
14+
then
15+
"$LEFTHOOK_BIN" "$@"
16+
elif lefthook -h >/dev/null 2>&1
17+
then
18+
lefthook "$@"
19+
else
20+
dir="$(git rev-parse --show-toplevel)"
21+
osArch=$(uname | tr '[:upper:]' '[:lower:]')
22+
cpuArch=$(uname -m | sed 's/aarch64/arm64/;s/x86_64/x64/')
23+
if test -f "$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook"
24+
then
25+
"$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook" "$@"
26+
elif test -f "$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook"
27+
then
28+
"$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook" "$@"
29+
elif test -f "$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook"
30+
then
31+
"$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook" "$@"
32+
elif test -f "$dir/node_modules/lefthook/bin/index.js"
33+
then
34+
"$dir/node_modules/lefthook/bin/index.js" "$@"
35+
36+
elif bundle exec lefthook -h >/dev/null 2>&1
37+
then
38+
bundle exec lefthook "$@"
39+
elif yarn lefthook -h >/dev/null 2>&1
40+
then
41+
yarn lefthook "$@"
42+
elif pnpm lefthook -h >/dev/null 2>&1
43+
then
44+
pnpm lefthook "$@"
45+
elif swift package plugin lefthook >/dev/null 2>&1
46+
then
47+
swift package --disable-sandbox plugin lefthook "$@"
48+
elif command -v mint >/dev/null 2>&1
49+
then
50+
mint run csjones/lefthook-plugin "$@"
51+
else
52+
echo "Can't find lefthook in PATH"
53+
fi
54+
fi
55+
}
56+
57+
call_lefthook run "serve" "$@"

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v23.10.0

CONTRIBUTING.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ For the linting and tests to run, you need to install Docker and Node.js
2828
dependencies.
2929

3030
\_**Note:**
31-
We strongly recommend running linting and tests, but you can skip them
32-
(and avoid installing dependencies)
31+
The git pre-commit and pre-push hooks are configured to run linting and tests automatically
32+
when you commit or push changes.
33+
We strongly recommend letting them run, but you can skip them
34+
(and avoid installing related dependencies)
3335
by including the `--no-verify` flag with your commit--for example, enter the following command in your terminal:
3436

3537
```sh
@@ -51,7 +53,7 @@ dev dependencies used in pre-commit hooks for linting, syntax-checking, and test
5153
Dev dependencies include:
5254

5355
- [Lefthook](https://github.com/evilmartians/lefthook): configures and
54-
manages pre-commit hooks for linting and testing Markdown content.
56+
manages git pre-commit and pre-push hooks for linting and testing Markdown content.
5557
- [prettier](https://prettier.io/docs/en/): formats code, including Markdown, according to style rules for consistency
5658
- [Cypress]: e2e testing for UI elements and URLs in content
5759

@@ -93,9 +95,11 @@ Make your suggested changes being sure to follow the [style and formatting guide
9395

9496
## Lint and test your changes
9597

98+
`package.json` contains scripts for running tests and linting.
99+
96100
### Automatic pre-commit checks
97101

98-
docs-v2 uses Lefthook to manage Git hooks, such as pre-commit hooks that lint Markdown and test code blocks.
102+
docs-v2 uses Lefthook to manage Git hooks that run during pre-commit and pre-push. The hooks run the scripts defined in `package.json` to lint Markdown and test code blocks.
99103
When you try to commit changes (`git commit`), Git runs
100104
the commands configured in `lefthook.yml` which pass your **staged** files to Vale,
101105
Prettier, Cypress (for UI tests and link-checking), and Pytest (for testing Python and shell code in code blocks).

api-docs/.config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins:
2-
- './../openapi/plugins/docs-plugin.js'
2+
- './../openapi/plugins/docs-plugin.cjs'
33
extends:
44
- recommended
55
- docs/all

api-docs/influxdb/cloud/.config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins:
2-
- '../../openapi/plugins/docs-plugin.js'
2+
- '../../openapi/plugins/docs-plugin.cjs'
33
extends:
44
- recommended
55
- docs/all

api-docs/influxdb/v2/.config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins:
2-
- '../../openapi/plugins/docs-plugin.js'
2+
- '../../openapi/plugins/docs-plugin.cjs'
33
extends:
44
- recommended
55
- docs/all

api-docs/influxdb3/cloud-dedicated/.config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins:
2-
- '../../openapi/plugins/docs-plugin.js'
2+
- '../../openapi/plugins/docs-plugin.cjs'
33
extends:
44
- recommended
55
- docs/all

api-docs/influxdb3/cloud-serverless/.config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins:
2-
- '../../openapi/plugins/docs-plugin.js'
2+
- '../../openapi/plugins/docs-plugin.cjs'
33
extends:
44
- recommended
55
- docs/all

0 commit comments

Comments
 (0)