Skip to content

Commit 1ebf1d3

Browse files
committed
Fix layout of released SDK archives, restore top-level directory scala3-{{ scala-version }}
1 parent 2723b44 commit 1ebf1d3

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
@@ -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
}

project/Build.scala

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff 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"),

0 commit comments

Comments
 (0)