Update doc gen VM to ubuntu-latest, output cmake version during configure

This commit is contained in:
Tim Wojtulewicz 2022-04-19 12:09:56 -07:00
parent 2d43aaf7cc
commit 824bc372c5
2 changed files with 4 additions and 2 deletions

View file

@ -12,7 +12,7 @@ defaults:
jobs: jobs:
generate: generate:
if: github.repository == 'zeek/zeek' if: github.repository == 'zeek/zeek'
runs-on: ubuntu-18.04 runs-on: ubuntu-latest
steps: steps:
# We only perform a push if the action was triggered via a schedule # We only perform a push if the action was triggered via a schedule
@ -60,7 +60,7 @@ jobs:
sudo pip3 install -r doc/requirements.txt sudo pip3 install -r doc/requirements.txt
- name: Configure - name: Configure
run: ./configure run: ./configure --disable-broker-tests --disable-cpp-tests
- name: Build - name: Build
run: cd build && make -j $(nproc) run: cd build && make -j $(nproc)

2
configure vendored
View file

@ -442,6 +442,8 @@ echo "Build Directory : $builddir"
echo "Source Directory: $sourcedir" echo "Source Directory: $sourcedir"
cd $builddir cd $builddir
echo "Using $(cmake --version | head -1)"
echo
if [ -n "$CMakeGenerator" ]; then if [ -n "$CMakeGenerator" ]; then
"$CMakeCommand" -G "$CMakeGenerator" $CMakeCacheEntries $sourcedir "$CMakeCommand" -G "$CMakeGenerator" $CMakeCacheEntries $sourcedir
else else