Skip to content

Commit

Permalink
Merge branch 'master' into feat_pololu
Browse files Browse the repository at this point in the history
  • Loading branch information
fspindle committed Oct 31, 2023
2 parents 92996b1 + a2ddf0c commit 66f5a37
Show file tree
Hide file tree
Showing 710 changed files with 20,207 additions and 19,239 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu-dep-apt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
matrix:
os: [ubuntu-20.04, ubuntu-22.04]
compiler: [ {CC: /usr/bin/gcc-9, CXX: /usr/bin/g++-9}, {CC: /usr/bin/gcc-10, CXX: /usr/bin/g++-10}, {CC: /usr/bin/clang, CXX: /usr/bin/clang++} ]
standard: [ 98, 11, 14, 17 ]
standard: [ 11, 14, 17 ]

steps:
# https://github.com/marketplace/actions/cancel-workflow-action
Expand All @@ -36,7 +36,7 @@ jobs:
- name: Print compiler information
run: dpkg --list | grep compiler

- name: Install dependencies for ubuntu 18.04 and 20.04
- name: Install dependencies for ubuntu 20.04
if: matrix.os != 'ubuntu-22.04'
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-22-dev libv4l-dev liblapack-dev libopenblas-dev libeigen3-dev libopencv-dev nlohmann-json3-dev

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-dep-src.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Print OS information
run: lsb_release -a

- name: Install dependencies for ubuntu 18.04 and 20.04
- name: Install dependencies for ubuntu 20.04
if: matrix.os != 'ubuntu-22.04'
run: |
sudo apt-get update && sudo apt-get install -y libdc1394-22-dev
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-ustk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Print compiler information
run: dpkg --list | grep compiler

- name: Install dependencies for ubuntu 18.04 and 20.04
- name: Install dependencies for ubuntu 20.04
if: matrix.os != 'ubuntu-22.04'
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-22-dev libv4l-dev liblapack-dev libopenblas-dev libeigen3-dev libopencv-dev nlohmann-json3-dev

Expand Down
Loading

0 comments on commit 66f5a37

Please sign in to comment.