ci: Add java linux arm64 build (apache#3660)

* Fix java on arm64 Signed-off-by: Xuanwo <github@xuanwo.io> * use env instead Signed-off-by: Xuanwo <github@xuanwo.io> * Disable tikv-tls test for temp Signed-off-by: Xuanwo <github@xuanwo.io> * revert workflow changes Signed-off-by: Xuanwo <github@xuanwo.io> --------- Signed-off-by: Xuanwo <github@xuanwo.io>
wcy-fdu · Nov 24, 2023 · 787fd39 · 787fd39
1 parent 9cf115c
commit 787fd39
Show file tree

Hide file tree

Showing 8 changed files with 89 additions and 235 deletions.
diff --git a/.github/services/tikv/tikv_tls/action.yml b/.github/services/tikv/tikv_tls/action.yml
diff --git a/.github/workflows/release_java.yml b/.github/workflows/release_java.yml
@@ -33,6 +33,8 @@ jobs:
         include:
           - os: ubuntu-latest
             classifier: linux-x86_64
+          - os: ubuntu-latest
+            classifier: linux-aarch_64
           - os: windows-latest
             classifier: windows-x86_64
           - os: macos-latest
@@ -60,6 +62,15 @@ jobs:
         with:
           version: "23.4"
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Setup linux-aarch_64
+        if: "contains(matrix.classifier, 'linux-aarch_64')"
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
+          # Setup for cargo
+          echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
+
       - name: Local staging
         working-directory: bindings/java
         shell: bash
@@ -112,11 +123,16 @@ jobs:
         with:
           name: windows-x86_64-local-staging
           path: ~/windows-x86_64-local-staging
-      - name: Download linux staging directory
+      - name: Download linux x86_64 staging directory
         uses: actions/download-artifact@v3
         with:
           name: linux-x86_64-local-staging
           path: ~/linux-x86_64-local-staging
+      - name: Download linux aarch_64 staging directory
+        uses: actions/download-artifact@v3
+        with:
+          name: linux-aarch_64-local-staging
+          path: ~/linux-aarch_64-local-staging
       - name: Download darwin staging directory
         uses: actions/download-artifact@v3
         with:
@@ -134,9 +150,10 @@ jobs:
       - name: Merge staging repositories
         working-directory: ci-opendal
         run: |
-          bash ./scripts/merge_local_staging.sh $LOCAL_STAGING_DIR/staging \
+          python ./scripts/merge_local_staging.py $LOCAL_STAGING_DIR/staging \
             ~/windows-x86_64-local-staging/staging \
             ~/linux-x86_64-local-staging/staging \
+            ~/linux-aarch_64-local-staging/staging \
             ~/osx-x86_64-local-staging/staging \
             ~/osx-aarch_64-local-staging/staging
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bindings/java/Cargo.toml b/bindings/java/Cargo.toml
@@ -59,6 +59,7 @@ services-all = [
   "services-etcd",
   # FIXME this requires a preinstalled fdb library
   # "services-foundationdb",
+  # FIXME requires openssl.
   # "services-ftp",
   "services-gdrive",
   # FIXME how to support HDFS services in bindings?

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -295,7 +295,7 @@ suppaftp = { version = "5.2", default-features = false, features = [
   "async-rustls",
   "async-native-tls",
 ], optional = true }
-tikv-client = { version = "0.2.0", optional = true, default-features = false }
+tikv-client = { version = "0.3.0", optional = true, default-features = false }
 tokio = "1.27"
 tokio-postgres = { version = "0.7.8", optional = true }
 tracing = { version = "0.1", optional = true }

diff --git a/licenserc.toml b/licenserc.toml
@@ -39,7 +39,4 @@ excludes = [
   # Test files
   "**/tests/data/**",
   "**/fixtures/data/**",
-
-  # Third-party source files
-  "scripts/merge_local_staging.sh",
 ]