fix

whyoleg · Dec 28, 2023 · 707b6bf · 707b6bf
1 parent 66465a0
commit 707b6bf
Show file tree

Hide file tree

Showing 4 changed files with 179 additions and 242 deletions.
diff --git a/.github/workflows/build.yml → .github/workflows/build.yaml b/.github/workflows/build.yml → .github/workflows/build.yaml
diff --git a/.github/workflows/run-build.main.kts b/.github/workflows/run-build.main.kts
@@ -73,23 +73,23 @@ val configurations = listOf(
     )
 )
 
-fun conanCreateCommand(profile: String, version: String, shared: String): String = listOf(
-    "conan create",
-    "conan-center-index/recipes/openssl/3.x.x",
-    "--build=missing",
-    "--version=$version",
-    "-pr:b default",
-    "-pr:h profiles/$profile",
-    "-o \"*:shared=$shared\""
-).joinToString(" ")
+fun conanCreateCommand(profile: String, version: String, shared: String): String = conanCommand(
+    profile, version, shared,
+    "create conan-center-index/recipes/openssl/3.x.x --build=missing"
+)
+
+fun conanInstallCommand(profile: String, version: String, shared: String): String = conanCommand(
+    profile, version, shared,
+    "install packages/openssl3 --output-folder build/openssl3/$version/$profile"
+)
 
-fun conanInstallCommand(profile: String, version: String, shared: String): String = listOf(
-    "conan install",
-    "packages/openssl3",
-    "--output-folder build/openssl3/$version/$profile",
+fun conanCommand(profile: String, version: String, shared: String, command: String): String = listOf(
+    "conan",
+    command,
+    "--version=$version",
     "-pr:b default",
     "-pr:h profiles/$profile",
-    "-o \"*:shared=$shared\""
+    "-o \"*:shared=$shared\"",
 ).joinToString(" ")
 
 workflow(
@@ -111,17 +111,17 @@ workflow(
                 }
 
                 configuration.profiles.forEach { (profile, supportsShared) ->
-                    run(command = conanCreateCommand(profile, "3.2.0", "False"), continueOnError = true, shell = Shell.Bash)
-                    run(command = conanInstallCommand(profile, "3.2.0", "False"), continueOnError = true)
+                    run(command = conanCreateCommand(profile, version, "False"), continueOnError = true)
+                    run(command = conanInstallCommand(profile, version, "False"), continueOnError = true)
                     if (supportsShared) {
-                        run(command = conanCreateCommand(profile, "3.2.0", "True"), continueOnError = true)
-                        run(command = conanInstallCommand(profile, "3.2.0", "True"), continueOnError = true)
+                        run(command = conanCreateCommand(profile, version, "True"), continueOnError = true)
+                        run(command = conanInstallCommand(profile, version, "True"), continueOnError = true)
                     }
                 }
 
                 uses(
                     action = UploadArtifact(
-                        name = "openssl3-all",
+                        name = "openssl-$version",
                         ifNoFilesFound = UploadArtifact.BehaviorIfNoFilesFound.Error,
                         path = listOf(
                             "build/openssl3/$version/*/lib/*",