WIP

whyoleg · Jan 6, 2024 · 323d05e · 323d05e
1 parent dd80d95
commit 323d05e
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 19 deletions.
diff --git a/.github/workflows/build.main.kts b/.github/workflows/build.main.kts
@@ -125,13 +125,19 @@ workflow(
                 run(command = conanInstallCommand(profile, version, "False"))
             }
 
-            run(command = "tar -cvzf ${configuration.name}.tar.gz build/openssl3")
+            listOf(
+                "build/openssl3/*/dynamicLib/*",
+                "build/openssl3/*/staticLib/*",
+                "build/openssl3/*/include/*",
+            ).forEach { path ->
+                run(command = "tar -rvf ${configuration.name}.tar $path")
+            }
 
             uses(
                 action = UploadArtifactV4(
                     name = "openssl-${configuration.name}-$version",
                     ifNoFilesFound = UploadArtifactV4.BehaviorIfNoFilesFound.Error,
-                    path = listOf("${configuration.name}.tar.gz")
+                    path = listOf("${configuration.name}.tar")
                 )
             )
         }
@@ -141,22 +147,21 @@ workflow(
         uses(
             action = DownloadArtifactV4(
                 pattern = "openssl-*-$version",
-                mergeMultiple = true,
-                path = "openssl"
+                mergeMultiple = true
             )
         )
 
         configurations.forEach {
-            run(command = "tar -xvzf openssl/${it.name}.tar.gz -C build/openssl3")
+            run(command = "tar -xvf ${it.name}.tar")
         }
 
-        run(command = "tar -cvzf openssl.tar.gz build/openssl3")
+        run(command = "tar -cvf openssl.tar build/openssl3")
 
         uses(
             action = UploadArtifactV4(
                 name = "openssl-$version",
                 ifNoFilesFound = UploadArtifactV4.BehaviorIfNoFilesFound.Error,
-                path = listOf("openssl.tar.gz")
+                path = listOf("openssl.tar")
             )
         )
     }

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -31,12 +31,16 @@ jobs:
     - id: 'step-7'
       run: 'conan install packages/openssl3 --output-folder build/openssl3/macos-x64 --version=3.2.0 -pr:b default -pr:h profiles/macos-x64 -o "*:shared=False"'
     - id: 'step-8'
-      run: 'tar -cvzf macos.tar.gz build/openssl3'
+      run: 'tar -rvf macos.tar build/openssl3/*/dynamicLib/*'
     - id: 'step-9'
+      run: 'tar -rvf macos.tar build/openssl3/*/staticLib/*'
+    - id: 'step-10'
+      run: 'tar -rvf macos.tar build/openssl3/*/include/*'
+    - id: 'step-11'
       uses: 'actions/upload-artifact@v4'
       with:
         name: 'openssl-macos-3.2.0'
-        path: 'macos.tar.gz'
+        path: 'macos.tar'
         if-no-files-found: 'error'
   linux:
     name: 'linux-3.2.0'
@@ -67,12 +71,16 @@ jobs:
     - id: 'step-9'
       run: 'conan install packages/openssl3 --output-folder build/openssl3/linux-x64 --version=3.2.0 -pr:b default -pr:h profiles/linux-x64 -o "*:shared=False"'
     - id: 'step-10'
-      run: 'tar -cvzf linux.tar.gz build/openssl3'
+      run: 'tar -rvf linux.tar build/openssl3/*/dynamicLib/*'
     - id: 'step-11'
+      run: 'tar -rvf linux.tar build/openssl3/*/staticLib/*'
+    - id: 'step-12'
+      run: 'tar -rvf linux.tar build/openssl3/*/include/*'
+    - id: 'step-13'
       uses: 'actions/upload-artifact@v4'
       with:
         name: 'openssl-linux-3.2.0'
-        path: 'linux.tar.gz'
+        path: 'linux.tar'
         if-no-files-found: 'error'
   windows:
     name: 'windows-3.2.0'
@@ -99,12 +107,16 @@ jobs:
     - id: 'step-7'
       run: 'conan install packages/openssl3 --output-folder build/openssl3/mingw-x64 --version=3.2.0 -pr:b default -pr:h profiles/mingw-x64 -o "*:shared=False"'
     - id: 'step-8'
-      run: 'tar -cvzf windows.tar.gz build/openssl3'
+      run: 'tar -rvf windows.tar build/openssl3/*/dynamicLib/*'
     - id: 'step-9'
+      run: 'tar -rvf windows.tar build/openssl3/*/staticLib/*'
+    - id: 'step-10'
+      run: 'tar -rvf windows.tar build/openssl3/*/include/*'
+    - id: 'step-11'
       uses: 'actions/upload-artifact@v4'
       with:
         name: 'openssl-windows-3.2.0'
-        path: 'windows.tar.gz'
+        path: 'windows.tar'
         if-no-files-found: 'error'
   aggregate:
     runs-on: 'ubuntu-latest'
@@ -116,20 +128,19 @@ jobs:
     - id: 'step-0'
       uses: 'actions/download-artifact@v4'
       with:
-        path: 'openssl'
         pattern: 'openssl-*-3.2.0'
         merge-multiple: 'true'
     - id: 'step-1'
-      run: 'tar -xvzf openssl/macos.tar.gz -C build/openssl3'
+      run: 'tar -xvf macos.tar'
     - id: 'step-2'
-      run: 'tar -xvzf openssl/linux.tar.gz -C build/openssl3'
+      run: 'tar -xvf linux.tar'
     - id: 'step-3'
-      run: 'tar -xvzf openssl/windows.tar.gz -C build/openssl3'
+      run: 'tar -xvf windows.tar'
     - id: 'step-4'
-      run: 'tar -cvzf openssl.tar.gz build/openssl3'
+      run: 'tar -cvf openssl.tar build/openssl3'
     - id: 'step-5'
       uses: 'actions/upload-artifact@v4'
       with:
         name: 'openssl-3.2.0'
-        path: 'openssl.tar.gz'
+        path: 'openssl.tar'
         if-no-files-found: 'error'