From 9d2d906a31308875bfbdf9ca00e37eb38fa868f6 Mon Sep 17 00:00:00 2001 From: Andrew Rogers Date: Fri, 4 Oct 2024 11:38:48 -0700 Subject: [PATCH 1/2] [gha] tar the build output outside of the freebsd vm --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aa4de7e4..f56f468e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -250,7 +250,10 @@ jobs: -G Ninja \ -S ${{ github.workspace }}/SourceCache/ds2 cmake --build ${{ github.workspace }}/BinaryCache/ds2 --config Release - tar -C ${{ github.workspace }}/BinaryCache -cvf ${{ github.workspace }}/BinaryCache/ds2.tar ds2 + + # Tar the output to preserve permissions. + - name: tar output + run: tar -C ${{ github.workspace }}/BinaryCache -cvf ${{ github.workspace }}/BinaryCache/ds2.tar ds2 - uses: actions/upload-artifact@v4 with: From e357a586c99af5e6cecb2227980e546a29ce87e4 Mon Sep 17 00:00:00 2001 From: Andrew Rogers Date: Fri, 4 Oct 2024 11:52:48 -0700 Subject: [PATCH 2/2] [freebsd] fix build due to missing GetOSKernelPath --- Sources/Host/FreeBSD/Platform.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/Host/FreeBSD/Platform.cpp b/Sources/Host/FreeBSD/Platform.cpp index 188988f6..f6423649 100644 --- a/Sources/Host/FreeBSD/Platform.cpp +++ b/Sources/Host/FreeBSD/Platform.cpp @@ -36,9 +36,9 @@ static struct utsname const *GetCachedUTSName() { char const *Platform::GetOSVersion() { return GetCachedUTSName()->release; } -char const *Platform::GetOSBuild() { return GetCachedUTSName()->version; } +char const *Platform::GetOSBuild() { return GetCachedUTSName()->release; } -char const *Platform::GetOSKernelPath() { return nullptr; } +char const *Platform::GetOSKernelVersion() { return GetCachedUTSName()->version; } const char *Platform::GetSelfExecutablePath() { return Host::FreeBSD::ProcStat::GetExecutablePath(getpid()).c_str();