From fdd45f82ef2025fa37b95ccefe4c169ef1215401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Tue, 12 Apr 2022 16:54:23 +0200 Subject: [PATCH 1/7] Fix generation step --- .github/workflows/language-reference.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/language-reference.yaml b/.github/workflows/language-reference.yaml index 4a1277ac2c50..622a87219771 100644 --- a/.github/workflows/language-reference.yaml +++ b/.github/workflows/language-reference.yaml @@ -43,8 +43,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' From d83a90f98a59dedafcf95423d32c66648870afc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Tue, 12 Apr 2022 17:57:56 +0200 Subject: [PATCH 2/7] Set fetch_depth to 0 --- .github/workflows/language-reference.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/language-reference.yaml b/.github/workflows/language-reference.yaml index 622a87219771..c457276e4a8c 100644 --- a/.github/workflows/language-reference.yaml +++ b/.github/workflows/language-reference.yaml @@ -22,6 +22,7 @@ jobs: with: path: 'dotty' ref: 'language-reference-stable' + fetch-depth: 0 ssh-key: ${{ secrets.DOCS_KEY }} - name: Cache Coursier From 99d660942e7f04b8d512ac08fd6205680ecde159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Wed, 20 Apr 2022 11:34:37 +0200 Subject: [PATCH 3/7] Prevent workflow from failing when there's nothing to commit --- .github/workflows/language-reference.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/language-reference.yaml b/.github/workflows/language-reference.yaml index c457276e4a8c..74a0ebd0008d 100644 --- a/.github/workflows/language-reference.yaml +++ b/.github/workflows/language-reference.yaml @@ -66,8 +66,10 @@ jobs: git config user.name gh-actions git config user.email actions@github.com 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 @@ -79,7 +81,7 @@ jobs: 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: From 30d298fec986bff67a8e1968972ada83b5ee5537 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Wed, 20 Apr 2022 11:42:43 +0200 Subject: [PATCH 4/7] Add user identity for commiting to dotty --- .github/workflows/language-reference.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/language-reference.yaml b/.github/workflows/language-reference.yaml index 74a0ebd0008d..1f94d53eb9d0 100644 --- a/.github/workflows/language-reference.yaml +++ b/.github/workflows/language-reference.yaml @@ -78,6 +78,8 @@ jobs: cd dotty git fetch origin main:main git checkout main + git config user.name gh-actions + git config user.email actions@github.com git merge language-reference-stable cd .. From 439185d3ef4f68f7a667032439f9de73fb6695ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Wed, 20 Apr 2022 13:28:15 +0200 Subject: [PATCH 5/7] Turn off standard CI on documentation branches. Adjust title and body of backport PR. --- .github/workflows/ci.yaml | 5 +++++ .github/workflows/language-reference.yaml | 4 ++++ .github/workflows/scaladoc.yaml | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 91add81f44ae..a1c40211deb4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,7 +2,12 @@ name: Dotty on: push: + branches-ignore: + - 'language-reference-stable' + - 'language-reference-backport' pull_request: + branches-ignore: + - 'language-reference-stable' schedule: - cron: '0 3 * * *' # Every day at 3 AM workflow_dispatch: diff --git a/.github/workflows/language-reference.yaml b/.github/workflows/language-reference.yaml index 1f94d53eb9d0..1668b5424fa4 100644 --- a/.github/workflows/language-reference.yaml +++ b/.github/workflows/language-reference.yaml @@ -90,4 +90,8 @@ jobs: 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 diff --git a/.github/workflows/scaladoc.yaml b/.github/workflows/scaladoc.yaml index 4c8d2968a313..9ed3bcaedd39 100644 --- a/.github/workflows/scaladoc.yaml +++ b/.github/workflows/scaladoc.yaml @@ -2,7 +2,12 @@ name: scaladoc on: push: + branches-ignore: + - 'language-reference-stable' + - 'language-reference-backport' pull_request: + branches-ignore: + - 'language-reference-stable' jobs: build: env: From b407d34ea3f55c88d654f26457489862db911040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Wed, 20 Apr 2022 13:51:07 +0200 Subject: [PATCH 6/7] Revert excluding backport branch from CI --- .github/workflows/ci.yaml | 1 - .github/workflows/scaladoc.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a1c40211deb4..42176a760e1b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -4,7 +4,6 @@ on: push: branches-ignore: - 'language-reference-stable' - - 'language-reference-backport' pull_request: branches-ignore: - 'language-reference-stable' diff --git a/.github/workflows/scaladoc.yaml b/.github/workflows/scaladoc.yaml index 9ed3bcaedd39..bab4ac71fe46 100644 --- a/.github/workflows/scaladoc.yaml +++ b/.github/workflows/scaladoc.yaml @@ -4,7 +4,6 @@ on: push: branches-ignore: - 'language-reference-stable' - - 'language-reference-backport' pull_request: branches-ignore: - 'language-reference-stable' From 83e76c18d50195a6105478eae042e0c1952c64d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Thu, 21 Apr 2022 10:07:45 +0200 Subject: [PATCH 7/7] Trigger CLA check on push to backport branch. --- .github/workflows/cla.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index 53800df7bb00..ebe65dfc3cde 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -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 }}