diff --git a/.github/actions/setup-build/action.yaml b/.github/actions/setup-build/action.yaml index 3a234b75..56a492a6 100644 --- a/.github/actions/setup-build/action.yaml +++ b/.github/actions/setup-build/action.yaml @@ -41,7 +41,7 @@ runs: baseVersion="$(sbt 'eval Build.baseVersion' | grep 'ans: String =' | xargs | awk '{ print $5 }')" buildMavenRepo="${baseMavenRepo}/${baseVersion}-${commitDate}-${commitHash}" - scalaVersion="$(sbt --error 'print scala3-compiler-bootstrapped/version' | head -n 1 | xargs)" + scalaVersion="$(sbt --error 'print scala3-compiler-bootstrapped/version' | grep "3." | tail -n 1 | xargs)" fi diff --git a/compiler-builder/build.sh b/compiler-builder/build.sh index 90e9e08f..2f5aa9fa 100755 --- a/compiler-builder/build.sh +++ b/compiler-builder/build.sh @@ -17,7 +17,7 @@ echo '##################################' cd "$repoDir" -compilerVersion="$(sbt --error 'print scala3-compiler-bootstrapped/version' | head -n 1 | xargs)" +compilerVersion="$(sbt --error 'print scala3-compiler-bootstrapped/version' | grep "3." | tail -n 1 | xargs)" if [[ "$scalaVersion" != "$compilerVersion" ]]; then echo "Configured version $scalaVersion does not match compiler version $compilerVersion" exit 1 diff --git a/scripts/build-all.sh b/scripts/build-all.sh index d5f21a28..4f318dc1 100755 --- a/scripts/build-all.sh +++ b/scripts/build-all.sh @@ -7,7 +7,7 @@ if [ $# -ne 1 ]; then fi VERSION="$1" -export PREV_CB_VERSION="0.3.18" +export PREV_CB_VERSION="0.3.19" javaDefault=11 javaAccessoryVersions=(8 17 21)