Skip to content

Commit

Permalink
Update CI to use SBT action (#110)
Browse files Browse the repository at this point in the history
* SBT update
  • Loading branch information
pomadchin authored Oct 28, 2024
1 parent b988b04 commit 05dce01
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/ci.yml
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
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
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.2
sbt.version=1.10.3

0 comments on commit 05dce01

Please sign in to comment.