From fd2a92001c494ba58dd6f5ae5cd18d27a2815d72 Mon Sep 17 00:00:00 2001 From: Robert Pickering Date: Mon, 14 Nov 2022 18:28:17 +0100 Subject: [PATCH 1/2] include mac arm binaries in nuget --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 66ba5b04a..1e45385ca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -160,7 +160,7 @@ jobs: bsdtar -xOf "$arch" "$file_in_arch" > "$dest"/"$(basename "$file_in_arch")" } - mkdir -p ./packages/nuget/runtimes/{linux-x64,linux-arm64,osx-x64,win-x86,win-x64}/native + mkdir -p ./packages/nuget/runtimes/{linux-x64,linux-arm64,osx-x64,osx-arm64,win-x86,win-x64}/native extract_file ./artifacts/libddwaf-linux-x86_64/libddwaf-*-linux-x86_64*.tar.gz \ '/libddwaf\.so$' ./packages/nuget/runtimes/linux-x64/native @@ -168,6 +168,8 @@ jobs: '/libddwaf\.so$' ./packages/nuget/runtimes/linux-arm64/native extract_file ./artifacts/libddwaf-macos-x86_64/libddwaf-*-darwin-x86_64*.tar.gz \ '/libddwaf\.dylib$' ./packages/nuget/runtimes/osx-x64/native + extract_file ./artifacts/libddwaf-macos-arm64/libddwaf-*-darwin-x86_64*.tar.gz \ + '/libddwaf\.dylib$' ./packages/nuget/runtimes/osx-arm64/native extract_file ./artifacts/libddwaf-windows-Win32/libddwaf-*-windows-win32*.tar.gz \ '/ddwaf\.dll$' ./packages/nuget/runtimes/win-x86/native extract_file ./artifacts/libddwaf-windows-x64/libddwaf-*-windows-x64*.tar.gz \ From e0eef5c8fefd69d6c15b1bd75bec794286f7dc23 Mon Sep 17 00:00:00 2001 From: Anil Mahtani <929854+Anilm3@users.noreply.github.com> Date: Mon, 14 Nov 2022 17:42:27 +0000 Subject: [PATCH 2/2] Update .github/workflows/build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1e45385ca..2685e87e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -168,7 +168,7 @@ jobs: '/libddwaf\.so$' ./packages/nuget/runtimes/linux-arm64/native extract_file ./artifacts/libddwaf-macos-x86_64/libddwaf-*-darwin-x86_64*.tar.gz \ '/libddwaf\.dylib$' ./packages/nuget/runtimes/osx-x64/native - extract_file ./artifacts/libddwaf-macos-arm64/libddwaf-*-darwin-x86_64*.tar.gz \ + extract_file ./artifacts/libddwaf-macos-arm64/libddwaf-*-darwin-arm64*.tar.gz \ '/libddwaf\.dylib$' ./packages/nuget/runtimes/osx-arm64/native extract_file ./artifacts/libddwaf-windows-Win32/libddwaf-*-windows-win32*.tar.gz \ '/ddwaf\.dll$' ./packages/nuget/runtimes/win-x86/native