Merge branch 'master' of https://github.com/iterative/cml into runner…

…-no-special-cases
iterative · Jun 2, 2022 · d381dce · d381dce
2 parents f9cade3 + 8d3a574
commit d381dce
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/bin/cml/pr.js b/bin/cml/pr.js
@@ -19,6 +19,10 @@ exports.builder = (yargs) =>
         type: 'boolean',
         description: 'Output in markdown format [](url).'
       },
+      skipCI: {
+        type: 'boolean',
+        description: 'Force skip CI for the created commit (if any)'
+      },
       merge: {
         type: 'boolean',
         alias: 'auto-merge',

diff --git a/bin/cml/pr.test.js b/bin/cml/pr.test.js
@@ -15,6 +15,7 @@ describe('CML e2e', () => {
         --log                  Maximum log level
                 [string] [choices: \\"error\\", \\"warn\\", \\"info\\", \\"debug\\"] [default: \\"info\\"]
         --md                   Output in markdown format [](url).            [boolean]
+        --skip-ci              Force skip CI for the created commit (if any) [boolean]
         --merge, --auto-merge  Try to merge the pull request upon creation.  [boolean]
         --rebase               Try to rebase-merge the pull request upon creation.
                                                                              [boolean]

diff --git a/src/cml.js b/src/cml.js
@@ -357,6 +357,7 @@ class CML {
       remote = GIT_REMOTE,
       globs = ['dvc.lock', '.gitignore'],
       md,
+      skipCI,
       merge,
       rebase,
       squash
@@ -412,7 +413,7 @@ class CML {
       await exec(`git checkout -b ${source}`);
       await exec(`git add ${paths.join(' ')}`);
       let commitMessage = `CML PR for ${shaShort}`;
-      if (!(merge || rebase || squash)) {
+      if (skipCI || !(merge || rebase || squash)) {
         commitMessage += ' [skip ci]';
       }
       await exec(`git commit -m "${commitMessage}"`);