From 0056da3ffaf9946e6ccbd330ea9a8452490a0373 Mon Sep 17 00:00:00 2001 From: Tom Grigg Date: Sun, 11 Jul 2021 14:12:49 -0700 Subject: [PATCH 1/3] Revert "Disable community docs" This reverts commit 8cbb8429efcc851f777d55b0ca1008176cd675c8. --- .github/workflows/scaladoc.yaml | 39 +++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/.github/workflows/scaladoc.yaml b/.github/workflows/scaladoc.yaml index a58f4c23c2a8..a55a1de445cc 100644 --- a/.github/workflows/scaladoc.yaml +++ b/.github/workflows/scaladoc.yaml @@ -92,3 +92,42 @@ jobs: - name: Test sourcelinks to stdlib run: ./project/scripts/sbt scaladoc/sourceLinksIntegrationTest:test + + community-docs: + env: + AZURE_STORAGE_SAS_TOKEN: ${{ secrets.AZURE_STORAGE_SAS_TOKEN }} + runs-on: ubuntu-latest + if: "( github.event_name == 'pull_request' + && !contains(github.event.pull_request.body, '[skip ci]') + && !contains(github.event.pull_request.body, '[skip docs]') + ) + || contains(github.event.ref, 'scaladoc') + || contains(github.event.ref, 'scala3doc') + || contains(github.event.ref, 'master')" + + steps: + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Set up JDK 8 + uses: actions/setup-java@v1 + with: + java-version: 8 + + - name: Init submodules + run: git submodule update --init --recursive --jobs 7 + + - name: Generate docs + run: ./project/scripts/sbt "community-build/run doc all docsOutput" + + - name: Upload documentation to server + uses: azure/CLI@v1 + if: env.AZURE_STORAGE_SAS_TOKEN + env: + PR_NUMBER: ${{ github.event.pull_request.number }} + with: + inlineScript: | + DOC_DEST=pr-${PR_NUMBER:-${GITHUB_REF##*/}}-docs + echo uplading docs to https://scala3doc.virtuslab.com/$DOC_DEST + az storage container create --name $DOC_DEST --account-name scala3docstorage --public-access container + az storage blob upload-batch -s community-build/docsOutput -d $DOC_DEST --account-name scala3docstorage From b9d42cd290b47992c8ad78b3aa7e2de4e7b8128c Mon Sep 17 00:00:00 2001 From: Tom Grigg Date: Sun, 11 Jul 2021 14:14:53 -0700 Subject: [PATCH 2/3] drop unwanted CI bits --- .github/workflows/scaladoc.yaml | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/.github/workflows/scaladoc.yaml b/.github/workflows/scaladoc.yaml index a55a1de445cc..474e7a8a8b5c 100644 --- a/.github/workflows/scaladoc.yaml +++ b/.github/workflows/scaladoc.yaml @@ -94,16 +94,10 @@ jobs: run: ./project/scripts/sbt scaladoc/sourceLinksIntegrationTest:test community-docs: - env: - AZURE_STORAGE_SAS_TOKEN: ${{ secrets.AZURE_STORAGE_SAS_TOKEN }} runs-on: ubuntu-latest if: "( github.event_name == 'pull_request' - && !contains(github.event.pull_request.body, '[skip ci]') && !contains(github.event.pull_request.body, '[skip docs]') - ) - || contains(github.event.ref, 'scaladoc') - || contains(github.event.ref, 'scala3doc') - || contains(github.event.ref, 'master')" + )" steps: - name: Git Checkout @@ -119,15 +113,3 @@ jobs: - name: Generate docs run: ./project/scripts/sbt "community-build/run doc all docsOutput" - - - name: Upload documentation to server - uses: azure/CLI@v1 - if: env.AZURE_STORAGE_SAS_TOKEN - env: - PR_NUMBER: ${{ github.event.pull_request.number }} - with: - inlineScript: | - DOC_DEST=pr-${PR_NUMBER:-${GITHUB_REF##*/}}-docs - echo uplading docs to https://scala3doc.virtuslab.com/$DOC_DEST - az storage container create --name $DOC_DEST --account-name scala3docstorage --public-access container - az storage blob upload-batch -s community-build/docsOutput -d $DOC_DEST --account-name scala3docstorage From c1506142a8a3f5087d0be981e34d7d3bdb4ba624 Mon Sep 17 00:00:00 2001 From: Tom Grigg Date: Sun, 11 Jul 2021 15:19:23 -0700 Subject: [PATCH 3/3] scalatest: limit max heap to 5 GB --- community-build/community-projects/scalatest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/community-projects/scalatest b/community-build/community-projects/scalatest index 96650cfbf700..544aaf649377 160000 --- a/community-build/community-projects/scalatest +++ b/community-build/community-projects/scalatest @@ -1 +1 @@ -Subproject commit 96650cfbf7003c198e2759bdca4a9a37dac03cad +Subproject commit 544aaf649377a28531a9bd278140c2921ca20493