Skip to content

Commit 6fe22a0

Browse files
committed
Fix invalid scala-cli-signing artifact downloads
1 parent 5fc8251 commit 6fe22a0

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

modules/cli/src/main/scala/scala/cli/commands/pgp/PgpExternalCommand.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,14 @@ object PgpExternalCommand {
167167
}
168168
else {
169169
val platformSuffix = FetchExternalBinary.platformSuffix()
170+
// TODO remove after native aarch64 support was added for scala-cli-signing
171+
.replace("aarch64", "x86_64")
170172
val (tag, changing) =
171173
if (version == "latest") ("launchers", true)
172174
else ("v" + version, false)
173175
val ext = if (Properties.isWin) ".zip" else ".gz"
174176
val url =
175-
s"https://github.com/scala-cli/scala-cli-signing/releases/download/$tag/scala-cli-signing-$platformSuffix$ext"
177+
s"https://github.com/VirtusLab/scala-cli-signing/releases/download/$tag/scala-cli-signing-$platformSuffix$ext"
176178
val params = ExternalBinaryParams(
177179
url,
178180
changing,

modules/integration/src/test/scala/scala/cli/integration/PgpTests.scala

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,14 @@ class PgpTests extends ScalaCliSuite {
8585
}
8686
}
8787

88+
test("ensure the scala-cli-signing artifact is downloaded correctly for pgp push") {
89+
pubKeyInputs.fromRoot { root =>
90+
val res = os.proc(TestUtil.cli, "--power", "pgp", "push", "-v", "-v", "-v", "key.pub")
91+
.call(cwd = root, stderr = os.Pipe)
92+
expect(!res.err.trim().contains("coursier.cache.ArtifactError$NotFound"))
93+
}
94+
}
95+
8896
if (!TestUtil.isNativeCli)
8997
test("pgp push with binary") {
9098
pubKeyInputs.fromRoot { root =>

0 commit comments

Comments
 (0)