resolve conflicts

Author: rochala

.github/workflows/ci.yaml

@@ -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:
@@ -367,49 +371,6 @@ jobs:
         if: ${{ always() }}
         run: cat community-build/dotty-community-build-deps || true
 
-  community_build_forward_compat:
-    runs-on: [self-hosted, Linux]
-    container:
-      image: lampepfl/dotty:2021-03-22
-      options: --cpu-shares 4096
-      volumes:
-        - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
-        - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
-        - ${{ github.workspace }}/../../cache/general:/root/.cache
-    if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
-        || (
-           github.event_name == 'pull_request'
-           && !contains(github.event.pull_request.body, '[skip ci]')
-           && !contains(github.event.pull_request.body, '[skip community_build]')
-           && contains(github.event.pull_request.body, '[test_forward_compat]')
-         )
-         || (
-           github.event_name == 'workflow_dispatch'
-           && github.repository == 'lampepfl/dotty'
-         )"
-
-    steps:
-      - name: Reset existing repo
-        run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
-
-      - name: Checkout cleanup script
-        uses: actions/checkout@v2
-
-      - name: Cleanup
-        run: .github/workflows/cleanup.sh
-
-      - name: Git Checkout
-        uses: actions/checkout@v2
-
-      - name: Add SBT proxy repositories
-        run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
-
-      - name: Test
-        run: |
-          git submodule sync
-          git submodule update --init --recursive --jobs 7
-          ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestForwardCompat"
-
   test_sbt:
     runs-on: [self-hosted, Linux]
     container:
@@ -509,7 +470,7 @@ jobs:
         - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
         - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
         - ${{ github.workspace }}/../../cache/general:/root/.cache
-    needs: [test_non_bootstrapped, test, mima, community_build_a, community_build_b, community_build_c, community_build_forward_compat, test_sbt, test_java8]
+    needs: [test_non_bootstrapped, test, mima, community_build_a, community_build_b, community_build_c, test_sbt, test_java8]
     if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'"
     env:
       NIGHTLYBUILD: yes
@@ -600,6 +561,44 @@ jobs:
           external_repository: lampepfl/dotty-website
           publish_branch: gh-pages
 
+  nightly_unmanaged_community_build:
+    # Self-hosted runner is used only for getting current build version
+    runs-on: [self-hosted, Linux]
+    container:
+      image: lampepfl/dotty:2021-03-22
+      options: --cpu-shares 4096
+      volumes:
+        - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
+        - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
+        - ${{ github.workspace }}/../../cache/general:/root/.cache
+    needs: [publish_nightly]
+    if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'"
+    env:
+      NIGHTLYBUILD: yes
+    steps:
+      - name: Reset existing repo
+        run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
+
+      - name: Checkout cleanup script
+        uses: actions/checkout@v2
+
+      - name: Cleanup
+        run: .github/workflows/cleanup.sh
+
+      - name: Git Checkout
+        uses: actions/checkout@v2
+
+      - name: Add SBT proxy repositories
+        run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
+
+      - name: Get version string for this build
+        run: |
+          ver=$(./project/scripts/sbt "print scala3-compiler-bootstrapped/version" | tail -n1)
+          echo "This build version: $ver"
+          echo "THISBUILD_VERSION=$ver" >> $GITHUB_ENV
+      # Steps above are copy-pasted from publish_nightly, needed only to resolve THISBUILD_VERSION
+      - name: Trigger unmanaged community build
+        run: .github/workflows/scripts/triggerUnmanagedCommunityBuild.sh "${{ secrets.BUILD_TOKEN }}" "$THISBUILD_VERSION"
 
   publish_release:
     runs-on: [self-hosted, Linux]

.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 }}

.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
@@ -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'
@@ -63,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
@@ -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 actions@github.com
           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
 

.github/workflows/scaladoc.yaml

@@ -2,7 +2,11 @@ name: scaladoc
 
 on:
   push:
+    branches-ignore:
+      - 'language-reference-stable'
   pull_request:
