From eeba529eea73db286297e8c4c154fd3825edc19b Mon Sep 17 00:00:00 2001
From: Wojciech Mazur <wmazur@virtuslab.com>
Date: Thu, 12 Dec 2024 15:21:33 +0100
Subject: [PATCH] Fix layout of released SDK archives, restore intermiediete
 top-level directory  (#22199)

Fixes #22194

Restores top-level directory `scala3-${version}` that is present in
artifacts published before Scala 3.6, removed during hotfix 3.6.1
release.
We now follow the [Well formed SDK archives
layout](https://github.com/sdkman/sdkman-cli/wiki/Well-formed-SDK-archives).
Removing the top-level directory even though at first glance looked like
an improvement was in fact introducing problems to multiple package
managers and build tools.

[Cherry-picked 5b3d82a41aafcaccab99bad95aa5a035a5dacabb]
---
 .github/workflows/ci.yaml | 12 +++---------
 project/Build.scala       |  9 ++++++++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e842aeab229b..5931219f472a 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -794,19 +794,13 @@ jobs:
             distDir="$3"
 
             # Build binaries
-            ./project/scripts/sbt "${sbtProject}/Universal/stage"
+            ./project/scripts/sbt "all ${sbtProject}/Universal/packageBin ${sbtProject}/Universal/packageZipTarball"
 
-            outputPath="${distDir}/target/universal/stage"
             artifactName="scala3-${{ env.RELEASE_TAG }}${distroSuffix}"
-            zipArchive="${artifactName}.zip"
-            tarGzArchive="${artifactName}.tar.gz"
-
-            cwd=$(pwd)
-            (cd $outputPath && zip -r ${zipArchive} . && mv ${zipArchive} "${cwd}/")
-            tar -czf ${tarGzArchive} -C "$outputPath" .
 
             # Caluclate SHA for each of archive files
-            for file in "${zipArchive}" "${tarGzArchive}"; do
+            for file in "${artifactName}.zip" "${artifactName}.tar.gz"; do
+              mv ${distDir}/target/universal/$file $file
               sha256sum "${file}" > "${file}.sha256"
             done
           }
diff --git a/project/Build.scala b/project/Build.scala
index 16c3e594ea5d..743e299767d2 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -2230,7 +2230,14 @@ object Build {
     // ========
     Universal / stage := (Universal / stage).dependsOn(republish).value,
     Universal / packageBin := (Universal / packageBin).dependsOn(republish).value,
-    Universal / packageZipTarball := (Universal / packageZipTarball).dependsOn(republish).value,
+    Universal / packageZipTarball := (Universal / packageZipTarball).dependsOn(republish)
+      .map { archiveFile =>
+        // Rename .tgz to .tar.gz for consistency with previous versions
+        val renamedFile = archiveFile.getParentFile() / archiveFile.getName.replaceAll("\\.tgz$", ".tar.gz")
+        IO.move(archiveFile, renamedFile)
+        renamedFile
+      }
+      .value,
     // ========
     Universal / mappings ++= directory(dist.base / "bin"),
     Universal / mappings ++= directory(republishRepo.value / "maven2"),