Skip to content

Commit 546280f

Browse files
authored
Workflow changes for cache and tests (chitralverma#91)
* replace coursier cache
1 parent 48dfa61 commit 546280f

File tree

4 files changed

+17
-32
lines changed

4 files changed

+17
-32
lines changed

.github/workflows/pr-lint.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,13 @@ jobs:
2121
with:
2222
java-version: "8"
2323
distribution: 'temurin'
24+
cache: 'sbt'
2425

2526
- name: Install rust toolchain
2627
uses: dtolnay/rust-toolchain@nightly
2728
with:
2829
components: "clippy, rustfmt"
2930

30-
- uses: coursier/cache-action@v6
31-
with:
32-
extraKey: lint
33-
3431
- uses: Swatinem/rust-cache@v2
3532
with:
3633
workspaces: native
@@ -40,3 +37,6 @@ jobs:
4037
run: |
4138
cargo install cargo-sort
4239
sbt fmtCheckAll
40+
41+
- name: Check doc issues
42+
run: sbt makeSite

.github/workflows/release.yml

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,13 @@ jobs:
2020
with:
2121
java-version: "8"
2222
distribution: 'temurin'
23+
cache: 'sbt'
2324

2425
- name: Install rust toolchain
2526
uses: dtolnay/rust-toolchain@nightly
2627
with:
2728
components: "clippy, rustfmt"
2829

29-
- uses: coursier/cache-action@v6
30-
with:
31-
extraKey: lint
32-
3330
- uses: Swatinem/rust-cache@v2
3431
with:
3532
workspaces: native
@@ -40,6 +37,9 @@ jobs:
4037
cargo install cargo-sort
4138
sbt fmtCheckAll
4239
40+
- name: Check doc issues
41+
run: sbt makeSite
42+
4343
build-natives:
4444
name: ${{ matrix.arch }} build
4545
runs-on: ${{ matrix.os }}
@@ -87,14 +87,11 @@ jobs:
8787
with:
8888
java-version: "8"
8989
distribution: 'temurin'
90+
cache: 'sbt'
9091

9192
- name: Install rust toolchain
9293
uses: dtolnay/rust-toolchain@nightly
9394

94-
- uses: coursier/cache-action@v6
95-
with:
96-
extraKey: ${{ matrix.arch }}
97-
9895
- uses: Swatinem/rust-cache@v2
9996
with:
10097
workspaces: native
@@ -114,7 +111,7 @@ jobs:
114111
if-no-files-found: error
115112

116113
test-build:
117-
name: ${{ matrix.os }} test
114+
name: ${{ matrix.os }} ${{ matrix.java }} test
118115
runs-on: ${{ matrix.os }}
119116
needs: [ build-natives ]
120117
env:
@@ -126,6 +123,7 @@ jobs:
126123
fail-fast: false
127124
matrix:
128125
include:
126+
- java: [ '8', '11', '17', '21' ]
129127
- os: ubuntu-latest
130128

131129
- os: windows-latest
@@ -138,12 +136,9 @@ jobs:
138136
- name: Set up JDK
139137
uses: actions/setup-java@v4
140138
with:
141-
java-version: "8"
139+
java-version: ${{ matrix.java }}
142140
distribution: 'temurin'
143-
144-
- uses: coursier/cache-action@v6
145-
with:
146-
extraKey: ${{ matrix.arch }}
141+
cache: 'sbt'
147142

148143
- name: Download artifacts
149144
uses: actions/download-artifact@v4
@@ -152,7 +147,7 @@ jobs:
152147
path: /tmp/native-libs/
153148
merge-multiple: true
154149

155-
- name: Test for ${{ matrix.os }}
150+
- name: Test for ${{ matrix.os }} ${{ matrix.java }}
156151
run: |
157152
sbt +assembly
158153
java -cp ./examples/target/scala-2.12/scala-polars-examples-assembly-0.1.0-SNAPSHOT.jar examples.scala.io.LazyAndEagerAPI
@@ -180,10 +175,7 @@ jobs:
180175
with:
181176
java-version: "8"
182177
distribution: 'temurin'
183-
184-
- uses: coursier/cache-action@v6
185-
with:
186-
extraKey: ${{ matrix.arch }}
178+
cache: 'sbt'
187179

188180
- name: Download artifacts
189181
uses: actions/download-artifact@v4

core/src/main/scala/org/polars/scala/polars/Main.java

Lines changed: 0 additions & 9 deletions
This file was deleted.

project/DocSettings.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import sbtunidoc.BaseUnidocPlugin.autoImport.*
66
import sbtunidoc.JavaUnidocPlugin.autoImport.*
77
import sbtunidoc.ScalaUnidocPlugin.autoImport.*
88

9+
/* Borrowed from delta-io/delta */
10+
911
object DocSettings {
1012
val unidocSourceFilePatterns = settingKey[Seq[SourceFilePattern]](
1113
"Patterns to match (simple substring match) against full source file paths. " +

0 commit comments

Comments
 (0)