@argos-ci/cli 0.3.3-alpha.1 → 0.3.3-alpha.4

package/dist/index.mjs

@@ -97,7 +97,7 @@ const schema = {
         nullable: true
     },
     prNumber: {
-        format: String,
+        format: Number,
         default: null,
         nullable: true
     },
@@ -130,6 +130,25 @@ const createConfig = ()=>{
     return result;
 };
 
+const service$4 = {
+    detect: ({ env  })=>Boolean(env.BUILDKITE),
+    config: ({ env  })=>{
+        const ciProps = envCiDetection({
+            env
+        });
+        return {
+            name: "Buildkite",
+            commit: ciProps?.commit || null,
+            branch: env.BUILDKITE_BRANCH || null,
+            owner: env.BUILDKITE_ORGANIZATION_SLUG || null,
+            repository: env.BUILDKITE_PROJECT_SLUG || null,
+            jobId: env.BUILDKITE_JOB_ID || null,
+            runId: ciProps?.runId || null,
+            prNumber: env.BUILDKITE_PULL_REQUEST ? Number(env.BUILDKITE_PULL_REQUEST) : null
+        };
+    }
+};
+
 const service$3 = {
     detect: ({ env  })=>Boolean(env.HEROKU_TEST_RUN_ID),
     config: ({ env  })=>({
@@ -196,7 +215,7 @@ const getPrNumber$1 = ({ env  })=>{
     const branchRegex = /refs\/pull\/(\d+)/;
     const branchMatches = branchRegex.exec(env.GITHUB_REF || "");
     if (branchMatches) {
-        branchMatches[1];
+        return Number(branchMatches[1]);
     }
     return null;
 };
@@ -226,7 +245,7 @@ const getPrNumber = ({ env  })=>{
     const branchRegex = /pull\/(\d+)/;
     const branchMatches = branchRegex.exec(env.CIRCLE_PULL_REQUEST || "");
     if (branchMatches) {
-        branchMatches[1];
+        return Number(branchMatches[1]);
     }
     return null;
 };
@@ -265,7 +284,7 @@ const service = {
             repository: ciProps?.repository || null,
             jobId: ciProps?.jobId || null,
             runId: ciProps?.runId || null,
-            prNumber: env.TRAVIS_PULL_REQUEST || null
+            prNumber: env.TRAVIS_PULL_REQUEST ? Number(env.TRAVIS_PULL_REQUEST) : null
         };
     }
 };
@@ -274,7 +293,8 @@ const services = [
     service$3,
     service$2,
     service$1,
-    service
+    service,
+    service$4
 ];
 const envCiDetection = (ctx)=>{
     const ciContext = envCi(ctx);
@@ -420,34 +440,31 @@ const upload$1 = async (input)=>{
 const debug = createDebug("@argos-ci/core");
 
 const getConfigFromOptions = (options)=>{
-    const { apiBaseUrl , commit , branch , token , buildName , parallel , prNumber  } = options;
     const config = createConfig();
+    const ciEnv = getCiEnvironment();
+    if (ciEnv) {
+        config.load(omitUndefined({
+            commit: ciEnv.commit,
+            branch: ciEnv.branch,
+            ciService: ciEnv.name,
+            owner: ciEnv.owner,
+            repository: ciEnv.repository,
+            jobId: ciEnv.jobId,
+            runId: ciEnv.runId,
+            prNumber: ciEnv.prNumber
+        }));
+    }
     config.load(omitUndefined({
-        apiBaseUrl,
-        commit,
-        branch,
-        token,
-        prNumber,
-        buildName,
-        parallel: Boolean(parallel),
-        parallelNonce: parallel ? parallel.nonce : null,
-        parallelTotal: parallel ? parallel.total : null
+        apiBaseUrl: options.apiBaseUrl,
+        commit: options.commit,
+        branch: options.branch,
+        token: options.token,
+        prNumber: options.prNumber,
+        buildName: options.buildName,
+        parallel: Boolean(options.parallel),
+        parallelNonce: options.parallel ? options.parallel.nonce : null,
+        parallelTotal: options.parallel ? options.parallel.total : null
     }));
-    if (!config.get("commit")) {
-        const ciEnv = getCiEnvironment();
-        if (ciEnv) {
-            config.load(omitUndefined({
-                commit: ciEnv.commit,
-                branch: ciEnv.branch,
-                ciService: ciEnv.name,
-                owner: ciEnv.owner,
-                repository: ciEnv.repository,
-                jobId: ciEnv.jobId,
-                runId: ciEnv.runId,
-                prNumber: ciEnv.prNumber
-            }));
-        }
-    }
     config.validate();
     return config.get();
 };
@@ -486,7 +503,8 @@ const getConfigFromOptions = (options)=>{
         name: config.buildName,
         parallel: config.parallel,
         parallelNonce: config.parallelNonce,
-        screenshotKeys: Array.from(new Set(screenshots.map((screenshot)=>screenshot.hash)))
+        screenshotKeys: Array.from(new Set(screenshots.map((screenshot)=>screenshot.hash))),
+        prNumber: config.prNumber
     });
     debug("Got screenshots", result);
     // Upload screenshots
@@ -522,7 +540,7 @@ const __dirname = fileURLToPath(new URL(".", import.meta.url));
 const rawPkg = await readFile(resolve(__dirname, "..", "package.json"), "utf8");
 const pkg = JSON.parse(rawPkg);
 program.name(pkg.name).description("Interact with and upload screenshots to argos-ci.com via command line.").version(pkg.version);
-program.command("upload").argument("<directory>", "Directory to upload").description("Upload screenshots to argos-ci.com").option("-f, --files <patterns...>", "One or more globs matching image file paths to upload", "**/*.{png,jpg,jpeg}").option("-i, --ignore <patterns...>", 'One or more globs matching image file paths to ignore (ex: "**/*.png **/diff.jpg")').option("--token <token>", "Repository token").option("--prNumber <number>", "Pull-request number").option("--build-name <string>", "Name of the build, in case you want to run multiple Argos builds in a single CI job").option("--parallel", "Enable parallel mode. Run multiple Argos builds and combine them at the end").option("--parallel-total <number>", "The number of parallel nodes being ran").option("--parallel-nonce <string>", "A unique ID for this parallel build").action(async (directory, options)=>{
+program.command("upload").argument("<directory>", "Directory to upload").description("Upload screenshots to argos-ci.com").option("-f, --files <patterns...>", "One or more globs matching image file paths to upload", "**/*.{png,jpg,jpeg}").option("-i, --ignore <patterns...>", 'One or more globs matching image file paths to ignore (ex: "**/*.png **/diff.jpg")').option("--token <token>", "Repository token").option("--pull-request <number>", "Pull-request number").option("--build-name <string>", "Name of the build, in case you want to run multiple Argos builds in a single CI job").option("--parallel", "Enable parallel mode. Run multiple Argos builds and combine them at the end").option("--parallel-total <number>", "The number of parallel nodes being ran").option("--parallel-nonce <string>", "A unique ID for this parallel build").action(async (directory, options)=>{
     const spinner = ora("Uploading screenshots").start();
     try {
         const result = await upload({
@@ -530,7 +548,7 @@ program.command("upload").argument("<directory>", "Directory to upload").descrip
             buildName: options.buildName,
             files: options.files,
             ignore: options.ignore,
-            prNumber: options.prNumber,
+            prNumber: options.pullRequest ? Number(options.pullRequest) : undefined,
             parallel: options.parallel ? {
                 nonce: options.parallelNonce,
                 total: options.parallelTotal

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@argos-ci/cli",
   "description": "Visual testing solution to avoid visual regression. Argos CLI is used to interact with and upload screenshots to argos-ci.com via command line.",
-  "version": "0.3.3-alpha.1+46d7443",
+  "version": "0.3.3-alpha.4+79fe6f6",
   "bin": {
     "argos": "./bin/argos-cli.js"
   },
@@ -40,7 +40,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@argos-ci/core": "^0.6.3-alpha.1+46d7443",
+    "@argos-ci/core": "^0.6.3-alpha.4+79fe6f6",
     "commander": "^9.4.1",
     "ora": "^6.1.2",
     "update-notifier": "^6.0.2"
@@ -49,5 +49,5 @@
     "rollup": "^2.79.1",
     "rollup-plugin-swc3": "^0.6.0"
   },
-  "gitHead": "46d7443fe360fe5d42482e404bd3ab5c05116567"
+  "gitHead": "79fe6f67eb4b2df4cf3f79e301a8a44d787206cb"
 }