Skip to content

Commit e70e786

Browse files
committed
Fix layout of released SDK archives, restore top-level directory scala3-{{ scala-version }}
1 parent 801a792 commit e70e786

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -794,19 +794,16 @@ jobs:
794794
distDir="$3"
795795
796796
# Build binaries
797-
./project/scripts/sbt "${sbtProject}/Universal/stage"
797+
./project/scripts/sbt "all ${sbtProject}/Universal/packageBin ${sbtProject}/Universal/packageZipTarball"
798798
799799
outputPath="${distDir}/target/universal/stage"
800800
artifactName="scala3-${{ env.RELEASE_TAG }}${distroSuffix}"
801801
zipArchive="${artifactName}.zip"
802802
tarGzArchive="${artifactName}.tar.gz"
803803
804-
cwd=$(pwd)
805-
(cd $outputPath && zip -r ${zipArchive} . && mv ${zipArchive} "${cwd}/")
806-
tar -czf ${tarGzArchive} -C "$outputPath" .
807-
808804
# Caluclate SHA for each of archive files
809805
for file in "${zipArchive}" "${tarGzArchive}"; do
806+
mv $outputPath/$file $file
810807
sha256sum "${file}" > "${file}.sha256"
811808
done
812809
}

project/Build.scala

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2230,7 +2230,14 @@ object Build {
22302230
// ========
22312231
Universal / stage := (Universal / stage).dependsOn(republish).value,
22322232
Universal / packageBin := (Universal / packageBin).dependsOn(republish).value,
2233-
Universal / packageZipTarball := (Universal / packageZipTarball).dependsOn(republish).value,
2233+
Universal / packageZipTarball := (Universal / packageZipTarball).dependsOn(republish)
2234+
.map { archiveFile =>
2235+
// Rename .tgz to .tar.gz for consistency with previous versions
2236+
val renamedFile = archiveFile.getParentFile() / archiveFile.getName.replaceAll("\\.tgz$", ".tar.gz")
2237+
IO.move(archiveFile, renamedFile)
2238+
renamedFile
2239+
}
2240+
.value,
22342241
// ========
22352242
Universal / mappings ++= directory(dist.base / "bin"),
22362243
Universal / mappings ++= directory(republishRepo.value / "maven2"),

0 commit comments

Comments
 (0)