Skip to content

Commit 43abcae

Browse files
authored
Merge branch 'apache:main' into wip_opfs_3
2 parents 2cdc288 + 9b154a0 commit 43abcae

File tree

19 files changed

+137
-233
lines changed

19 files changed

+137
-233
lines changed

.github/actions/setup-hadoop/action.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ runs:
2828
- name: Setup java env
2929
uses: actions/setup-java@v4
3030
with:
31-
distribution: temurin
32-
java-version: "11"
31+
distribution: zulu
32+
java-version: 11
3333

3434
- name: Cache hadoop
3535
id: cache-hadoop
@@ -51,7 +51,7 @@ runs:
5151
run: |
5252
export HADOOP_HOME=/home/runner/hadoop-3.3.5
5353
echo "HADOOP_HOME=${HADOOP_HOME}" >> $GITHUB_ENV
54-
echo "CLASSPATH=$(${HADOOP_HOME}/bin/hadoop classpath --glob)" >> $GITHUB_ENV
54+
echo "CLASSPATH=$(${HADOOP_HOME}/bin/hadoop classpath --glob)" >> $GITHUB_ENV
5555
echo "LD_LIBRARY_PATH=${{ env.JAVA_HOME }}/lib/server:${HADOOP_HOME}/lib/native" >> $GITHUB_ENV
5656
cp ${{ github.workspace }}/fixtures/hdfs/hdfs-site.xml ${HADOOP_HOME}/etc/hadoop/hdfs-site.xml
5757

.github/actions/test_behavior_binding_java/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ runs:
4141
- name: Run Test Binding Java
4242
shell: bash
4343
working-directory: bindings/java
44-
run: ./mvnw test -Dtest="behavior.*Test" -Dcargo-build.features=${{ inputs.feature }}
44+
run: ./mvnw test -Dtest="behavior.*Test"
4545
env:
4646
OPENDAL_TEST: ${{ inputs.service }}
4747
EOF

.github/scripts/test_behavior/plan.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ def mark_service_affected(service: str) -> None:
175175
hint.binding_go = True
176176
hint.all_service = True
177177

