Zip differently

bflattened · Oct 29, 2023 · 0331c4d · 0331c4d
1 parent 87a9e09
commit 0331c4d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/.github/workflows/bflat-cicd.yml b/.github/workflows/bflat-cicd.yml
@@ -66,7 +66,7 @@ jobs:
           mkdir artifacts/bflat-compiler-native
           cp -t artifacts/bflat-compiler-native artifacts/bin/coreclr/linux.${{ matrix.arch }}.Release/ilc/libclrjit_* artifacts/bin/coreclr/linux.${{ matrix.arch }}.Release/ilc/libjitinterface_* artifacts/bin/coreclr/linux.${{ matrix.arch }}.Release/ilc/libobjwriter*
           cp -t artifacts/bflat-compiler-native THIRD-PARTY-NOTICES.TXT artifacts/bin/coreclr/linux.${{ matrix.arch }}.Release/build/WindowsAPIs.txt
-          zip -jr artifacts/bflat-compiler-native-${{ matrix.os }}-${{ matrix.arch }}.zip artifacts/bflat-compiler-native
+          ./dotnet.sh run --project bflat/zip/zip.csproj -- artifacts/bflat-compiler-native-${{ matrix.os }}-${{ matrix.arch }}.zip artifacts/bflat-compiler-native
         if: ${{ matrix.vm == 'ubuntu-latest' }}
       - name: ZIP native compiler (Windows)
         run: |
@@ -93,7 +93,7 @@ jobs:
           cp -t artifacts/bflat-libs artifacts/bin/microsoft.netcore.app.runtime.linux-${{ matrix.arch }}/Release/runtimes/linux-${{ matrix.arch }}/lib/net8.0/*
           cp -t artifacts/bflat-libs artifacts/bin/microsoft.netcore.app.runtime.linux-${{ matrix.arch }}/Release/runtimes/linux-${{ matrix.arch }}/native/*.Native.*a
           cp -t artifacts/bflat-libs artifacts/bin/coreclr/linux.${{ matrix.arch }}.Release/aotsdk/*
-          zip -jr artifacts/bflat-libs-${{ matrix.os }}-${{ matrix.arch }}.zip artifacts/bflat-libs
+          ./dotnet.sh run --project bflat/zip/zip.csproj -- artifacts/bflat-libs-${{ matrix.os }}-${{ matrix.arch }}.zip artifacts/bflat-libs
         if: ${{ matrix.vm == 'ubuntu-latest' }}
       - name: ZIP libs (Windows)
         run: |
@@ -116,7 +116,7 @@ jobs:
         run: |
           mkdir artifacts/bflat-refs
           cp -t artifacts/bflat-refs artifacts/bin/microsoft.netcore.app.ref/ref/net8.0/*.dll
-          zip -jr artifacts/bflat-refs.zip artifacts/bflat-refs
+          ./dotnet.sh run --project bflat/zip/zip.csproj -- artifacts/bflat-refs.zip artifacts/bflat-refs
 
       - name: Archive refs
         if: ${{ matrix.os == 'linux-glibc' && matrix.arch == 'x64' }}

diff --git a/bflat/zip/Program.cs b/bflat/zip/Program.cs
@@ -0,0 +1,3 @@
+using System.IO.Compression;
+
+ZipFile.CreateFromDirectory(args[1], args[0]);
diff --git a/bflat/zip/zip.csproj b/bflat/zip/zip.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		using System.IO.Compression;

		ZipFile.CreateFromDirectory(args[1], args[0]);