From 7390cf995777b72e98d89bf3fb8e91f43b7c3338 Mon Sep 17 00:00:00 2001 From: Grigory Pomadchin Date: Sat, 7 Sep 2024 23:32:14 -0400 Subject: [PATCH 1/7] PDAL 2.8.x CI build --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 761f0c2..a272876 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: arch: arm64 java: [11] distribution: [temurin] - pdal: [2.7.1] + pdal: [2.8.0] runs-on: ${{ matrix.os }} defaults: run: @@ -91,7 +91,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] From 4c547e35b34fb9653f9fbf507e0d3e520569751b Mon Sep 17 00:00:00 2001 From: Grigory Pomadchin Date: Tue, 10 Sep 2024 19:30:41 -0400 Subject: [PATCH 2/7] Use the up to date PDAL conda package --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a272876..70b8a23 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,7 +67,7 @@ jobs: - name: Install PDAL if: steps.conda-cache.outputs.cache-hit != 'true' - run: conda install pdal=${{ matrix.pdal }} + run: conda install libpdal=${{ matrix.pdal }} - name: Set LD_LIBRARY_PATH if: ${{ matrix.os == 'ubuntu-latest' }} @@ -136,7 +136,7 @@ jobs: - name: Install PDAL if: steps.conda-cache.outputs.cache-hit != 'true' - run: conda install pdal=${{ matrix.pdal }} + run: conda install libpdal=${{ matrix.pdal }} - name: Set LD_LIBRARY_PATH if: ${{ matrix.os == 'ubuntu-latest' }} From 12bee90fb25a8d591e4766b59e40d9bfb3193e14 Mon Sep 17 00:00:00 2001 From: Grigory Pomadchin Date: Tue, 10 Sep 2024 19:34:10 -0400 Subject: [PATCH 3/7] Install libpdal-trajectory --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70b8a23..6a41761 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,7 +67,7 @@ jobs: - name: Install PDAL if: steps.conda-cache.outputs.cache-hit != 'true' - run: conda install libpdal=${{ matrix.pdal }} + run: conda install libpdal-trajectory=${{ matrix.pdal }} libpdal=${{ matrix.pdal }} - name: Set LD_LIBRARY_PATH if: ${{ matrix.os == 'ubuntu-latest' }} @@ -136,7 +136,7 @@ jobs: - name: Install PDAL if: steps.conda-cache.outputs.cache-hit != 'true' - run: conda install libpdal=${{ matrix.pdal }} + run: conda install libpdal-trajectory=${{ matrix.pdal }} libpdal=${{ matrix.pdal }} - name: Set LD_LIBRARY_PATH if: ${{ matrix.os == 'ubuntu-latest' }} From bf417e514e5f133c1a18c2c728c9e70bb15465ff Mon Sep 17 00:00:00 2001 From: Grigory Pomadchin Date: Tue, 10 Sep 2024 19:46:43 -0400 Subject: [PATCH 4/7] Use macos-13 for x86 builds --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a41761..b4e5d48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,9 +16,9 @@ jobs: strategy: matrix: # Specifying `macos-14` is the way to get aarch64 - os: [ubuntu-latest, macos-12, macos-14] + os: [ubuntu-latest, macos-13, macos-14] include: - - os: macos-12 + - os: macos-13 arch: x86_64 - os: macos-14 arch: arm64 @@ -67,7 +67,7 @@ jobs: - name: Install PDAL if: steps.conda-cache.outputs.cache-hit != 'true' - run: conda install libpdal-trajectory=${{ matrix.pdal }} libpdal=${{ matrix.pdal }} + run: conda install libpdal=${{ matrix.pdal }} - name: Set LD_LIBRARY_PATH if: ${{ matrix.os == 'ubuntu-latest' }} @@ -136,7 +136,7 @@ jobs: - name: Install PDAL if: steps.conda-cache.outputs.cache-hit != 'true' - run: conda install libpdal-trajectory=${{ matrix.pdal }} libpdal=${{ matrix.pdal }} + run: conda install libpdal=${{ matrix.pdal }} - name: Set LD_LIBRARY_PATH if: ${{ matrix.os == 'ubuntu-latest' }} @@ -144,7 +144,7 @@ jobs: - uses: actions/download-artifact@v4 with: - name: macos-12 + name: macos-13 path: native/target/native/x86_64-darwin/bin - uses: actions/download-artifact@v4 with: From 31b103de3cafae4091edb7c56b89c7941af14e6e Mon Sep 17 00:00:00 2001 From: Grigory Pomadchin Date: Tue, 10 Sep 2024 19:50:01 -0400 Subject: [PATCH 5/7] libpdal => libpdal-core --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b4e5d48..ef99f43 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,7 +67,7 @@ jobs: - name: Install PDAL if: steps.conda-cache.outputs.cache-hit != 'true' - run: conda install libpdal=${{ matrix.pdal }} + run: conda install libpdal-core=${{ matrix.pdal }} - name: Set LD_LIBRARY_PATH if: ${{ matrix.os == 'ubuntu-latest' }} @@ -136,7 +136,7 @@ jobs: - name: Install PDAL if: steps.conda-cache.outputs.cache-hit != 'true' - run: conda install libpdal=${{ matrix.pdal }} + run: conda install libpdal-core=${{ matrix.pdal }} - name: Set LD_LIBRARY_PATH if: ${{ matrix.os == 'ubuntu-latest' }} From 2fef5a254135e2bea999502bafa96f3b26906019 Mon Sep 17 00:00:00 2001 From: Grigory Pomadchin Date: Tue, 10 Sep 2024 19:58:37 -0400 Subject: [PATCH 6/7] Drop MacOS x86 builds, conda packages are arm only now --- .github/workflows/ci.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef99f43..ecd86af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,12 +15,9 @@ jobs: build: strategy: matrix: - # Specifying `macos-14` is the way to get aarch64 - os: [ubuntu-latest, macos-13, macos-14] + os: [ubuntu-latest, macos-latest] include: - - os: macos-13 - arch: x86_64 - - os: macos-14 + - os: macos-latest arch: arm64 java: [11] distribution: [temurin] @@ -41,7 +38,6 @@ jobs: java-version: ${{ matrix.java }} - run: brew install sbt - if: ${{ matrix.os == 'macos-14' }} - uses: conda-incubator/setup-miniconda@v3 with: @@ -144,11 +140,7 @@ jobs: - uses: actions/download-artifact@v4 with: - name: macos-13 - 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 From c67e1e6ec8893069cc95039721254fdaf25964f1 Mon Sep 17 00:00:00 2001 From: Grigory Pomadchin Date: Tue, 10 Sep 2024 20:00:02 -0400 Subject: [PATCH 7/7] brew install SBT only on mac-latest --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ecd86af..ab23b9c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,6 +38,7 @@ jobs: java-version: ${{ matrix.java }} - run: brew install sbt + if: ${{ matrix.os == 'macos-latest' }} - uses: conda-incubator/setup-miniconda@v3 with: