From 1603cd11ead54d30aeb1706e4213b6b50d02e14a Mon Sep 17 00:00:00 2001 From: Svyatoslav Kuzmich Date: Mon, 6 Mar 2023 17:20:22 +0100 Subject: [PATCH] [Wasm] Use jsshell version in zip and directory names Otherwise, it wouldn't rerun the task when downloading new version --- wasm/wasm.tests/build.gradle.kts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/wasm/wasm.tests/build.gradle.kts b/wasm/wasm.tests/build.gradle.kts index e9ba50b08c5..f2a4fe46edf 100644 --- a/wasm/wasm.tests/build.gradle.kts +++ b/wasm/wasm.tests/build.gradle.kts @@ -90,7 +90,8 @@ val currentOsType = run { OsType(osName, osArch) } -val jsShellDirectory = "https://archive.mozilla.org/pub/firefox/nightly/2023/03/2023-03-04-09-52-24-mozilla-central" +val jsShellVersion = "2023-03-04-09-52-24-mozilla-central" +val jsShellDirectory = "https://archive.mozilla.org/pub/firefox/nightly/2023/03/$jsShellVersion" val jsShellSuffix = when (currentOsType) { OsType(OsName.LINUX, OsArch.X86_32) -> "linux-i686" OsType(OsName.LINUX, OsArch.X86_64) -> "linux-x86_64" @@ -106,14 +107,14 @@ val downloadedTools = File(buildDir, "tools") val downloadJsShell by task { src(jsShellLocation) - dest(File(downloadedTools, "jsshell-$jsShellSuffix.zip")) + dest(File(downloadedTools, "jsshell-$jsShellSuffix-$jsShellVersion.zip")) overwrite(false) } val unzipJsShell by task { dependsOn(downloadJsShell) from(zipTree(downloadJsShell.get().dest)) - val unpackedDir = File(downloadedTools, "jsshell-$jsShellSuffix") + val unpackedDir = File(downloadedTools, "jsshell-$jsShellSuffix-$jsShellVersion") into(unpackedDir) }