Skip to content

Commit e1d9213

Browse files
committed
fix tgz directory structure
1 parent 6d04222 commit e1d9213

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
env:
7676
NUGET_AUTH_TOKEN: ${{ secrets.NUGET_AUTH_TOKEN }}
7777
- name: upload tgz to github release
78-
run: gh release upload ${{github.event.release.tag_name}} artifacts/tgz-linux-x64/*.* artifacts/tgz-osx-arm64/*.* artifacts/tgz-osx-arm64/*.* --clobber
78+
run: gh release upload ${{github.event.release.tag_name}} artifacts/tgz-linux-x64/*.* artifacts/tgz-osx-arm64/*.* --clobber
7979
env:
8080
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
8181
- name: upload zip and nupkg to github release

nbuild/Build.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@ class Build : NukeBuild
106106
{
107107
var runtimedir = ArtifactDir / Configuration / Runtime;
108108
var archivedir = ArtifactDir / "archive" / Configuration / Runtime;
109-
var destdir = archivedir / "cs2mmd";
109+
var destdir = archivedir / "zip" / "cs2mmd";
110110
var outFile = archivedir / $"cs2mmd-{Runtime}.zip";
111111
destdir.CreateOrCleanDirectory();
112-
runtimedir.CopyToDirectory(destdir, ExistsPolicy.MergeAndOverwrite);
113-
destdir.ZipTo(outFile, fileMode: System.IO.FileMode.Create);
112+
runtimedir.Copy(destdir, ExistsPolicy.MergeAndOverwrite, excludeFile: p => p.Name.EndsWith("nupkg"));
113+
destdir.Parent.ZipTo(outFile, fileMode: System.IO.FileMode.Create);
114114
});
115115
Target ArchiveTgz => _ => _
116116
.Requires(() => !string.IsNullOrEmpty(Runtime))
@@ -122,7 +122,7 @@ class Build : NukeBuild
122122
var destdir = archivedir / "cs2mmd";
123123
var outFile = archivedir / $"cs2mmd-{Runtime}.tgz";
124124
destdir.CreateOrCleanDirectory();
125-
runtimedir.CopyToDirectory(destdir, ExistsPolicy.MergeAndOverwrite);
125+
runtimedir.Copy(destdir, ExistsPolicy.MergeAndOverwrite);
126126
using var fstm = System.IO.File.Create(outFile);
127127
using (var zstm = new GZipStream(fstm, CompressionMode.Compress))
128128
using (var tstm = new TarOutputStream(zstm, System.Text.Encoding.UTF8))

0 commit comments

Comments
 (0)