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

PDAL 2.8.x #105

Merged
merged 7 commits into from
Sep 11, 2024
Merged

PDAL 2.8.x #105

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7390cf9
PDAL 2.8.x CI build
pomadchin Sep 8, 2024
4c547e3
Use the up to date PDAL conda package
pomadchin Sep 10, 2024
12bee90
Install libpdal-trajectory
pomadchin Sep 10, 2024
bf417e5
Use macos-13 for x86 builds
pomadchin Sep 10, 2024
31b103d
libpdal => libpdal-core
pomadchin Sep 10, 2024
2fef5a2
Drop MacOS x86 builds, conda packages are arm only now
pomadchin Sep 10, 2024
c67e1e6
brew install SBT only on mac-latest
pomadchin Sep 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
23 changes: 8 additions & 15 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,13 @@ jobs:
build:
strategy:
matrix:
# Specifying `macos-14` is the way to get aarch64
os: [ubuntu-latest, macos-12, macos-14]
os: [ubuntu-latest, macos-latest]
include:
- os: macos-12
arch: x86_64
- os: macos-14
- os: macos-latest
arch: arm64
java: [11]
distribution: [temurin]
pdal: [2.7.1]
pdal: [2.8.0]
runs-on: ${{ matrix.os }}
defaults:
run:
Expand All @@ -41,7 +38,7 @@ jobs:
java-version: ${{ matrix.java }}

- run: brew install sbt
if: ${{ matrix.os == 'macos-14' }}
if: ${{ matrix.os == 'macos-latest' }}

- uses: conda-incubator/setup-miniconda@v3
with:
Expand All @@ -67,7 +64,7 @@ jobs:

- name: Install PDAL
if: steps.conda-cache.outputs.cache-hit != 'true'
run: conda install pdal=${{ matrix.pdal }}
run: conda install libpdal-core=${{ matrix.pdal }}

- name: Set LD_LIBRARY_PATH
if: ${{ matrix.os == 'ubuntu-latest' }}
Expand All @@ -91,7 +88,7 @@ jobs:
os: [ubuntu-latest]
java: [11]
distribution: [temurin]
pdal: [2.7.1]
pdal: [2.8.0]
runs-on: ${{ matrix.os }}
if: github.event_name != 'pull_request'
needs: [build]
Expand Down Expand Up @@ -136,19 +133,15 @@ jobs:

- name: Install PDAL
if: steps.conda-cache.outputs.cache-hit != 'true'
run: conda install pdal=${{ matrix.pdal }}
run: conda install libpdal-core=${{ matrix.pdal }}

- name: Set LD_LIBRARY_PATH
if: ${{ matrix.os == 'ubuntu-latest' }}
run: echo "LD_LIBRARY_PATH=$CONDA/envs/pdal-java/lib:/usr/local/lib:$LD_LIBRARY_PATH" >> "$GITHUB_ENV"

- uses: actions/download-artifact@v4
with:
name: macos-12
path: native/target/native/x86_64-darwin/bin
- uses: actions/download-artifact@v4
with:
name: macos-14
name: macos-latest
path: native/target/native/arm64-darwin/bin

- name: Release
Expand Down
Loading