Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove bench #4560

Merged
merged 20 commits into from
Feb 11, 2024
Merged

remove bench #4560

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
96f9944
move osx ci to github actions
nilsnolde Feb 4, 2024
8daed9d
syntax
nilsnolde Feb 4, 2024
f946fbd
more fix
nilsnolde Feb 4, 2024
727bc19
get valid key; try unquoting path
nilsnolde Feb 4, 2024
26dac42
[skip ci] debug
nilsnolde Feb 4, 2024
e0629a4
error osx to get ssh
nilsnolde Feb 4, 2024
6d26cf2
verify branch name
nilsnolde Feb 4, 2024
95beba5
ccache should work now
nilsnolde Feb 4, 2024
737bd84
try osx ccache
nilsnolde Feb 4, 2024
0de5fa8
ccache cache had the wrong path specified
nilsnolde Feb 4, 2024
0c99c50
stop running benchmarks in ci, but keep building them
nilsnolde Feb 4, 2024
9e70345
Merge branch 'master' into nn-m1-gha
nilsnolde Feb 4, 2024
63edd5a
Merge branch 'master' into nn-m1-gha
nilsnolde Feb 5, 2024
73453d5
Merge branch 'master' into nn-m1-gha
nilsnolde Feb 5, 2024
07ae9c1
remove google benchmark submodule
nilsnolde Feb 5, 2024
0556779
remove the rest
nilsnolde Feb 5, 2024
980b43a
changelog
nilsnolde Feb 5, 2024
13f4d32
merge master
nilsnolde Feb 5, 2024
aad259b
win fix
nilsnolde Feb 5, 2024
d82eb14
Merge branch 'master' into nn-remove-benchmarks
kevinkreiser Feb 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
verify branch name
  • Loading branch information
@nilsnolde
nilsnolde committed Feb 4, 2024
commit 6d26cf23c283603d69533d00662c769c99fffab9
62 changes: 31 additions & 31 deletions .github/workflows/osx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,53 +36,53 @@ jobs:
with:
submodules: recursive

- uses: actions/setup-python@v5
with:
python-version: '3.12'
# - uses: actions/setup-python@v5
# with:
# python-version: '3.12'

- name: Install dependencies
run: |
HOMEBREW_NO_AUTO_UPDATE=1 brew install autoconf automake protobuf cmake ccache libtool sqlite3 libspatialite luajit curl wget czmq lz4 spatialite-tools unzip boost
sudo python -m pip install --break-system-packages requests shapely
git clone https://github.com/kevinkreiser/prime_server --recurse-submodules && cd prime_server && ./autogen.sh && ./configure && make -j8 && sudo make install
# - name: Install dependencies
# run: |
# HOMEBREW_NO_AUTO_UPDATE=1 brew install autoconf automake protobuf cmake ccache libtool sqlite3 libspatialite luajit curl wget czmq lz4 spatialite-tools unzip boost
# sudo python -m pip install --break-system-packages requests shapely
# git clone https://github.com/kevinkreiser/prime_server --recurse-submodules && cd prime_server && ./autogen.sh && ./configure && make -j$(sysctl -n hw.logicalcpu) && sudo make install

- name: Get branch name
run: echo VALHALLA_BRANCH=${GITHUB_REF##*/} >> $GITHUB_ENV
run: echo "VALHALLA_BRANCH=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_ENV

- name: Restore ccache
id: cache-ccache-restore
uses: actions/cache/restore@v4
with:
path: ~/.ccache
path: ~/Library/Caches/ccache
key: ccache-osx-${{ env.VALHALLA_BRANCH }}
restore-keys: |
ccache-osx-master
ccache-osx-

- name: Configure CMake
run: cmake -B build -DENABLE_SINGLE_FILES_WERROR=OFF
# - name: Configure CMake
# run: cmake -B build -DENABLE_SINGLE_FILES_WERROR=OFF

- name: Build Valhalla
run: make -C build -j$(sysctl -n hw.logicalcpu) no-target
# - name: Build Valhalla
# run: make -C build -j$(sysctl -n hw.logicalcpu)

- name: Setup tmate session
uses: mxschmitt/action-tmate@v3
# only run this if manually invoked or a previous job failed
if: ${{ (github.event_name == 'workflow_dispatch' && inputs.debug_enabled) || failure() }}
with:
detached: true
timeout-minutes: 15
# - name: Setup tmate session
# uses: mxschmitt/action-tmate@v3
# # only run this if manually invoked or a previous job failed
# if: ${{ (github.event_name == 'workflow_dispatch' && inputs.debug_enabled) || failure() }}
# with:
# detached: true
# timeout-minutes: 15

- name: Build Tests
run: make -C build -j$(sysctl -n hw.logicalcpu) tests
# - name: Build Tests
# run: make -C build -j$(sysctl -n hw.logicalcpu) tests

- name: Run Tests
run: make -C build -j$(sysctl -n hw.logicalcpu) check
# - name: Run Tests
# run: make -C build -j$(sysctl -n hw.logicalcpu) check

- name: Save ccache
id: cache-ccache-save
uses: actions/cache/save@v4
with:
path: ~/.ccache
key: ${{ steps.cache-ccache-restore.outputs.cache-primary-key }}
# - name: Save ccache
# id: cache-ccache-save
# uses: actions/cache/save@v4
# with:
# path: ~/Library/Caches/ccache
# key: ${{ steps.cache-ccache-restore.outputs.cache-primary-key }}

Loading