WIP

whyoleg · Jan 6, 2024 · 1146608 · 1146608
1 parent c7af541
commit 1146608
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 26 deletions.
diff --git a/.github/workflows/build.main.kts b/.github/workflows/build.main.kts
@@ -121,16 +121,16 @@ workflow(
                     run(command = conanCreateCommand(profile, version, "True"))
                     run(command = conanInstallCommand(profile, version, "True"))
                 }
-                run(command = conanCreateCommand(profile, version, "False"))
-                run(command = conanInstallCommand(profile, version, "False"))
+//                run(command = conanCreateCommand(profile, version, "False"))
+//                run(command = conanInstallCommand(profile, version, "False"))
             }
 
             listOf(
                 "build/openssl3/*/dynamicLib",
                 "build/openssl3/*/staticLib",
                 "build/openssl3/*/include",
             ).forEach { path ->
-                run(command = "tar -rvf ${configuration.name}.tar $path")
+                run(command = "tar -rvf ${configuration.name}.tar $path", shell = Shell.Bash)
             }
 
             uses(
@@ -152,10 +152,10 @@ workflow(
         )
 
         configurations.forEach {
-            run(command = "tar -xvf ${it.name}.tar")
+            run(command = "tar -xvf ${it.name}.tar", shell = Shell.Bash)
         }
 
-        run(command = "tar -cvf openssl.tar build/openssl3")
+        run(command = "tar -cvf openssl.tar build/openssl3", shell = Shell.Bash)
 
         uses(
             action = UploadArtifactV4(

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -27,16 +27,15 @@ jobs:
     - id: 'step-5'
       run: 'conan install packages/openssl3 --output-folder build/openssl3/macos-x64 --version=3.0.12 -pr:b default -pr:h profiles/macos-x64 -o "*:shared=True"'
     - id: 'step-6'
-      run: 'conan create conan-center-index/recipes/openssl/3.x.x --build=missing --version=3.0.12 -pr:b default -pr:h profiles/macos-x64 -o "*:shared=False"'
-    - id: 'step-7'
-      run: 'conan install packages/openssl3 --output-folder build/openssl3/macos-x64 --version=3.0.12 -pr:b default -pr:h profiles/macos-x64 -o "*:shared=False"'
-    - id: 'step-8'
+      shell: 'bash'
       run: 'tar -rvf macos.tar build/openssl3/*/dynamicLib'
-    - id: 'step-9'
+    - id: 'step-7'
+      shell: 'bash'
       run: 'tar -rvf macos.tar build/openssl3/*/staticLib'
-    - id: 'step-10'
+    - id: 'step-8'
+      shell: 'bash'
       run: 'tar -rvf macos.tar build/openssl3/*/include'
-    - id: 'step-11'
+    - id: 'step-9'
       uses: 'actions/upload-artifact@v4'
       with:
         name: 'openssl-macos-3.0.12'
@@ -67,16 +66,15 @@ jobs:
     - id: 'step-7'
       run: 'conan install packages/openssl3 --output-folder build/openssl3/linux-x64 --version=3.0.12 -pr:b default -pr:h profiles/linux-x64 -o "*:shared=True"'
     - id: 'step-8'
-      run: 'conan create conan-center-index/recipes/openssl/3.x.x --build=missing --version=3.0.12 -pr:b default -pr:h profiles/linux-x64 -o "*:shared=False"'
-    - id: 'step-9'
-      run: 'conan install packages/openssl3 --output-folder build/openssl3/linux-x64 --version=3.0.12 -pr:b default -pr:h profiles/linux-x64 -o "*:shared=False"'
-    - id: 'step-10'
+      shell: 'bash'
       run: 'tar -rvf linux.tar build/openssl3/*/dynamicLib'
-    - id: 'step-11'
+    - id: 'step-9'
+      shell: 'bash'
       run: 'tar -rvf linux.tar build/openssl3/*/staticLib'
-    - id: 'step-12'
+    - id: 'step-10'
+      shell: 'bash'
       run: 'tar -rvf linux.tar build/openssl3/*/include'
-    - id: 'step-13'
+    - id: 'step-11'
       uses: 'actions/upload-artifact@v4'
       with:
         name: 'openssl-linux-3.0.12'
@@ -103,16 +101,15 @@ jobs:
     - id: 'step-5'
       run: 'conan install packages/openssl3 --output-folder build/openssl3/mingw-x64 --version=3.0.12 -pr:b default -pr:h profiles/mingw-x64 -o "*:shared=True"'
     - id: 'step-6'
-      run: 'conan create conan-center-index/recipes/openssl/3.x.x --build=missing --version=3.0.12 -pr:b default -pr:h profiles/mingw-x64 -o "*:shared=False"'
-    - id: 'step-7'
-      run: 'conan install packages/openssl3 --output-folder build/openssl3/mingw-x64 --version=3.0.12 -pr:b default -pr:h profiles/mingw-x64 -o "*:shared=False"'
-    - id: 'step-8'
+      shell: 'bash'
       run: 'tar -rvf windows.tar build/openssl3/*/dynamicLib'
-    - id: 'step-9'
+    - id: 'step-7'
+      shell: 'bash'
       run: 'tar -rvf windows.tar build/openssl3/*/staticLib'
-    - id: 'step-10'
+    - id: 'step-8'
+      shell: 'bash'
       run: 'tar -rvf windows.tar build/openssl3/*/include'
-    - id: 'step-11'
+    - id: 'step-9'
       uses: 'actions/upload-artifact@v4'
       with:
         name: 'openssl-windows-3.0.12'
@@ -131,12 +128,16 @@ jobs:
         pattern: 'openssl-*-3.0.12'
         merge-multiple: 'true'
     - id: 'step-1'
+      shell: 'bash'
       run: 'tar -xvf macos.tar'
     - id: 'step-2'
+      shell: 'bash'
       run: 'tar -xvf linux.tar'
     - id: 'step-3'
+      shell: 'bash'
       run: 'tar -xvf windows.tar'
     - id: 'step-4'
+      shell: 'bash'
       run: 'tar -cvf openssl.tar build/openssl3'
     - id: 'step-5'
       uses: 'actions/upload-artifact@v4'