+    branches-ignore:
+      - 'language-reference-stable'
 jobs:
   build:
     env:

.github/workflows/scripts/triggerUnmanagedCommunityBuild.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+# This is script for triggering unamanged community build upon releasing nightly version.
+# Script sends request to CB Jenkins instance to start the build for given released Scala version
+# Prints url of created job to stdout
+#
+# Requirement:
+#   - the latest (nightly) version of scala should be published
+
+set -u
+
+if [ $# -ne 2 ]; then
+  echo "Wrong number of script arguments, expected <token> <scala-version>, got $#: $@"
+  exit 1
+fi
+
+CB_ENDPOINT=https://scala3.westeurope.cloudapp.azure.com
+CB_BUILD_TOKEN="$1"
+SCALA_VERSION="$2"
+
+startRunResponse=$(curl "${CB_ENDPOINT}/job/runBuild/buildWithParameters?token=${CB_BUILD_TOKEN}&publishedScalaVersion=${SCALA_VERSION}" -v 2>&1)
+echo "${startRunResponse}"
+queueItem=$(echo "${startRunResponse}" | grep -oP "< Location: \K[\w\d:/.//]+")
+# Wait until Jenkins does acknowledge the build (max 1 min )
+for i in {1..12}; do
+  buildUrl=$(curl -s "${queueItem}/api/json?tree=executable[url]" | jq .executable.url)
+  if [[ "null" == "${buildUrl}" ]]; then
+    echo "Waiting for build start..."
+    sleep 5
+  else
+    echo "Created build url: ${buildUrl}"
+    exit 0
+  fi
+done
+
+# Set error if failed to resolve build url
+exit 1

.gitmodules

@@ -216,37 +216,6 @@
 [submodule "community-build/community-projects/spire"]
 	path = community-build/community-projects/spire
 	url = https://github.com/dotty-staging/spire.git
-[submodule "community-build/community-projects/munit-forward-compat"]
-	path = community-build/community-projects/munit-forward-compat
-	url = https://github.com/dotty-staging/munit.git
-[submodule "community-build/community-projects/discipline-forward-compat"]
-	path = community-build/community-projects/discipline-forward-compat
-	url = https://github.com/dotty-staging/discipline.git
-[submodule "community-build/community-projects/discipline-munit-forward-compat"]
-	path = community-build/community-projects/discipline-munit-forward-compat
-	url = https://github.com/dotty-staging/discipline-munit.git
-[submodule "community-build/community-projects/discipline-specs2-forward-compat"]
-	path = community-build/community-projects/discipline-specs2-forward-compat
-	url = https://github.com/dotty-staging/discipline-specs2.git
-[submodule "community-build/community-projects/simulacrum-scalafix-forward-compat"]
-	path = community-build/community-projects/simulacrum-scalafix-forward-compat
-	url = https://github.com/dotty-staging/simulacrum-scalafix.git
-[submodule "community-build/community-projects/cats-forward-compat"]
-	path = community-build/community-projects/cats-forward-compat
-	url = https://github.com/dotty-staging/cats.git
-[submodule "community-build/community-projects/cats-mtl-forward-compat"]
-	path = community-build/community-projects/cats-mtl-forward-compat
-	url = https://github.com/dotty-staging/cats-mtl.git
-[submodule "community-build/community-projects/coop-forward-compat"]
-	path = community-build/community-projects/coop-forward-compat
-	url = https://github.com/dotty-staging/coop.git
-[submodule "community-build/community-projects/cats-effect-3-forward-compat"]
-	path = community-build/community-projects/cats-effect-3-forward-compat
-	url = https://github.com/dotty-staging/cats-effect.git
-	branch = series/3.x
-[submodule "community-build/community-projects/scalacheck-forward-compat"]
-	path = community-build/community-projects/scalacheck-forward-compat
-	url = https://github.com/dotty-staging/scalacheck
 [submodule "community-build/community-projects/http4s"]
 	path = community-build/community-projects/http4s
 	url = https://github.com/dotty-staging/http4s.git