Skip to content

Commit 0a9e556

Browse files
authored
PDAL 2.8.x (#105)
* PDAL 2.8.x CI build * Drop MacOS x86 builds, conda packages are arm only now
1 parent 804a1f6 commit 0a9e556

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,13 @@ jobs:
1515
build:
1616
strategy:
1717
matrix:
18-
# Specifying `macos-14` is the way to get aarch64
19-
os: [ubuntu-latest, macos-12, macos-14]
18+
os: [ubuntu-latest, macos-latest]
2019
include:
21-
- os: macos-12
22-
arch: x86_64
23-
- os: macos-14
20+
- os: macos-latest
2421
arch: arm64
2522
java: [11]
2623
distribution: [temurin]
27-
pdal: [2.7.1]
24+
pdal: [2.8.0]
2825
runs-on: ${{ matrix.os }}
2926
defaults:
3027
run:
@@ -41,7 +38,7 @@ jobs:
4138
java-version: ${{ matrix.java }}
4239

4340
- run: brew install sbt
44-
if: ${{ matrix.os == 'macos-14' }}
41+
if: ${{ matrix.os == 'macos-latest' }}
4542

4643
- uses: conda-incubator/setup-miniconda@v3
4744
with:
@@ -67,7 +64,7 @@ jobs:
6764

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

7269
- name: Set LD_LIBRARY_PATH
7370
if: ${{ matrix.os == 'ubuntu-latest' }}
@@ -91,7 +88,7 @@ jobs:
9188
os: [ubuntu-latest]
9289
java: [11]
9390
distribution: [temurin]
94-
pdal: [2.7.1]
91+
pdal: [2.8.0]
9592
runs-on: ${{ matrix.os }}
9693
if: github.event_name != 'pull_request'
9794
needs: [build]
@@ -136,19 +133,15 @@ jobs:
136133

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

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

145142
- uses: actions/download-artifact@v4
146143
with:
147-
name: macos-12
148-
path: native/target/native/x86_64-darwin/bin
149-
- uses: actions/download-artifact@v4
150-
with:
151-
name: macos-14
144+
name: macos-latest
152145
path: native/target/native/arm64-darwin/bin
153146

154147
- name: Release

0 commit comments

Comments
 (0)