switched to branch feature/cfoa_alf_insert

This commit is contained in:
joaquintides
2023-12-25 20:32:17 +01:00
parent 15f74dee88
commit 2fb59690d7

View File

@@ -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