diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml index 2347ed1e07..2b4655b5c7 100644 --- a/.github/workflows/coverity-scan.yml +++ b/.github/workflows/coverity-scan.yml @@ -11,14 +11,8 @@ jobs: steps: - uses: actions/checkout@v2 - - - name: Update Submodules - shell: bash - run: | - auth_header="$(git config --local --get http.https://github.com/.extraheader)" - git submodule sync --recursive - git -c "http.extraheader=$auth_header" -c protocol.version=2 \ - submodule update --init --force --recursive --depth=1 + with: + submodules: "recursive" - name: Fetch Dependencies run: | @@ -45,7 +39,7 @@ jobs: wget - name: Install CAF - run: ( cd auxil/broker/caf && ./configure --prefix=`pwd`/build/install-root && cd build && make -j 3 install ) + run: cd auxil/broker/caf && ./configure --prefix=`pwd`/build/install-root && cd build && make -j $(nproc) install - name: Configure run: ./configure --build-type=debug --with-caf=`pwd`/auxil/broker/caf/build/install-root --disable-broker-tests @@ -65,7 +59,7 @@ jobs: - name: Build run: | export PATH=`pwd`/coverity-tools/bin:$PATH - ( cd build && cov-build --dir cov-int make -j 3 ) + ( cd build && cov-build --dir cov-int make -j $(nproc) ) cat build/cov-int/build-log.txt - name: Submit diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml index 47446522d3..20baa71484 100644 --- a/.github/workflows/generate-docs.yml +++ b/.github/workflows/generate-docs.yml @@ -17,15 +17,10 @@ jobs: steps: - uses: actions/checkout@v2 with: - token: ${{ secrets.ZEEK_BOT_TOKEN }} + submodules: "recursive" - - name: Sync Submodules - run: | - auth_header="$(git config --local --get http.https://github.com/.extraheader)" - git submodule sync --recursive - git -c "http.extraheader=$auth_header" -c protocol.version=2 \ - submodule update --init --force --recursive --depth=1 - ( cd doc && git checkout master ) + - name: Switch doc submodule to master + run: cd doc && git checkout master - name: Fetch Dependencies run: | @@ -58,8 +53,7 @@ jobs: run: ./configure - name: Build - run: | - ( cd build && make -j 3 ) + run: cd build && make -j $(nproc) - name: Generate Docs run: | diff --git a/CHANGES b/CHANGES index 4c4fe7b378..5f4c630110 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +5.0.0-dev.114 | 2022-02-11 09:30:04 -0800 + + * Minor modernizations to Github workflows (Christian Kreibich, Corelight) + 5.0.0-dev.112 | 2022-02-10 17:56:27 -0800 * Reorg of the cluster controller to new "Management framework" layout (Christian Kreibich, Corelight) diff --git a/VERSION b/VERSION index 6deafa2d81..b5b2cd5f89 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.0.0-dev.112 +5.0.0-dev.114