Skip to content

Commit

Permalink
refactor CI stuff so it is simpler and better contained
Browse files Browse the repository at this point in the history
  • Loading branch information
hobu committed May 9, 2024
1 parent 43caeb9 commit 9cb0222
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 99 deletions.
21 changes: 15 additions & 6 deletions .github/workflows/linux.yml → .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
name: Linux build
name: Build

on: [push, pull_request]

jobs:
linux-build:
name: Linux build
runs-on: ubuntu-latest
build:
name: Compile on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [macos-latest, windows-latest, ubuntu-latest]

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup MSVC environment
uses: ilammy/msvc-dev-cmd@v1
if: matrix.os == 'windows-latest'

- name: Setup Conda
uses: conda-incubator/setup-miniconda@v2
Expand All @@ -31,7 +37,10 @@ jobs:
shell: bash -l {0}
working-directory: ./build
run: |
LDFLAGS="$LDFLAGS -Wl,-rpath-link,$CONDA_PREFIX/lib -pthread -lpthread" \
if [ "$RUNNER_OS" == "Windows" ]; then
export CC=cl.exe
export CXX=cl.exe
fi
cmake -G Ninja \
-DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} \
..
Expand Down
44 changes: 0 additions & 44 deletions .github/workflows/macos.yml

This file was deleted.

49 changes: 0 additions & 49 deletions .github/workflows/windows.yml

This file was deleted.

11 changes: 11 additions & 0 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: wrench
channels:
- conda-forge
dependencies:
- conda
- mamba
- compilers
- ninja
- cmake
- pdal

0 comments on commit 9cb0222

Please sign in to comment.