This is an automated email from the ASF dual-hosted git repository.
xuanwo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-opendal.git
The following commit(s) were added to refs/heads/main by this push:
new f7e33bf0a ci(binding/java): Use cargo profile instead of --release
(#3059)
f7e33bf0a is described below
commit f7e33bf0a4de4e262710c3c38a7d497bf7803620
Author: Xuanwo <[email protected]>
AuthorDate: Thu Sep 14 10:41:09 2023 +0800
ci(binding/java): Use cargo profile instead of --release (#3059)
* ci(binding/java): Use cargo profile instead of --release
Signed-off-by: Xuanwo <[email protected]>
* Fix c/cpp binding
Signed-off-by: Xuanwo <[email protected]>
* Update bindings/java/tools/build.py
Co-authored-by: tison <[email protected]>
* Update bindings/java/tools/build.py
Co-authored-by: tison <[email protected]>
---------
Signed-off-by: Xuanwo <[email protected]>
Co-authored-by: tison <[email protected]>
---
.github/workflows/bindings_c.yml | 1 +
.github/workflows/bindings_cpp.yml | 1 +
.github/workflows/release_java.yml | 2 +-
bindings/java/pom.xml | 5 +++--
bindings/java/tools/build.py | 10 ++++------
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/bindings_c.yml b/.github/workflows/bindings_c.yml
index faf616ba8..b7b5360f5 100644
--- a/.github/workflows/bindings_c.yml
+++ b/.github/workflows/bindings_c.yml
@@ -45,6 +45,7 @@ jobs:
- uses: actions/checkout@v3
- name: Install gtest manually
run: |
+ sudo apt-get update
sudo apt-get install libgtest-dev valgrind
cd /usr/src/gtest
sudo cmake CMakeLists.txt
diff --git a/.github/workflows/bindings_cpp.yml
b/.github/workflows/bindings_cpp.yml
index 5fd15a1ba..9a5800244 100644
--- a/.github/workflows/bindings_cpp.yml
+++ b/.github/workflows/bindings_cpp.yml
@@ -45,6 +45,7 @@ jobs:
- uses: actions/checkout@v3
- name: Install dependencies
run: |
+ sudo apt-get update
sudo apt-get install libgtest-dev ninja-build libboost-all-dev
valgrind doxygen
- name: Setup Rust toolchain
diff --git a/.github/workflows/release_java.yml
b/.github/workflows/release_java.yml
index c9f2e3148..6afd3c607 100644
--- a/.github/workflows/release_java.yml
+++ b/.github/workflows/release_java.yml
@@ -67,7 +67,7 @@ jobs:
./mvnw -Papache-release package verify
org.sonatype.plugins:nexus-staging-maven-plugin:deploy \
-DskipTests=true \
-Djni.classifier=${{ matrix.classifier }} \
- -Dcargo-build.release=--release \
+ -Dcargo-build.profile=release \
-DaltStagingDirectory=local-staging \
-DskipRemoteStaging=true \
-DserverId=apache.releases.https \
diff --git a/bindings/java/pom.xml b/bindings/java/pom.xml
index a7c8bfc13..2dea1f63f 100644
--- a/bindings/java/pom.xml
+++ b/bindings/java/pom.xml
@@ -52,7 +52,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
- <cargo-build.release>--no-release</cargo-build.release>
+ <cargo-build.profile>dev</cargo-build.profile>
<jni.classifier>${os.detected.classifier}</jni.classifier>
<assertj.version>3.23.1</assertj.version>
@@ -191,7 +191,8 @@
<argument>${project.basedir}/tools/build.py</argument>
<argument>--classifier</argument>
<argument>${jni.classifier}</argument>
- <argument>${cargo-build.release}</argument>
+ <argument>--profile</argument>
+ <argument>${cargo-build.profile}</argument>
</arguments>
</configuration>
</execution>
diff --git a/bindings/java/tools/build.py b/bindings/java/tools/build.py
index 0e706b5ce..1492d7dad 100755
--- a/bindings/java/tools/build.py
+++ b/bindings/java/tools/build.py
@@ -52,14 +52,10 @@ if __name__ == '__main__':
parser = ArgumentParser(formatter_class=ArgumentDefaultsHelpFormatter)
parser.add_argument('--classifier', type=str, required=True)
- parser.add_argument('--release', action=BooleanOptionalAction)
+ parser.add_argument('--profile', type=str, default='dev')
args = parser.parse_args()
- cmd = ['cargo', 'build', '--color=always']
- profile = 'debug'
- if args.release:
- profile = 'release'
- cmd.append('--release')
+ cmd = ['cargo', 'build', '--color=always', f'--profile={args.profile}']
target = classifier_to_target(args.classifier)
if target:
@@ -75,6 +71,8 @@ if __name__ == '__main__':
print('$ ' + subprocess.list2cmdline(cmd))
subprocess.run(cmd, cwd=basedir, check=True)
+ # History reason of cargo profiles.
+ profile = 'debug' if args.profile in ['dev', 'test', 'bench'] else
args.profile
artifact = get_cargo_artifact_name(args.classifier)
src = output / target / profile / artifact
dst = basedir / 'target' / 'classes' / 'native' / args.classifier /
artifact
