Skip to content

Commit

Permalink
Update ci
Browse files Browse the repository at this point in the history
  • Loading branch information
fspindle committed Jul 15, 2024
1 parent bf3db7a commit 50ec590
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 30 deletions.
30 changes: 9 additions & 21 deletions .github/workflows/macos-ustk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@ on:
schedule:
- cron: '0 2 * * SUN'

# https://stackoverflow.com/questions/66335225/how-to-cancel-previous-runs-in-the-pr-when-you-push-new-commitsupdate-the-curre#comment133398800_72408109
# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#concurrency
concurrency:
group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
cancel-in-progress: true

jobs:
build-macos:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [macos-11.0]
os: [macos-latest]

steps:
# https://github.com/marketplace/actions/cancel-workflow-action
- name: Cancel Previous Runs
uses: styfle/[email protected]
with:
access_token: ${{ github.token }}

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Print system information
run: |
Expand All @@ -34,15 +34,7 @@ jobs:
run: system_profiler SPSoftwareDataType

- name: Install dependencies
run: brew install libpng libjpeg libdc1394 opencv pcl librealsense zbar vtk fftw armadillo

# qt@5 is as a requested dependency for vtk and thus for pcl 1.12.1
# qt@5 is keg-only, which means it was not symlinked into /usr/local
- name: Workaround to detect qt5
run: |
brew link --force qt5
sudo ln -s $(brew --prefix qt5)/mkspecs /usr/local/mkspecs
sudo ln -s $(brew --prefix qt5)/plugins /usr/local/plugins
run: brew install libpng libjpeg-turbo opencv vtk fftw armadillo

- name: Clone visp-images
run: |
Expand All @@ -64,12 +56,8 @@ jobs:
run: |
git clone --depth 1 https://github.com/lagadic/ustk-sample ${HOME}/ustk-sample
# Openblas location is exported explicitly because openblas is keg-only,
# which means it was not symlinked into /usr/local/.
- name: Configure CMake
run: |
export LDFLAGS="-L/usr/local/opt/openblas/lib"
export CPPFLAGS="-I/usr/local/opt/openblas/include"
mkdir build
cd build
cmake ${HOME}/visp -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/tmp/usr/local -DVISP_CONTRIB_MODULES_PATH=${GITHUB_WORKSPACE}/modules
Expand Down
17 changes: 8 additions & 9 deletions .github/workflows/ubuntu-ustk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@ on:
schedule:
- cron: '0 2 * * SUN'

# https://stackoverflow.com/questions/66335225/how-to-cancel-previous-runs-in-the-pr-when-you-push-new-commitsupdate-the-curre#comment133398800_72408109
# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#concurrency
concurrency:
group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
cancel-in-progress: true

jobs:
build-ubuntu-dep-apt:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-18.04, ubuntu-20.04]
os: [ubuntu-22.04, ubuntu-latest]

steps:
# https://github.com/marketplace/actions/cancel-workflow-action
- name: Cancel Previous Runs
uses: styfle/[email protected]
with:
access_token: ${{ github.token }}

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Print system information
run: lscpu
Expand Down Expand Up @@ -80,4 +80,3 @@ jobs:
cd ustk-sample-build
cmake .. -DVISP_DIR=/tmp/usr/local/lib/cmake/visp
make -j$(nproc)

0 comments on commit 50ec590

Please sign in to comment.