eitri-cli 1.9.0-beta.1 → 1.9.0-beta.10

package/bitbucket-pipelines.yml

@@ -1,5 +1,4 @@
-image: node:18-alpine
-  
+image: node:18-buster
 pipelines:
   custom:
     test-validation:
@@ -18,14 +17,15 @@ pipelines:
         caches:
           - node
         script:
-          - apk add openssl-dev
-          - apk add pkgconfig
-          - apk add cargo
+          - apt-get update
+          - apt-get install -y libssl-dev
+          - apt-get install -y pkg-config
+          - apt-get install -y cargo
           - cd eitri-cli-v2
           - yarn install
           - cd ..
-          - apk add git
-          - apk add chromium
+          - apt-get install -y git
+          - apt-get install -y chromium
           - export PUPPETEER_EXECUTABLE_PATH='/usr/bin/chromium-browser'
           - yarn
           - npm i -g .
@@ -35,9 +35,10 @@ pipelines:
         caches:
           - node
         script:
-        - apk add openssl-dev
-        - apk add pkgconfig
-        - apk add cargo
+        - apt-get update
+        - apt-get install -y libssl-dev
+        - apt-get install -y pkg-config
+        - apt-get install -y cargo
         - cd eitri-cli-v2
         - cargo test
   branches:
@@ -45,26 +46,29 @@ pipelines:
       - step: *runTests
       - step: *runRustTests
     '{beta,master}':
-      - step: *runTests
-      - step: *runRustTests
+      # - step: *runTests
+      # - step: *runRustTests
       - step:
           name: "Generation of a new version: beta or stable."
           caches:
             - node
           script:
-            - apk add git
-            - apk add openssl-dev
-            - apk add pkgconfig
-            - apk add cargo
-            - apk add mingw-w64-gcc
-            - apk add --no-cache build-base curl
+            - ldd --version
+            - 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
             - rustup target add x86_64-pc-windows-gnu
+            - rustup target add x86_64-unknown-linux-gnu
             - cd eitri-cli-v2
-            # RUSTFLAGS necessárias somente pra UNIX
-            - RUSTFLAGS="-C target-feature=-crt-static" yarn install
+            - yarn install
             - yarn install:win32
             - rm -rf target
             - cd ..

package/eitri-cli-v2/Cargo.lock

@@ -372,9 +372,9 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 
 [[package]]
 name = "cc"
-version = "1.0.89"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0ba8f7aaa012f30d5b2861462f6708eccd49c3c39863fe083a308035f63d723"
+checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
 
 [[package]]
 name = "cfg-if"
@@ -500,10 +500,12 @@ checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
 name = "eitri-cli-v2"
 version = "0.1.0"
 dependencies = [
+ "cc",
  "homedir",
  "httpmock",
  "neon",
  "once_cell",
+ "openssl",
  "reqwest",
  "serde",
  "serde_derive",
@@ -1344,6 +1346,15 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
+[[package]]
+name = "openssl-src"
+version = "300.2.3+3.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "openssl-sys"
 version = "0.9.101"
@@ -1352,6 +1363,7 @@ checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff"
 dependencies = [
  "cc",
  "libc",
+ "openssl-src",
  "pkg-config",
  "vcpkg",
 ]

package/eitri-cli-v2/Cargo.toml

@@ -9,7 +9,6 @@ exclude = ["index.node"]
 crate-type = ["cdylib"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 homedir = "0.2.1"
 httpmock = "0.7.0"
@@ -20,3 +19,5 @@ serde = { version = "1.0.197", features = ["derive"] }
 serde_derive = "1.0.197"
 serde_json = "1.0.114"
 tokio = { version = "1.36.0", features = ["full"] }
+openssl = { version = "0.10", features = ["vendored"] }
+cc = "1.0.90"

package/eitri-cli-v2/package.json

@@ -4,7 +4,7 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "build": "cargo-cp-artifact -nc index.unix.node -- cargo build --message-format=json-render-diagnostics",
+    "build": "cargo-cp-artifact -nc index.unix.node -- cargo build --message-format=json-render-diagnostics --target x86_64-unknown-linux-gnu",
     "build:win32": "cargo-cp-artifact -nc index.win32.node -- cargo build --message-format=json-render-diagnostics --target x86_64-pc-windows-gnu",
     "build-debug": "npm run build --",
     "build-release": "npm run build -- --release",

package/eitri-cli-v2/src/services/eitri_manager.rs

@@ -18,7 +18,7 @@ pub async fn get_revision(eitri_app_id: &str, version: &str) -> Result<Revision,
     {
         Ok(token) => token,
         Err(_err) => {
-            eprintln!("Houve um erro ao autenticar-se no Blind-Guardian");
+            eprintln!("Houve um erro ao autenticar-se no Eitri");
             exit(1)
         }
     };
@@ -35,7 +35,7 @@ pub async fn get_revision(eitri_app_id: &str, version: &str) -> Result<Revision,
     let revision = match result.revisions.first() {
         Some(revision) => revision.clone(),
         None => {
-            eprintln!("Versão não encontrada, certifique-se de que há mesma foi criada.");
+            eprintln!("Versão não encontrada, certifique-se de que foi feito push-version antes de publicar a versão.");
             exit(1)
         }
     };

package/index.js

@@ -8,7 +8,7 @@ const { workspace } = require("./src/service/Workspace");
 const configService = require("./src/service/ConfigService");
 const VegvisirCommand = require("./src/modules/vegvisir/VegvisirCommand");
 const debug = require('debug')('eitri:run')
-const eitriCLIV2 = require('./eitri-cli-v2/.')
+
 
 const run = async () => {
     debug("Iniciando run()")
@@ -145,6 +145,7 @@ const run = async () => {
             "Adiciona comentários na versão"
         )
         .action(async (cmdObj) => {
+            const eitriCLIV2 = require('./eitri-cli-v2/.')
             await eitriCLIV2.publish(cmdObj.environment, cmdObj.message || '')
         });
 

package/package.json

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