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

package/bitbucket-pipelines.yml

@@ -18,15 +18,21 @@ pipelines:
           - node
         script:
           - apt-get update
+          - apt-get install -y wget
+          - wget -q https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+          - apt-get install -y ./google-chrome-stable_current_amd64.deb
+          - export PUPPETEER_EXECUTABLE_PATH='/usr/bin/google-chrome-stable'
           - apt-get install -y libssl-dev
           - apt-get install -y pkg-config
-          - apt-get install -y cargo
+          - apt-get install -y git
+          - 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-unknown-linux-gnu
           - cd eitri-cli-v2
-          - yarn install
+          - npm i
+          - npm run build
           - cd ..
-          - apt-get install -y git
-          - apt-get install -y chromium
-          - export PUPPETEER_EXECUTABLE_PATH='/usr/bin/chromium-browser'
           - yarn
           - npm i -g .
           - yarn test cli.test.js --force-exit
@@ -38,9 +44,40 @@ pipelines:
         - apt-get update
         - apt-get install -y libssl-dev
         - apt-get install -y pkg-config
-        - apt-get install -y cargo
+        - 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-unknown-linux-gnu
         - cd eitri-cli-v2
         - cargo test
+    - step: &macOSCrossCompile
+        image: joseluisq/rust-linux-darwin-builder:1.76.0
+        name: "macOS cross compile"
+        caches:
+          - node
+        script:
+          - 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 -fsSL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y nodejs
+          - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+          - export PATH="/root/.cargo/bin:${PATH}"
+          - rustup --version
+          - export CC=o64-clang
+          - export CXX=o64-clang++
+          - cd eitri-cli-v2
+          - npm install
+          - npm run build-release:darwin
+          - rm -rf target
+          - cp index.darwin.node ../index.darwin.node
+        artifacts:
+          - index.darwin.node
   branches:
     "**":
       - step: *runTests
@@ -48,11 +85,13 @@ pipelines:
     '{beta,master}':
       # - step: *runTests
       # - step: *runRustTests
+      - step: *macOSCrossCompile
       - step:
           name: "Generation of a new version: beta or stable."
           caches:
             - node
           script:
+            - mv ./index.darwin.node ./eitri-cli-v2/index.darwin.node
             - ldd --version
             - apt-get update
             - apt-get install -y git
@@ -65,18 +104,20 @@ pipelines:
             - 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-gnu
             - rustup target add x86_64-unknown-linux-gnu
             - cd eitri-cli-v2
-            - yarn install
-            - yarn install:win32
+            - npm install
+            - npm run build-release:unix
+            - npm run build-release:win32
             - rm -rf target
             - cd ..
             - echo 'Start release'
             - echo 'If there is a new version, it will be automatically published on NPM according to the channel/branch (beta or master (stable)).'
-            - yarn
-            - yarn run release
+            - npm i
+            - npm run release
             - RELEASE_VERSION=$(git describe --tags --abbrev=0 | sed 's/^v//')
             - node -e "const fs = require('fs'); const packageJson = JSON.parse(fs.readFileSync('package.json')); packageJson.version = process.env.RELEASE_VERSION; fs.writeFileSync('package.json', JSON.stringify(packageJson, null, 4));"
             - echo 'New release'
-            - echo $RELEASE_VERSION
+            - echo $RELEASE_VERSION

package/eitri-cli-v2/Cargo.lock

@@ -500,7 +500,6 @@ checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
 name = "eitri-cli-v2"
 version = "0.1.0"
 dependencies = [
- "cc",
  "homedir",
  "httpmock",
  "neon",

package/eitri-cli-v2/Cargo.toml

@@ -20,4 +20,3 @@ 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/index.js

@@ -1,2 +1,11 @@
-const os = require('os')
-module.exports = os.platform() === 'win32' ? require('./index.win32.node'): require('./index.unix.node')
+const os = require("os");
+
+if (os.platform() === "darwin") {
+  module.exports = require("./index.darwin.node");
+} else if (os.platform() === "linux") {
+  module.exports = require("./index.unix.node");
+} else if (os.platform() === "win32") {
+  module.exports = require("./index.win32.node");
+} else {
+  console.error("Plataforma não supotada")
+}

package/eitri-cli-v2/node_modules/.package-lock.json

@@ -0,0 +1,17 @@
+{
+  "name": "eitri-cli-v2",
+  "version": "0.1.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "node_modules/cargo-cp-artifact": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/cargo-cp-artifact/-/cargo-cp-artifact-0.1.8.tgz",
+      "integrity": "sha512-3j4DaoTrsCD1MRkTF2Soacii0Nx7UHCce0EwUf4fHnggwiE4fbmF2AbnfzayR36DF8KGadfh7M/Yfy625kgPlA==",
+      "dev": true,
+      "bin": {
+        "cargo-cp-artifact": "bin/cargo-cp-artifact.js"
+      }
+    }
+  }
+}

