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

Jump to bottom

Update CI to use SBT action #110

Merged
merged 2 commits into from
Oct 28, 2024
Merged

Update CI to use SBT action #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a98e208
SBT update
pomadchin Oct 28, 2024
10e4efd
SBT update
pomadchin Oct 28, 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
11 changes: 7 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
arch: arm64
java: [11]
distribution: [temurin]
pdal: [2.8.0]
pdal: [2.8.1]
runs-on: ${{ matrix.os }}
defaults:
run:
Expand All @@ -37,8 +37,8 @@ jobs:
distribution: ${{ matrix.distribution }}
java-version: ${{ matrix.java }}

- run: brew install sbt
if: ${{ matrix.os == 'macos-latest' }}
- name: Install sbt
uses: sbt/setup-sbt@v1

- uses: conda-incubator/setup-miniconda@v3
with:
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
os: [ubuntu-latest]
java: [11]
distribution: [temurin]
pdal: [2.8.0]
pdal: [2.8.1]
runs-on: ${{ matrix.os }}
if: github.event_name != 'pull_request'
needs: [build]
Expand All @@ -109,6 +109,9 @@ jobs:
distribution: ${{ matrix.distribution }}
java-version: ${{ matrix.java }}

- name: Install sbt
uses: sbt/setup-sbt@v1

- uses: conda-incubator/setup-miniconda@v3
with:
activate-environment: pdal-java
Expand Down
2 changes: 1 addition & 1 deletion examples/pdal-jni/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
val scala212 = "2.12.19"
val scala213 = "2.13.14"
val scala213 = "2.13.15"
val scala3 = "3.5.0"
val scalaVersions = Seq(scala3, scala213, scala212)

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.2
sbt.version=1.10.3
Loading