From 2fb59690d7c321ccaca76c9683efd96eeb23b664 Mon Sep 17 00:00:00 2001 From: joaquintides Date: Mon, 25 Dec 2023 20:32:17 +0100 Subject: [PATCH] switched to branch feature/cfoa_alf_insert --- .github/workflows/benchmarks.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 31f1873b..bb33742a 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -5,7 +5,7 @@ on: pull_request: push: branches: - - boost_concurrent_flat_map + - boost_concurrent_flat_map_alf_insert jobs: posix: @@ -92,6 +92,10 @@ jobs: git submodule update --init ./bootstrap.sh ./b2 -d0 headers + - name: Install Boost.Unordered branch feature/cfoa_alf_insert + run: | + cd $GITHUB_WORKSPACE + git clone -b feature/cfoa_alf_insert https://github.com/boostorg/unordered.git boost_unordered-root - name: Install oneTBB run: | if [ -n "${{matrix.xcode_version}}" ]; then @@ -119,7 +123,7 @@ jobs: run: | cd $GITHUB_WORKSPACE ${{matrix.compiler}} --version - ${{matrix.compiler}} ${{matrix.sourcefile}} ${{matrix.architecture}} ${{matrix.compileroptions}} -o ${{matrix.outputfile}} -I$GITHUB_WORKSPACE/boost-root -I$GITHUB_WORKSPACE/vcpkg/installed/${{matrix.vcpkgtriplet}}/include -I$GITHUB_WORKSPACE/gtl-root/include -L$GITHUB_WORKSPACE/vcpkg/installed/${{matrix.vcpkgtriplet}}/lib -pthread -ltbb -ltbbmalloc + ${{matrix.compiler}} ${{matrix.sourcefile}} ${{matrix.architecture}} ${{matrix.compileroptions}} -o ${{matrix.outputfile}} -I$GITHUB_WORKSPACE/boost_unordered-root/include -I$GITHUB_WORKSPACE/boost-root -I$GITHUB_WORKSPACE/vcpkg/installed/${{matrix.vcpkgtriplet}}/include -I$GITHUB_WORKSPACE/gtl-root/include -L$GITHUB_WORKSPACE/vcpkg/installed/${{matrix.vcpkgtriplet}}/lib -pthread -ltbb -ltbbmalloc - name: Set reportfile name run: | echo "REPORT_FILE=${{matrix.reportdir}}/${{matrix.sourcefile}}.csv" >> $GITHUB_ENV @@ -186,6 +190,11 @@ jobs: git submodule update --init cmd /c bootstrap.bat .\b2.exe -d0 headers + - name: Install Boost.Unordered branch feature/cfoa_alf_insert + shell: cmd + run: | + cd %GITHUB_WORKSPACE% + git clone -b feature/cfoa_alf_insert https://github.com/boostorg/unordered.git boost_unordered-root - name: Install oneTBB shell: cmd run: | @@ -206,7 +215,7 @@ jobs: run: | cd %GITHUB_WORKSPACE% call "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" ${{matrix.architecture}} - set INCLUDE=%INCLUDE%;%GITHUB_WORKSPACE%\boost-root;%GITHUB_WORKSPACE%\vcpkg\installed\${{matrix.vcpkgtriplet}}\include;%GITHUB_WORKSPACE%\gtl-root\include + set INCLUDE=%INCLUDE%;%GITHUB_WORKSPACE%\boost_unordered-root\include;%GITHUB_WORKSPACE%\boost-root;%GITHUB_WORKSPACE%\vcpkg\installed\${{matrix.vcpkgtriplet}}\include;%GITHUB_WORKSPACE%\gtl-root\include echo %INCLUDE% ${{matrix.compiler}} ${{matrix.sourcefile}} ${{matrix.compileroptions}} - name: Set reportfile name