Merge pull request #10402 from SethTisue/merge-2.12-to-2.13-20230517-2

scala · May 18, 2023 · 0579c28 · 0579c28
2 parents 366ba4a + 7d338f8
commit 0579c28
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,16 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
+        java-distribution: [temurin]
         java: [8, 11, 17, 20]
+        # 21-ea will presumably be available from Temurin eventually, but for now:
+        include:
+          - os: ubuntu-latest
+            java-distribution: zulu
+            java: 21-ea
+          - os: windows-latest
+            java-distribution: zulu
+            java: 21-ea
     runs-on: ${{matrix.os}}
     steps:
       - run: git config --global core.autocrlf false
@@ -29,15 +38,15 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          distribution: temurin
+          distribution: ${{matrix.java-distribution}}
           java-version: ${{matrix.java}}
           cache: sbt
 
       - name: Build
         run: |
-          sbt setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal
+          sbt -Dsbt.scala.version=2.12.18-M2 setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal
 
       - name: Test
         run: |
           STARR=`cat buildcharacter.properties | grep ^maven.version.number | cut -d= -f2` && echo $STARR
-          sbt -Dstarr.version=$STARR setupValidateTest test:compile info testAll
+          sbt -Dsbt.scala.version=2.12.18-M2 -Dstarr.version=$STARR setupValidateTest test:compile info testAll
diff --git a/.travis.yml b/.travis.yml
@@ -27,9 +27,9 @@ templates: # this has no effect on travis, it's just a place to put our template
     name: build, publishLocal, build again
     script:
       - set -e
-      - sbt setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal
+      - sbt -Dsbt.scala.version=2.12.18-M2 setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal
       - STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR
-      - sbt -Dstarr.version=$STARR setupValidateTest compile
+      - sbt -Dsbt.scala.version=2.12.18-M2 -Dstarr.version=$STARR setupValidateTest compile
     workspaces:
       create:
         name: bootstrapped
@@ -53,7 +53,7 @@ templates: # this has no effect on travis, it's just a place to put our template
     script:
       - set -e
       - STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR
-      - sbt -Dstarr.version=$STARR setupValidateTest Test/compile testAll1
+      - sbt -Dsbt.scala.version=2.12.18-M2 -Dstarr.version=$STARR setupValidateTest Test/compile testAll1
 
   test2: &test2
     stage: test
@@ -63,7 +63,7 @@ templates: # this has no effect on travis, it's just a place to put our template
     script:
       - set -e
       - STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR
-      - sbt -Dstarr.version=$STARR setupValidateTest testAll2
+      - sbt -Dsbt.scala.version=2.12.18-M2 -Dstarr.version=$STARR setupValidateTest testAll2
 
 jobs:
   include:
@@ -113,7 +113,7 @@ jobs:
       script:
         - set -e
         - STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR
-        - sbt -Dscala.build.compileWithDotty=true library/compile
+        - sbt -Dsbt.scala.version=2.12.18-M2 -Dscala.build.compileWithDotty=true library/compile
 
     - name: build benchmarks
       if: type = pull_request OR repo != scala/scala
@@ -122,7 +122,7 @@ jobs:
       script:
         - set -e
         - STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR
-        - sbt bench/Jmh/compile
+        - sbt -Dsbt.scala.version=2.12.18-M2 bench/Jmh/compile
 
     - stage: build
       if: type = pull_request OR type = push

diff --git a/scripts/common b/scripts/common
@@ -13,7 +13,7 @@ fi
 SBT_VERSION=`grep sbt.version $WORKSPACE/project/build.properties | sed -n 's/sbt.version=\(.*\)/\1/p'`
 
 SBT_CMD=${SBT_CMD-sbt}
-SBT_CMD="$SBT_CMD -sbt-version $SBT_VERSION"
+SBT_CMD="$SBT_CMD -Dsbt.scala.version=2.12.18-M2 -sbt-version $SBT_VERSION"
 
 # repo to publish builds
 integrationRepoUrl=${integrationRepoUrl-"https://scala-ci.typesafe.com/artifactory/scala-integration/"}

diff --git a/versions.properties b/versions.properties
@@ -1,5 +1,5 @@
 # Scala version used for bootstrapping (see README.md)
-starr.version=2.13.11-M1
+starr.version=2.13.11-M2
 
 # These are the versions of the modules that go with this release.
 # Artifact dependencies: