Skip to content

Backport changes from stable documentation branch #14994

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.

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 8 commits into from
Apr 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ name: Dotty

on:
push:
branches-ignore:
- 'language-reference-stable'
pull_request:
branches-ignore:
- 'language-reference-stable'
schedule:
- cron: '0 3 * * *' # Every day at 3 AM
workflow_dispatch:
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/cla.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
name: Scala CLA
on: [pull_request]
on:
pull_request:
push:
branches:
- 'language-reference-backport'
jobs:
check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- run: ./project/scripts/check-cla.sh
if: github.event_name == 'pull_request'
env:
AUTHOR: ${{ github.event.pull_request.user.login }}
21 changes: 16 additions & 5 deletions .github/workflows/language-reference.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
with:
path: 'dotty'
ref: 'language-reference-stable'
fetch-depth: 0
ssh-key: ${{ secrets.DOCS_KEY }}

- name: Cache Coursier
Expand All @@ -43,8 +44,10 @@ jobs:

- name: Generate reference documentation and test links
run: |
./dotty/project/scripts/sbt scaladoc/generateReferenceDocumentation --no-regenerate-expected-links
./dotty/project/scripts/docsLinksStability ./dotty/scaladoc/output/reference ./dotty/project/scripts/expected-links/reference-expected-links.txt
cd dotty
./project/scripts/sbt scaladoc/generateReferenceDocumentation --no-regenerate-expected-links
./project/scripts/docsLinksStability ./scaladoc/output/reference ./project/scripts/expected-links/reference-expected-links.txt
cd ..

- name: Push changes to scala3-reference-docs
if: github.event_name == 'push'
Expand All @@ -63,8 +66,10 @@ jobs:
git config user.name gh-actions
git config user.email [email protected]
git add .
git commit -m "UPDATE ${{ steps.date.outputs.date }}"
git push
if ! git diff-index --quiet HEAD; then
git commit -m "UPDATE ${{ steps.date.outputs.date }}"
git push
fi
cd ..

- name: Merge changes to main
Expand All @@ -73,14 +78,20 @@ jobs:
cd dotty
git fetch origin main:main
git checkout main
git config user.name gh-actions
git config user.email [email protected]
git merge language-reference-stable
cd ..

- name: Create pull reuqest with backport to main
- name: Create pull request with backport to main
if: github.event_name == 'push'
uses: peter-evans/create-pull-request@v4
with:
path: dotty
branch: language-reference-backport
labels: area:documentation
title: Backport changes from stable documentation branch
body: This pull request is created automatically after push to stable documentation branch and backports the changes
reviewers: pikinier20,julienrf
assignees: pikinier20

4 changes: 4 additions & 0 deletions .github/workflows/scaladoc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ name: scaladoc

on:
push:
branches-ignore:
- 'language-reference-stable'
pull_request:
branches-ignore:
- 'language-reference-stable'
jobs:
build:
env:
Expand Down