File tree Expand file tree Collapse file tree 2 files changed +10
-6
lines changed Expand file tree Collapse file tree 2 files changed +10
-6
lines changed Original file line number Diff line number Diff line change @@ -789,19 +789,16 @@ jobs:
789789 distDir="$3"
790790
791791 # Build binaries
792- ./project/scripts/sbt "${sbtProject}/Universal/stage "
792+ ./project/scripts/sbt "all ${sbtProject}/Universal/packageBin ${sbtProject}/Universal/packageZipTarball "
793793
794794 outputPath="${distDir}/target/universal/stage"
795795 artifactName="scala3-${{ env.RELEASE_TAG }}${distroSuffix}"
796796 zipArchive="${artifactName}.zip"
797797 tarGzArchive="${artifactName}.tar.gz"
798798
799- cwd=$(pwd)
800- (cd $outputPath && zip -r ${zipArchive} . && mv ${zipArchive} "${cwd}/")
801- tar -czf ${tarGzArchive} -C "$outputPath" .
802-
803799 # Caluclate SHA for each of archive files
804800 for file in "${zipArchive}" "${tarGzArchive}"; do
801+ mv $outputPath/$file $file
805802 sha256sum "${file}" > "${file}.sha256"
806803 done
807804 }
Original file line number Diff line number Diff line change @@ -2193,7 +2193,14 @@ object Build {
21932193 // ========
21942194 Universal / stage := (Universal / stage).dependsOn(republish).value,
21952195 Universal / packageBin := (Universal / packageBin).dependsOn(republish).value,
2196- Universal / packageZipTarball := (Universal / packageZipTarball).dependsOn(republish).value,
2196+ Universal / packageZipTarball := (Universal / packageZipTarball).dependsOn(republish)
2197+ .map { archiveFile =>
2198+ // Rename .tgz to .tar.gz for consistency with previous versions
2199+ val renamedFile = archiveFile.getParentFile() / archiveFile.getName.replaceAll(" \\ .tgz$" , " .tar.gz" )
2200+ IO .move(archiveFile, renamedFile)
2201+ renamedFile
2202+ }
2203+ .value,
21972204 // ========
21982205 Universal / mappings ++= directory(dist.base / " bin" ),
21992206 Universal / mappings ++= directory(republishRepo.value / " maven2" ),
You can’t perform that action at this time.
0 commit comments