Skip to content

Commit

Permalink
Cleanup resolved version of compiler
Browse files Browse the repository at this point in the history
  • Loading branch information
WojciechMazur committed Nov 7, 2024
1 parent 3fefb81 commit ee56dd2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup-build/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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')"
scalaVersion="$(sbt --error 'print scala3-compiler-bootstrapped/version' | head -n 1 | xargs)"
fi
Expand Down
2 changes: 1 addition & 1 deletion compiler-builder/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ echo '##################################'

cd "$repoDir"

compilerVersion="$(sbt --error 'print scala3-compiler-bootstrapped/version')"
compilerVersion="$(sbt --error 'print scala3-compiler-bootstrapped/version' | head -n 1 | xargs)"
if [[ "$scalaVerison" != "$compilerVersion"]]; then
echo "Configured version $scalaVersion does not match compiler version $compilerVersion"
exit 1
Expand Down

0 comments on commit ee56dd2

Please sign in to comment.