Skip to content

Backport changes from stable documentation branch #15100

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

Merged
merged 3 commits into from
May 5, 2022
Merged

Backport changes from stable documentation branch #15100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab4172f
Fix definition of task generateReferenceDocumentation
julienrf Apr 29, 2022
e0e9e35
Merge pull request #15076 from scalacenter/fix-generate-reference-doc…
julienrf May 4, 2022
99749d9
Merge branch 'language-reference-stable'
actions-user May 4, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/language-reference.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Generate reference documentation and test links
run: |
cd dotty
./project/scripts/sbt scaladoc/generateReferenceDocumentation --no-regenerate-expected-links
./project/scripts/sbt "scaladoc/generateReferenceDocumentation --no-regenerate-expected-links"
./project/scripts/docsLinksStability ./scaladoc/output/reference ./project/scripts/expected-links/reference-expected-links.txt
cd ..

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scaladoc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
run: ./project/scripts/sbt scaladoc/generateTestcasesDocumentation

- name: Generate reference documentation
run: ./project/scripts/sbt scaladoc/generateReferenceDocumentation --no-regenerate-expected-links
run: ./project/scripts/sbt scaladoc/generateReferenceDocumentation

- name: Generate Scala 3 documentation
run: ./project/scripts/sbt scaladoc/generateScalaDocumentation
Expand Down
2 changes: 1 addition & 1 deletion project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1380,7 +1380,7 @@ object Build {
}.value,

generateReferenceDocumentation := Def.inputTaskDyn {
val shouldRegenerateExpectedLinks = literal("--no-regenerate-expected-links").?.parsed.isEmpty
val shouldRegenerateExpectedLinks = (Space ~> literal("--no-regenerate-expected-links")).?.parsed.isEmpty

val temp = IO.createTemporaryDirectory
IO.copyDirectory(file("docs"), temp / "docs")
Expand Down