eitri-cli 1.9.0-beta.14 → 1.9.0-beta.16

package/bitbucket-pipelines.yml

@@ -89,6 +89,7 @@ pipelines:
           - export CC=o64-clang
           - export CXX=o64-clang++
           - cd eitri-cli-v2
+          - cargo add openssl --features vendored
           - npm install
           - npm run build -- --target aarch64-apple-darwin
           - npm run build -- --target x86_64-apple-darwin
@@ -102,10 +103,10 @@ pipelines:
           - eitri-cli-v2.darwin-x64.node
           - index.d.ts
           - rust-index.js
-    - step: &linuxAndWindowsCrossCompile
+    - step: &linuxCrossCompile
         caches:
           - node
-        name: 'Linux and Windows cross compile'
+        name: 'Linux compile'
         script:
           - apt-get update
           - apt-get install -y git
@@ -119,18 +120,38 @@ pipelines:
           - export PATH="/root/.cargo/bin:${PATH}"
           - rustup --version
           - curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y nodejs
-          - rustup target add x86_64-pc-windows-msvc
           - rustup target add x86_64-unknown-linux-gnu
-          - cargo install cargo-xwin
           - cd eitri-cli-v2
+          - cargo add openssl --features vendored
           - npm install
           - npm run build -- --target x86_64-unknown-linux-gnu
-          - npm run build -- --target x86_64-pc-windows-msvc
-          - ls
           - cp -r ./eitri-cli-v2.linux-x64-gnu.node ../eitri-cli-v2.linux-x64-gnu.node
-          - cp -r ./eitri-cli-v2.win32-x64-msvc.node ../eitri-cli-v2.win32-x64-msvc.node
         artifacts:
           - eitri-cli-v2.linux-x64-gnu.node
+    - step: &windowsCrossCompile
+        caches:
+          - node
+        name: 'Windows cross compile'
+        script:
+          - apt-get update
+          - apt-get install -y git
+          - apt-get install -y libssl-dev
+          - apt-get install -y libudev-dev
+          - apt-get install -y pkg-config
+          - apt-get install -y cargo
+          - apt-get install -y gcc-mingw-w64
+          - apt-get install -y curl
+          - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+          - export PATH="/root/.cargo/bin:${PATH}"
+          - rustup --version
+          - curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y nodejs
+          - rustup target add x86_64-pc-windows-msvc
+          - cargo install cargo-xwin
+          - cd eitri-cli-v2
+          - npm install
+          - npm run build -- --target x86_64-pc-windows-msvc
+          - cp -r ./eitri-cli-v2.win32-x64-msvc.node ../eitri-cli-v2.win32-x64-msvc.node
+        artifacts:
           - eitri-cli-v2.win32-x64-msvc.node
   branches:
     "**":
@@ -148,7 +169,8 @@ pipelines:
       - parallel:
           fail-fast: true
           steps:
-            - step: *linuxAndWindowsCrossCompile
+            - step: *windowsCrossCompile
+            - step: *linuxCrossCompile
             - step: *macOSCrossCompile
       - step:
           name: "Generation of a new version: beta or stable."

package/eitri-cli-v2/Cargo.toml

@@ -22,6 +22,15 @@ serde_derive = "1.0.197"
 serde_json = "1.0.114"
 tokio = { version = "1.36.0", features = ["full"] }
 
+[target.x86_64-unknown-linux-gnu]
+openssl = { version = "0.9", features = ["vendored"] }
+
+[target.aarch64-apple-darwin]
+openssl = { version = "0.9", features = ["vendored"] }
+
+[target.x86_64-apple-darwin]
+openssl = { version = "0.9", features = ["vendored"] }
+
 [build-dependencies]
 napi-build = "2.0.1"
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eitri-cli",
-  "version": "1.9.0-beta.14",
+  "version": "1.9.0-beta.16",
   "description": "Command Line Interface to make \"Eitri-App\" with code and fire.",
   "main": "index.js",
   "bin": {