diff --git a/.github/actions/setup-build/action.yaml b/.github/actions/setup-build/action.yaml index c9fb5970..2a08f425 100644 --- a/.github/actions/setup-build/action.yaml +++ b/.github/actions/setup-build/action.yaml @@ -35,7 +35,7 @@ runs: cd compiler git --no-pager log -1 commitHash=$(git rev-parse --short=7 HEAD) - baseVersion=$(cat project/Build.scala | grep 'val baseVersion =' | xargs | awk '{ print $4 }') + baseVersion=$(sbt "eval Build.baseVersion" | grep 'ans: String =' | xargs | awk '{ print $5 }') # `SNAPSHOT` substring is required to treat compiler as experimental # All compilers build from branch are treated experimental scalaVersion="${baseVersion}-bin-${commitHash}-SNAPSHOT" diff --git a/compiler-builder/build.sh b/compiler-builder/build.sh index 8b6a1cd1..7e6ad20e 100755 --- a/compiler-builder/build.sh +++ b/compiler-builder/build.sh @@ -17,9 +17,7 @@ echo '##################################' cd "$repoDir" -sed -i -r 's/val baseVersion = ".*"/val baseVersion = "'$scalaVersion'"/' project/Build.scala -export RELEASEBUILD=yes - -sbt \ +sbt --batch \ \;'set every sonatypePublishToBundle := Some("Community Build Repo" at sys.env("CB_MVN_REPO_URL"))' \ + \;'set every version := "'$scalaVersion'"' \ \;"scala3-bootstrapped/publish"