From 0886f5e01b9a76ac5674efc01dc4ab486a849b10 Mon Sep 17 00:00:00 2001 From: Filippo Costa Date: Tue, 24 Aug 2021 16:06:19 +0200 Subject: [PATCH 1/5] Only compile svm-runtime-ffi in CI --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a8f54d62a..acbb7431f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,10 +69,11 @@ jobs: run: rustup update nightly - name: Cargo Build uses: actions-rs/cargo@v1 + working-directory: crates/runtime-ffi with: profile: minimal toolchain: nightly - command: build + command: build --features=default-singlepass,default-memory --no-default-features --release args: --${{ matrix.profile }} - name: Prepare Artifact (General) run: | From ef18707b88aa5d07e15279c055dec9c671ccbac8 Mon Sep 17 00:00:00 2001 From: Filippo Costa Date: Tue, 24 Aug 2021 16:09:06 +0200 Subject: [PATCH 2/5] Use Cranelift --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d038e27c0..fd4aa9d02 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,7 +73,7 @@ jobs: with: profile: minimal toolchain: nightly - command: build --features=default-singlepass,default-memory --no-default-features --release + command: build --features=default-cranelift,default-memory --no-default-features --release args: --${{ matrix.profile }} - name: Prepare Artifact (General) run: | From 1774f57cf913735c9ce44a48850447b90122b090 Mon Sep 17 00:00:00 2001 From: Filippo Costa Date: Tue, 24 Aug 2021 16:11:46 +0200 Subject: [PATCH 3/5] Fix so name --- .github/workflows/ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fd4aa9d02..c9c332d16 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,11 +69,10 @@ jobs: run: rustup update nightly - name: Cargo Build uses: actions-rs/cargo@v1 - working-directory: crates/runtime-ffi with: profile: minimal toolchain: nightly - command: build --features=default-cranelift,default-memory --no-default-features --release + command: build --package svm-runtime-ffi --features=default-cranelift,default-memory --no-default-features --release args: --${{ matrix.profile }} - name: Prepare Artifact (General) run: | @@ -84,17 +83,17 @@ jobs: if: matrix.os == 'ubuntu-latest' run: | set -e - mv target/${{ matrix.profile }}/libsvm.so bins/svm.so + mv target/${{ matrix.profile }}/libsvm_runtime_ffi.so bins/svm.so - name: Prepare Artifact (macOS) if: matrix.os == 'macos-latest' run: | set -e - mv target/${{ matrix.profile }}/libsvm.dylib bins/svm.dylib + mv target/${{ matrix.profile }}/libsvm_runtime_ffi.dylib bins/svm.dylib - name: Prepare Artifact (Windows) if: matrix.os == 'windows-latest' run: | set -e - mv target/${{ matrix.profile }}/svm.dll bins/svm.dll + mv target/${{ matrix.profile }}/svm_runtime_ffi.dll bins/svm.dll - name: Upload Artifacts uses: actions/upload-artifact@master with: From b497af1c5aa04b09bf14375a33a1ce2b65e48aea Mon Sep 17 00:00:00 2001 From: Filippo Costa Date: Tue, 24 Aug 2021 16:16:38 +0200 Subject: [PATCH 4/5] Remove profile --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c9c332d16..6753cd81b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,7 +70,6 @@ jobs: - name: Cargo Build uses: actions-rs/cargo@v1 with: - profile: minimal toolchain: nightly command: build --package svm-runtime-ffi --features=default-cranelift,default-memory --no-default-features --release args: --${{ matrix.profile }} From f7c3ddc180e54eb9101e31d0cb14cc6999ec244c Mon Sep 17 00:00:00 2001 From: Filippo Costa Date: Tue, 24 Aug 2021 16:18:52 +0200 Subject: [PATCH 5/5] Fix cargo build invocation --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6753cd81b..dbbf9681f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,8 +71,8 @@ jobs: uses: actions-rs/cargo@v1 with: toolchain: nightly - command: build --package svm-runtime-ffi --features=default-cranelift,default-memory --no-default-features --release - args: --${{ matrix.profile }} + command: build + args: --${{ matrix.profile }} --package svm-runtime-ffi --features=default-cranelift,default-memory --no-default-features - name: Prepare Artifact (General) run: | set -e