Skip to content

Commit c0a09a0

Browse files
Merge branch 'master' into corr_kdocs
# Conflicts: # core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/corr.kt
2 parents 30fc68d + 62b4894 commit c0a09a0

File tree

725 files changed

+137606
-21298
lines changed

Some content is hidden

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

725 files changed

+137606
-21298
lines changed

.github/README_GH_ACTIONS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Anytime the source code changes on [master](https://github.com/Kotlin/dataframe/
2222
this [GitHub Action](./workflows/generated-sources-master.yml) makes sure
2323
[`processKDocsMain`](../KDOC_PREPROCESSING.md),
2424
and `korro` are run. If there have been any changes in either [core/generated-sources](../core/generated-sources) or
25-
[docs/StardustDocs/snippets](../docs/StardustDocs/snippets), these are auto-committed to the branch, to keep
25+
[docs/StardustDocs/resources/snippets](../docs/StardustDocs/resources/snippets), these are auto-committed to the branch, to keep
2626
it up to date.
2727

2828
### Show generated code in PR

.github/workflows/generated-sources-master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
run: |
2727
git config --global user.name 'github-actions[bot]'
2828
git config --global user.email 'github-actions[bot]@users.noreply.github.com'
29-
git add './core/generated-sources' './dataframe-csv/generated-sources' './docs/StardustDocs/snippets' './docs/StardustDocs/topics'
29+
git add './core/generated-sources' './dataframe-csv/generated-sources' './docs/StardustDocs/resources/snippets' './docs/StardustDocs/topics'
3030
git diff --staged --quiet || git commit -m "Automated commit of generated code"
3131
git push
3232
env:

.github/workflows/generated-sources.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ jobs:
4242

4343
- name: Check for changes in generated sources
4444
id: git-diff
45-
run: echo "changed=$(if git diff --quiet './core/generated-sources' './dataframe-csv/generated-sources' './docs/StardustDocs/snippets' './docs/StardustDocs/topics'; then echo 'false'; else echo 'true'; fi)" >> $GITHUB_OUTPUT
45+
run: echo "changed=$(if git diff --quiet './core/generated-sources' './dataframe-csv/generated-sources' './docs/StardustDocs/resources/snippets' './docs/StardustDocs/topics'; then echo 'false'; else echo 'true'; fi)" >> $GITHUB_OUTPUT
4646

4747
- name: Commit and push if changes
4848
id: git-commit
4949
if: steps.git-diff.outputs.changed == 'true'
5050
run: |
5151
git checkout -b generated-sources/docs-update-${{ github.run_number }}
52-
git add './core/generated-sources' './dataframe-csv/generated-sources' './docs/StardustDocs/snippets' './docs/StardustDocs/topics'
52+
git add './core/generated-sources' './dataframe-csv/generated-sources' './docs/StardustDocs/resources/snippets' './docs/StardustDocs/topics'
5353
git commit -m "Update generated sources with recent changes"
5454
git push origin generated-sources/docs-update-${{ github.run_number }}
5555
echo "commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT

.github/workflows/gradle-wrapper-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- uses: actions/checkout@v4
10-
- uses: gradle/actions/wrapper-validation@v3
10+
- uses: gradle/actions/wrapper-validation@v4

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ env:
1717
ALGOLIA_INDEX_NAME: prod_DATAFRAME_HELP
1818
ALGOLIA_KEY: ${{ secrets.ALGOLIA_KEY }}
1919
CONFIG_JSON_PRODUCT: Dataframe
20-
CONFIG_JSON_VERSION: '0.15'
20+
CONFIG_JSON_VERSION: '1.0'
2121

2222
jobs:
2323
build-job:
2424
runs-on: ubuntu-latest
25-
container: registry.jetbrains.team/p/writerside/builder/writerside-builder:2.1.1481-p3872-df
25+
container: registry.jetbrains.team/p/writerside/builder/writerside-builder:2025.04.8412
2626
outputs:
2727
artifact: ${{ steps.generate-artifact.outputs.artifact }}
2828
steps:

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Default ignored files
22
.idea
3+
!.idea/runConfigurations
4+
!.idea/runConfigurations/*.xml
5+
!.idea/externalDependencies.xml
6+
!.idea/vcs.xml
37
.gradle
48
.kotlin
59
build

.idea/externalDependencies.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/Build_Docs_Website.xml

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/Run_Docs_Website_Locally.xml

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)