@@ -707,18 +707,18 @@ jobs:
707707 with :
708708 ref : ${{ github.event.pull_request.base.ref }}
709709 path : base
710- # - name: Build Base Branch
711- # run: |
712- # cd base
713- # npm ci --ignore-scripts
714- # cd ..
715- # mkdir base/build
716- # cd base/build
717- # cmake -DENABLE_CONAN=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_NODE_BINDINGS=ON ..
718- # make -j$(nproc)
719- # make -j$(nproc) benchmarks
720- # cd ..
721- # make -C test/data
710+ - name : Build Base Branch
711+ run : |
712+ cd base
713+ npm ci --ignore-scripts
714+ cd ..
715+ mkdir base/build
716+ cd base/build
717+ cmake -DENABLE_CONAN=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_NODE_BINDINGS=ON ..
718+ make -j$(nproc)
719+ make -j$(nproc) benchmarks
720+ cd ..
721+ make -C test/data
722722 - name : Build PR Branch
723723 run : |
724724 cd pr
@@ -752,27 +752,27 @@ jobs:
752752 sudo cset shield --exec -- ./pr/scripts/ci/run_benchmarks.sh -f ~/benchmarks -r $(pwd)/pr_results -s $(pwd)/pr -b ~/benchmarks/build -o ~/data.osm.pbf -g ~/gps_traces.csv
753753 sudo umount ~/benchmarks
754754 sudo cset shield --reset
755- # - name: Run Base Benchmarks
756- # run: |
757- # sudo cset shield -c 2-3 -k on
758- # sudo mount -t tmpfs -o size=4g none ~/benchmarks
759- # cp -rf base/build ~/benchmarks/build
760- # cp -rf base/lib ~/benchmarks/lib
761- # mkdir -p ~/benchmarks/test
762- # cp -rf base/test/data ~/benchmarks/test/data
763- # cp -rf base/profiles ~/benchmarks/profiles
764-
765- # # TODO: remove it when base branch will have this file at needed location
766- # if [ ! -f ~/benchmarks/test/data/portugal_to_korea.json ]; then
767- # cp base/src/benchmarks/portugal_to_korea.json ~/benchmarks/test/data/portugal_to_korea.json
768- # fi
769- # # we intentionally use scripts from PR branch to be able to update them and see results in the same PR
770- # sudo cset shield --exec -- cset shield --exec -- ./pr/scripts/ci/run_benchmarks.sh -f ~/benchmarks -r $(pwd)/base_results -s $(pwd)/pr -b ~/benchmarks/build -o ~/data.osm.pbf -g ~/gps_traces.csv
771- # sudo umount ~/benchmarks
772- # sudo cset shield --reset
773- # - name: Post Benchmark Results
774- # run: |
775- # python3 pr/scripts/ci/post_benchmark_results.py base_results pr_results
755+ - name : Run Base Benchmarks
756+ run : |
757+ sudo cset shield -c 2-3 -k on
758+ sudo mount -t tmpfs -o size=4g none ~/benchmarks
759+ cp -rf base/build ~/benchmarks/build
760+ cp -rf base/lib ~/benchmarks/lib
761+ mkdir -p ~/benchmarks/test
762+ cp -rf base/test/data ~/benchmarks/test/data
763+ cp -rf base/profiles ~/benchmarks/profiles
764+
765+ # TODO: remove it when base branch will have this file at needed location
766+ if [ ! -f ~/benchmarks/test/data/portugal_to_korea.json ]; then
767+ cp base/src/benchmarks/portugal_to_korea.json ~/benchmarks/test/data/portugal_to_korea.json
768+ fi
769+ # we intentionally use scripts from PR branch to be able to update them and see results in the same PR
770+ sudo cset shield --exec -- cset shield --exec -- ./pr/scripts/ci/run_benchmarks.sh -f ~/benchmarks -r $(pwd)/base_results -s $(pwd)/pr -b ~/benchmarks/build -o ~/data.osm.pbf -g ~/gps_traces.csv
771+ sudo umount ~/benchmarks
772+ sudo cset shield --reset
773+ - name : Post Benchmark Results
774+ run : |
775+ python3 pr/scripts/ci/post_benchmark_results.py base_results pr_results
776776 - name : Show CCache statistics
777777 run : |
778778 ccache -p
0 commit comments