From f79eefcaa7939bf4c879f67923fb3f47d0049a72 Mon Sep 17 00:00:00 2001 From: yankun <1939810907@qq.com> Date: Fri, 21 Jul 2023 21:46:34 +0800 Subject: [PATCH] ci: show native dir --- .github/workflows/publish_snapshot.yml | 8 ++++---- .gitignore | 4 +++- build.sc | 8 ++++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish_snapshot.yml b/.github/workflows/publish_snapshot.yml index 3945bfd..cd60cb6 100644 --- a/.github/workflows/publish_snapshot.yml +++ b/.github/workflows/publish_snapshot.yml @@ -69,15 +69,15 @@ jobs: uses: actions/download-artifact@v3 with: name: result - path: out/fastbloomjvm/compileNative.dest/native/ + path: library/native/ - run: chmod +x millw - run: ./millw fastbloomjvm.compileNative - - run: ls -R out/fastbloomjvm/compileNative.dest/native/ + - run: ls -R library/native/ - run: ./millw fastbloomjvm.jar - - run: ls -R out/fastbloomjvm/compileNative.dest/native/ + - run: ls -R library/native/ - run: echo $PGP_SECRET | base64 --decode > gpg_key && gpg --import --no-tty --batch --yes gpg_key - run: ./millw -i __.publishArtifacts - - run: ls -R out/fastbloomjvm/compileNative.dest/native/ + - run: ls -R library/native/ - run: gpg --passphrase=$PGP_PASSPHRASE --no-tty --pinentry-mode loopback --batch --yes -a -b build.sc - run: ./millw -d mill.scalalib.PublishModule/publishAll --publishArtifacts __.publishArtifacts --sonatypeCreds yankun1992:$SONATYPE_PASSWORD --gpgArgs --passphrase=$PGP_PASSPHRASE,--no-tty,--pinentry-mode,loopback,--batch,--yes,-a,-b --sonatypeUri https://s01.oss.sonatype.org/service/local --sonatypeSnapshotUri https://s01.oss.sonatype.org/content/repositories/snapshots --readTimeout 600000 --awaitTimeout 600000 --signed true - run: rm gpg_key \ No newline at end of file diff --git a/.gitignore b/.gitignore index 661ed48..52d7818 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,6 @@ fastbloomjvm/native/.idea .pytest_cache .vscode py_tests/.pytest_cache -data \ No newline at end of file +data + +library \ No newline at end of file diff --git a/build.sc b/build.sc index d120b17..d28e3d4 100644 --- a/build.sc +++ b/build.sc @@ -1,7 +1,8 @@ import mill._, scalalib._, publish._ import mill.define.Sources import mill.scalalib.JavaModule -import $ivy.`io.github.otavia-projects::mill-rust_mill$MILL_BIN_PLATFORM:0.2.3` +import os.Path +import $ivy.`io.github.otavia-projects::mill-rust_mill$MILL_BIN_PLATFORM:0.2.4` import io.github.otavia.jni.plugin.RustJniModule object ProjectInfo { @@ -45,7 +46,10 @@ object fastbloomjvm extends RustJniModule with PublishModule { override def artifactId = "fastbloom" - override def ivyDeps = Agg(ivy"io.github.otavia-projects:jni-loader:0.2.3") + override def ivyDeps = Agg(ivy"io.github.otavia-projects:jni-loader:0.2.4") + + + override def otherNativeLibraries: Seq[PathRef] = Seq(PathRef(os.pwd / "library")) object test extends Tests with TestModule.Junit4 {