Skip to content

Commit 931d972

Browse files
committed
Regenerate links and set collation order in sort command
1 parent 34f3282 commit 931d972

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

project/scripts/docsLinksStability

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ EXPECTED_LINKS_FILE=$2 # The location of expected-links.txt is passed as a secon
99

1010
pushd $DOCS_DIR > /dev/null # Go to docs dir but remember previous location
1111
# We need to go to docs dir to make find return correct relative paths
12-
find . -type f -name "*.html" | sort | (popd > /dev/null; diff $EXPECTED_LINKS_FILE -;)
12+
find . -type f -name "*.html" | LC_ALL=C sort | (popd > /dev/null; diff $EXPECTED_LINKS_FILE -;)
1313
# We list every html file in documentation, then sort it and finally compare to the expected links list.
1414
# Before running diff we need to popd to return to the previous location because we don't have relative path to the expected links file.
1515

project/scripts/expected-links/reference-expected-links.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
./changed-features.html
12
./changed-features/compiler-plugins.html
23
./changed-features/eta-expansion-spec.html
34
./changed-features/eta-expansion.html
@@ -20,6 +21,7 @@
2021
./changed-features/type-inference.html
2122
./changed-features/vararg-splices.html
2223
./changed-features/wildcards.html
24+
./contextual.html
2325
./contextual/by-name-context-parameters.html
2426
./contextual/context-bounds.html
2527
./contextual/context-functions-spec.html
@@ -38,6 +40,7 @@
3840
./contextual/using-clauses.html
3941
./docs/reference/other-new-features/named-typeargs.html
4042
./docsScalaLangResources/scaladoc-assets.html
43+
./dropped-features.html
4144
./dropped-features/auto-apply.html
4245
./dropped-features/class-shadowing-spec.html
4346
./dropped-features/class-shadowing.html
@@ -78,6 +81,10 @@
7881
./language-versions/binary-compatibility.html
7982
./language-versions/index.html
8083
./language-versions/source-compatibility.html
84+
<<<<<<< Updated upstream
85+
=======
86+
./metaprogramming.html
87+
>>>>>>> Stashed changes
8188
./metaprogramming/compiletime-ops.html
8289
./metaprogramming/index.html
8390
./metaprogramming/inline.html
@@ -97,6 +104,10 @@
97104
./new-types/type-lambdas.html
98105
./new-types/union-types-spec.html
99106
./new-types/union-types.html
107+
<<<<<<< Updated upstream
108+
=======
109+
./other-new-features.html
110+
>>>>>>> Stashed changes
100111
./other-new-features/control-syntax.html
101112
./other-new-features/creator-applications.html
102113
./other-new-features/experimental-defs.html

project/scripts/regenerateExpectedLinks

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ EXPECTED_LINKS_FILE=$2 # The location of expected-links.txt is passed as a secon
99

1010
pushd $DOCS_DIR > /dev/null # Go to docs dir but remember previous location
1111
# We need to go to docs dir to make find return correct relative paths
12-
find . -type f -name "*.html" | (popd > /dev/null; sort > $2;)
12+
find . -type f -name "*.html" | (popd > /dev/null; LC_ALL=C sort > $2;)
1313
# We list every html file in documentation, then sort it and finally write it to the expected links list file.
1414
# Before writing we need to popd to return to the previous location because we don't have relative path to the expected links file.
1515

0 commit comments

Comments
 (0)