Skip to content

Commit 3f97a87

Browse files
authored
Merge pull request #13140 from BarkingBad/scaladoc/markdowns-preprocessor
Scaladoc markdown preprocessor
2 parents 688c2ca + b8e4571 commit 3f97a87

File tree

70 files changed

+558
-563
lines changed

Some content is hidden

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

70 files changed

+558
-563
lines changed

.github/workflows/ci.yaml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -470,9 +470,12 @@ jobs:
470470
if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'"
471471
env:
472472
NIGHTLYBUILD: yes
473-
BOT_TOKEN: ${{ secrets.BOT_TOKEN }} # If you need to change this:
474-
# Generate one at https://github.com/settings/tokens
475-
# Make sure you have the write permissions to the repo: https://github.com/lampepfl/dotty-website
473+
DOTTY_WEBSITE_BOT_TOKEN: ${{ secrets.BOT_TOKEN }} # If you need to change this:
474+
# Generate one at https://github.com/settings/tokens
475+
# Make sure you have the write permissions to the repo: https://github.com/lampepfl/dotty-website
476+
DOCS_SCALALANG_BOT_TOKEN: ${{ secrets.DOCS_SCALALANG_BOT_TOKEN }} # If you need to change this:
477+
# Generate one at https://github.com/settings/tokens
478+
# Make sure you have the write permissions to the repo: https://github.com/scala/docs.scala-lang
476479

477480
steps:
478481
- name: Reset existing repo
@@ -494,14 +497,26 @@ jobs:
494497
run: |
495498
./project/scripts/genDocs -doc-snapshot
496499
497-
- name: Deploy Website
500+
- name: Deploy Website to dotty-website
498501
uses: peaceiris/actions-gh-pages@v3
499502
with:
500-
personal_token: ${{ secrets.BOT_TOKEN }}
503+
personal_token: ${{ env.DOTTY_WEBSITE_BOT_TOKEN }}
501504
publish_dir: docs/_site
502505
external_repository: lampepfl/dotty-website
503506
publish_branch: gh-pages
504507

508+
- name: Generate docs.scala-lang preprocessed files
509+
run: |
510+
./project/scripts/genDocsScalaLang
511+
512+
- name: Deploy Website to docs.scala-lang
513+
uses: peaceiris/actions-gh-pages@v3
514+
with:
515+
personal_token: ${{ env.DOCS_SCALALANG_BOT_TOKEN }}
516+
publish_dir: docsScalaLang
517+
external_repository: BarkingBad/docs.scala-lang
518+
publish_branch: dev
519+
505520
publish_release:
506521
runs-on: [self-hosted, Linux]
507522
container:

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,3 +105,7 @@ compiler/test-coursier/run/*.jar
105105

106106
# Docs
107107
docs-for-dotty-page/*
108+
109+
# docs.scala-lang deplyment temp dir
110+
docsScalaLang/
111+
docs/_site/

docs/docs/reference/changed-features.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
title: "Other Changed Features"
33
type: chapter
4-
num: 51
5-
previous-page: /scala3/reference/other-new-features/type-test
4+
num: 52
5+
previous-page: /scala3/reference/other-new-features/experimental-defs
66
next-page: /scala3/reference/changed-features/numeric-literals
77
---
88

docs/docs/reference/changed-features/compiler-plugins.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Changes in Compiler Plugins"
33
type: section
4-
num: 67
4+
num: 68
55
previous-page: /scala3/reference/changed-features/eta-expansion
66
next-page: /scala3/reference/changed-features/lazy-vals-init
77
---

docs/docs/reference/changed-features/eta-expansion.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Automatic Eta Expansion"
33
type: section
4-
num: 66
4+
num: 67
55
previous-page: /scala3/reference/changed-features/pattern-matching
66
next-page: /scala3/reference/changed-features/compiler-plugins
77
---

docs/docs/reference/changed-features/implicit-conversions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Implicit Conversions"
33
type: section
4-
num: 60
4+
num: 61
55
previous-page: /scala3/reference/changed-features/implicit-resolution
66
next-page: /scala3/reference/changed-features/overload-resolution
77
---

docs/docs/reference/changed-features/implicit-resolution.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Changes in Implicit Resolution"
33
type: section
4-
num: 59
4+
num: 60
55
previous-page: /scala3/reference/changed-features/type-inference
66
next-page: /scala3/reference/changed-features/implicit-conversions
77
---

docs/docs/reference/changed-features/imports.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Imports"
33
type: section
4-
num: 56
4+
num: 57
55
previous-page: /scala3/reference/changed-features/wildcards
66
next-page: /scala3/reference/changed-features/type-checking
77
---

docs/docs/reference/changed-features/lazy-vals-init.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Lazy Vals Initialization
33
type: section
4-
num: 68
4+
num: 69
55
previous-page: /scala3/reference/changed-features/compiler-plugins
66
next-page: /scala3/reference/changed-features/main-functions
77
---

docs/docs/reference/changed-features/main-functions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Main Methods"
33
type: section
4-
num: 69
4+
num: 70
55
previous-page: /scala3/reference/changed-features/lazy-vals-init
66
next-page: /scala3/reference/dropped-features
77
---

0 commit comments

Comments
 (0)