178-
# cpp affected
178+
# cpp affected
179179
if p.startswith("bindings/cpp/"):
180180
hint.binding_cpp = True
181181
hint.all_service = True
@@ -267,9 +267,15 @@ def generate_language_binding_cases(
267267
# Bindings may be treated as parallel requests, so we need to disable it for all languages.
268268
cases = [v for v in cases if v["service"] != "aliyun_drive"]
269269

270-
# Remove hdfs cases for java and go.
270+
# Remove invalid cases for java.
271271
if language == "java":
272-
cases = [v for v in cases if v["service"] != "hdfs"]
272+
cases = [v for v in cases if v["service"] not in [
273+
"compfs",
274+
"hdfs",
275+
"hdfs_native",
276+
"monoiofs",
277+
"rocksdb",
278+
]]
273279

274280
if os.getenv("GITHUB_IS_PUSH") == "true":
275281
return cases

.github/services/hdfs/hdfs_default_gcs/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ runs:
2424
- name: Setup java env
2525
uses: actions/setup-java@v4
2626
with:
27-
distribution: temurin
28-
java-version: "11"
27+
distribution: zulu
28+
java-version: 11
2929
- name: Load secrets
3030
uses: 1password/load-secrets-action@13f58eec611f8e5db52ec16247f58c508398f3e6 # v3
3131
with:

.github/services/hdfs/hdfs_default_on_azurite_azblob/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ runs:
2424
- name: Setup java env
2525
uses: actions/setup-java@v4
2626
with:
27-
distribution: temurin
28-
java-version: "11"
27+
distribution: zulu
28+
java-version: 11
2929
- name: Setup azurite azblob service
3030
shell: bash
3131
working-directory: fixtures/azblob

.github/services/hdfs/hdfs_default_on_minio_s3/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ runs:
2424
- name: Setup java env
2525
uses: actions/setup-java@v4
2626
with:
27-
distribution: temurin
28-
java-version: "11"
27+
distribution: zulu
28+
java-version: 11
2929
- name: Setup MinIO Server
3030
shell: bash
3131
working-directory: fixtures/s3

.github/workflows/ci_bindings_java.yml

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,37 +46,57 @@ jobs:
4646
runs-on: ubuntu-latest
4747
steps:
4848
- uses: actions/checkout@v6
49-
- name: Set up JDK 21
49+
- name: Set up Rust toolchain
50+
uses: ./.github/actions/setup
51+
with:
52+
need-nextest: true
53+
need-protoc: true
54+
need-rocksdb: true
55+
github-token: ${{ secrets.GITHUB_TOKEN }}
56+
- name: Set up JDK 25
5057
uses: actions/setup-java@v5
5158
with:
52-
distribution: 'zulu'
53-
java-version: '21'
59+
distribution: zulu
60+
java-version: 25
5461
cache: 'maven'
5562
- name: Build and check
5663
working-directory: bindings/java
5764
run: |
5865
./mvnw clean compile spotless:check
59-
6066
- name: Check Clippy
6167
working-directory: bindings/java
6268
run: cargo clippy -- -D warnings
6369

6470
test:
6571
runs-on: ${{ matrix.os }}
6672
strategy:
73+
fail-fast: false
6774
matrix:
6875
os:
6976
- ubuntu-latest
7077
- ubuntu-24.04-arm
7178
- macos-latest
7279
- windows-latest
80+
java-version:
81+
- 8
82+
- 11
83+
- 17
84+
- 21
85+
- 25
7386
steps:
7487
- uses: actions/checkout@v6
75-
- name: Set up JDK 8
88+
- name: Set up Rust toolchain
89+
uses: ./.github/actions/setup
90+
with:
91+
need-nextest: true
92+
need-protoc: true
93+
need-rocksdb: true
94+
github-token: ${{ secrets.GITHUB_TOKEN }}
95+
- name: Set up JDK ${{ matrix.java-version }}
7696
uses: actions/setup-java@v5
7797
with:
78-
distribution: 'zulu'
79-
java-version: '8'
98+
distribution: zulu
99+
java-version: ${{ matrix.java-version }}
80100
cache: 'maven'
81101
- name: Build and test
82102
working-directory: bindings/java

.github/workflows/ci_core.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ jobs:
4848
- name: Checkout java env
4949
uses: actions/setup-java@v5
5050
with:
51-
distribution: temurin
52-
java-version: "11"
51+
distribution: zulu
52+
java-version: 25
5353

5454
- name: Cargo doc
5555
working-directory: core
@@ -70,8 +70,8 @@ jobs:
7070
- name: Checkout java env
7171
uses: actions/setup-java@v5
7272
with:
73-
distribution: temurin
74-
java-version: "11"
73+
distribution: zulu
74+
java-version: 25
7575

7676
- name: Cargo clippy
7777
working-directory: core
@@ -126,8 +126,8 @@ jobs:
126126
- name: Checkout java env
127127
uses: actions/setup-java@v5
128128
with:
129-
distribution: temurin
130-
java-version: "11"
129+
distribution: zulu
130+
java-version: 25
131131

132132
- name: Setup Rust toolchain
133133
uses: ./.github/actions/setup
@@ -157,8 +157,8 @@ jobs:
157157
- name: Checkout java env
158158
uses: actions/setup-java@v5
159159
with:
160-
distribution: temurin
161-
java-version: "11"
160+
distribution: zulu
161+
java-version: 25
162162

163163
- name: Setup Rust toolchain
164164
uses: ./.github/actions/setup
@@ -266,8 +266,8 @@ jobs:
266266
- name: Checkout java env
267267
uses: actions/setup-java@v5
268268
with:
269-
distribution: temurin
270-
java-version: "11"
269+
distribution: zulu
270+
java-version: 25
271271

272272
- name: Setup Rust toolchain
273273
uses: ./.github/actions/setup
@@ -311,8 +311,8 @@ jobs:
311311
- name: Checkout java env
312312
uses: actions/setup-java@v5
313313
with:
314-
distribution: temurin
315-
java-version: "11"
314+
distribution: zulu
315+
java-version: 25
316316

317317
- name: Setup Rust toolchain
318318
uses: ./.github/actions/setup

.github/workflows/ci_integration_spring.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ jobs:
4545
- name: Set up Java
4646
uses: actions/setup-java@v5
4747
with:
48-
java-version: '17'
49-
distribution: 'temurin'
48+
java-version: 25
49+
distribution: zulu
5050

5151
- name: package and test
5252
working-directory: integrations/spring

.github/workflows/docs.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ jobs:
6565
6666
- uses: actions/setup-java@v5
6767
with:
68-
distribution: temurin
69-
java-version: "17"
68+
distribution: zulu
69+
java-version: 25
7070

7171
- name: Build OpenDAL doc
7272
working-directory: core
@@ -88,12 +88,12 @@ jobs:
8888

8989
- uses: actions/setup-java@v5
9090
with:
91-
distribution: temurin
92-
java-version: "17"
91+
distribution: zulu
92+
java-version: 25
9393

9494
- name: Build and test
9595
working-directory: bindings/java
96-
run: mvn javadoc:javadoc
96+
run: ./mvnw javadoc:javadoc
9797

9898
- name: Upload docs
9999
uses: actions/upload-artifact@v6

0 commit comments

Comments
 (0)