package/eitri-cli-v2/package-lock.json

@@ -7,7 +7,6 @@
     "": {
       "name": "eitri-cli-v2",
       "version": "0.1.0",
-      "hasInstallScript": true,
       "license": "ISC",
       "devDependencies": {
         "cargo-cp-artifact": "^0.1"

package/eitri-cli-v2/package.json

@@ -6,11 +6,11 @@
   "scripts": {
     "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:darwin": "cargo-cp-artifact -nc index.darwin.node -- cargo build --message-format=json-render-diagnostics --target=aarch64-apple-darwin",
     "build-debug": "npm run build --",
-    "build-release": "npm run build -- --release",
+    "build-release:unix": "npm run build -- --release",
     "build-release:win32": "npm run build:win32 -- --release",
-    "install": "npm run build-release",
-    "install:win32": "npm run build-release:win32",
+    "build-release:darwin": "npm run build:darwin -- --release",
     "test": "cargo test"
   },
   "author": "",

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

@@ -2,7 +2,6 @@ use std::{env, fs, path::Path, process::exit};
 
 use crate::model::eitri_conf::EitriConf;
 use crate::utils::convert_eitri_conf;
-use tokio::fs::try_exists;
 
 pub async fn read_eitri_conf() -> EitriConf {
     let current_dir = match env::current_dir().ok() {
@@ -17,14 +16,7 @@ pub async fn read_eitri_conf() -> EitriConf {
     let file_path = Path::new(&current_dir_str);
     let file_path = file_path.join("eitri-app.conf.json");
 
-    let exists_json = match try_exists(&file_path).await {
-        Ok(exists) => exists,
-        Err(_) => false,
-    };
-
-    if !exists_json {
-        convert_eitri_conf::convert();
-    }
+    convert_eitri_conf::convert();
 
     let content = match fs::read_to_string(file_path.display().to_string()).ok() {
         Some(it) => it,
@@ -35,7 +27,18 @@ pub async fn read_eitri_conf() -> EitriConf {
     };
 
     let eitri_conf: EitriConf = match serde_json::from_str(&content).ok() {
-        Some(it) => it,
+        Some(it) => {
+            match fs::remove_file(file_path.display().to_string()) {
+                Ok(()) => (),
+                Err(_err) => {
+                    eprintln!(
+                        "Houve um erro ao tentar ler o eitri-app.conf do projeto. Tente novamente."
+                    );
+                    exit(1)
+                }
+            };
+            it
+        }
         None => {
             eprintln!("Houve um erro ao fazer parse do json");
             exit(1)

package/eitri-cli-v2/yarn.lock

@@ -4,5 +4,5 @@
 
 cargo-cp-artifact@^0.1:
   version "0.1.8"
-  resolved "https://registry.yarnpkg.com/cargo-cp-artifact/-/cargo-cp-artifact-0.1.8.tgz#353814f49f6aa76601a4bcb3ea5f3071180b90de"
+  resolved "https://registry.npmjs.org/cargo-cp-artifact/-/cargo-cp-artifact-0.1.8.tgz"
   integrity sha512-3j4DaoTrsCD1MRkTF2Soacii0Nx7UHCce0EwUf4fHnggwiE4fbmF2AbnfzayR36DF8KGadfh7M/Yfy625kgPlA==

package/package.json

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

package/test/e2e/cli.test.js

@@ -138,7 +138,7 @@ describe("eitri-cli", () => {
             console.error(error);
             throw error;
         }
-    });
+    }, 2 * minutes);
 
     it(
         "should do push-version",

package/eitri-cli-v2/node_modules/.yarn-integrity

@@ -1,16 +0,0 @@
-{
-  "systemParams": "linux-x64-108",
-  "modulesFolders": [
-    "node_modules"
-  ],
-  "flags": [],
-  "linkedModules": [],
-  "topLevelPatterns": [
-    "cargo-cp-artifact@^0.1"
-  ],
-  "lockfileEntries": {
-    "cargo-cp-artifact@^0.1": "https://registry.yarnpkg.com/cargo-cp-artifact/-/cargo-cp-artifact-0.1.8.tgz#353814f49f6aa76601a4bcb3ea5f3071180b90de"
-  },
-  "files": [],
-  "artifacts": {}
-}