Skip to content

Commit 7f53f4b

Browse files
authored
Merge pull request #14994 from lampepfl/language-reference-backport
Backport changes from stable documentation branch
2 parents ba8dccb + c0e90be commit 7f53f4b

File tree

4 files changed

+30
-6
lines changed

4 files changed

+30
-6
lines changed

.github/workflows/ci.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ name: Dotty
22

33
on:
44
push:
5+
branches-ignore:
6+
- 'language-reference-stable'
57
pull_request:
8+
branches-ignore:
9+
- 'language-reference-stable'
610
schedule:
711
- cron: '0 3 * * *' # Every day at 3 AM
812
workflow_dispatch:

.github/workflows/cla.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
name: Scala CLA
2-
on: [pull_request]
2+
on:
3+
pull_request:
4+
push:
5+
branches:
6+
- 'language-reference-backport'
37
jobs:
48
check:
59
runs-on: ubuntu-latest
610
steps:
711
- uses: actions/checkout@v2
812
- run: ./project/scripts/check-cla.sh
13+
if: github.event_name == 'pull_request'
914
env:
1015
AUTHOR: ${{ github.event.pull_request.user.login }}

.github/workflows/language-reference.yaml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
with:
2323
path: 'dotty'
2424
ref: 'language-reference-stable'
25+
fetch-depth: 0
2526
ssh-key: ${{ secrets.DOCS_KEY }}
2627

2728
- name: Cache Coursier
@@ -43,8 +44,10 @@ jobs:
4344

4445
- name: Generate reference documentation and test links
4546
run: |
46-
./dotty/project/scripts/sbt scaladoc/generateReferenceDocumentation --no-regenerate-expected-links
47-
./dotty/project/scripts/docsLinksStability ./dotty/scaladoc/output/reference ./dotty/project/scripts/expected-links/reference-expected-links.txt
47+
cd dotty
48+
./project/scripts/sbt scaladoc/generateReferenceDocumentation --no-regenerate-expected-links
49+
./project/scripts/docsLinksStability ./scaladoc/output/reference ./project/scripts/expected-links/reference-expected-links.txt
50+
cd ..
4851
4952
- name: Push changes to scala3-reference-docs
5053
if: github.event_name == 'push'
@@ -63,8 +66,10 @@ jobs:
6366
git config user.name gh-actions
6467
git config user.email [email protected]
6568
git add .
66-
git commit -m "UPDATE ${{ steps.date.outputs.date }}"
67-
git push
69+
if ! git diff-index --quiet HEAD; then
70+
git commit -m "UPDATE ${{ steps.date.outputs.date }}"
71+
git push
72+
fi
6873
cd ..
6974
7075
- name: Merge changes to main
@@ -73,14 +78,20 @@ jobs:
7378
cd dotty
7479
git fetch origin main:main
7580
git checkout main
81+
git config user.name gh-actions
82+
git config user.email [email protected]
7683
git merge language-reference-stable
7784
cd ..
7885
79-
- name: Create pull reuqest with backport to main
86+
- name: Create pull request with backport to main
8087
if: github.event_name == 'push'
8188
uses: peter-evans/create-pull-request@v4
8289
with:
8390
path: dotty
8491
branch: language-reference-backport
8592
labels: area:documentation
93+
title: Backport changes from stable documentation branch
94+
body: This pull request is created automatically after push to stable documentation branch and backports the changes
95+
reviewers: pikinier20,julienrf
96+
assignees: pikinier20
8697

.github/workflows/scaladoc.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ name: scaladoc
22

33
on:
44
push:
5+
branches-ignore:
6+
- 'language-reference-stable'
57
pull_request:
8+
branches-ignore:
9+
- 'language-reference-stable'
610
jobs:
711
build:
812
env:

0 commit comments

Comments
 (0)