diff --git a/.github/workflows/vm1-ci.yml b/.github/workflows/vm1-ci.yml index 3d108fb047..c3216c32f8 100644 --- a/.github/workflows/vm1-ci.yml +++ b/.github/workflows/vm1-ci.yml @@ -122,7 +122,7 @@ jobs: tee ~/work/run_build.sh <<'EOF' set -ex echo "::group::Configure ccache in VM" - ccache --set-config="cache_dir=$HOME/work/harbour/harbour/.ccache" + ccache --set-config="cache_dir=$(pwd)/.ccache" ccache --set-config=max_size=32M ccache --set-config=compression=true ccache -p @@ -130,14 +130,14 @@ jobs: echo ::group::Build Harbour set -ex . ./.bashrc - gmake -j$(sysctl -n hw.ncpu) \ + gmake -j$(/sbin/sysctl -n hw.ncpu) \ HB_BUILD_CONTRIBS=no \ HB_COMPILER=${{matrix.compiler}} echo "::group::Build contribs" set -ex . ./.bashrc - gmake -j$(sysctl -n hw.ncpu) \ + gmake -j$(/sbin/sysctl -n hw.ncpu) \ -C contrib \ HB_COMPILER=${{matrix.compiler}} diff --git a/ChangeLog.txt b/ChangeLog.txt index 3d1834bdc8..97971b7ef6 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,6 +7,10 @@ Entries may not always be in chronological/commit order. See license at the end of file. */ +2023-11-11 18:25 UTC+0100 Phil Krylov (phil a t krylov.eu) + * .github/workflows/vm1-ci.yml + ! Fixed ccache and sysctl path in BSD CI builds. + 2023-11-11 17:07 UTC+0100 Phil Krylov (phil a t krylov.eu) * src/3rd/pcre ! Updated pcre to 8.45.