Merge pull request #157 from stuartleeks/sl/fix-azdo-simple

Fix builds
devcontainers · Jul 29, 2022 · 7431d9c · 7431d9c
2 parents f218281 + 998b153
commit 7431d9c
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 10 deletions.
diff --git a/azdo-task/DevcontainersCi/dist/index.js b/azdo-task/DevcontainersCi/dist/index.js
@@ -382,7 +382,7 @@ function runPost() {
         if (!imageName) {
             if (pushOption) {
                 // pushOption was set (and not to "never") - give an error that imageName is required
-                task.setResult(task.TaskResult.Failed, 'imageName input is required to push images');
+                task.setResult(task.TaskResult.Failed, `imageName input is required to push images (push: ${pushOption})`);
             }
             return;
         }
@@ -16886,6 +16886,7 @@ var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _argume
 
 
 
+const cliVersion = "0.7.1";
 function getSpecCliInfo() {
     // // TODO - this is temporary until the CLI is installed via npm
     // // TODO - ^ could consider an `npm install` from the folder
@@ -16930,7 +16931,7 @@ function installCli(exec) {
             return exitCode === 0;
         }
         console.log('** Installing @devcontainers/cli');
-        const { exitCode, stdout, stderr } = yield exec('bash', ['-c', 'npm install -g @devcontainers/cli'], {});
+        const { exitCode, stdout, stderr } = yield exec('bash', ['-c', `npm install -g @devcontainers/cli@${cliVersion}`], {});
         if (exitCode != 0) {
             console.log(stdout);
             console.error(stderr);

diff --git a/azdo-task/DevcontainersCi/dist/index.js.map b/azdo-task/DevcontainersCi/dist/index.js.map
diff --git a/azdo-task/DevcontainersCi/lib/main.js b/azdo-task/DevcontainersCi/lib/main.js
@@ -193,7 +193,7 @@ function runPost() {
         if (!imageName) {
             if (pushOption) {
                 // pushOption was set (and not to "never") - give an error that imageName is required
-                task.setResult(task.TaskResult.Failed, 'imageName input is required to push images');
+                task.setResult(task.TaskResult.Failed, `imageName input is required to push images (push: ${pushOption})`);
             }
             return;
         }

diff --git a/azdo-task/DevcontainersCi/src/main.ts b/azdo-task/DevcontainersCi/src/main.ts
@@ -201,7 +201,7 @@ export async function runPost(): Promise<void> {
 			// pushOption was set (and not to "never") - give an error that imageName is required
 			task.setResult(
 				task.TaskResult.Failed,
-				'imageName input is required to push images',
+				`imageName input is required to push images (push: ${pushOption})`,
 			);
 		}
 		return;

diff --git a/azdo-task/DevcontainersCi/task.json b/azdo-task/DevcontainersCi/task.json
@@ -61,7 +61,6 @@
         "filter": "Push if buildReasonsForPush, sourceBranchFilterForPush, and pushOnFailedBuild conditions are met",
         "always": "Always push"
       },
-      "defaultValue": "filter",
       "required": false,
       "label": "Control when images are pushed to the registry"
     },

diff --git a/common/src/dev-container-cli.ts b/common/src/dev-container-cli.ts
@@ -4,6 +4,9 @@ import path from 'path';
 import {env} from 'process';
 import {promisify} from 'util';
 import {ExecFunction} from './exec';
+
+const cliVersion = "0.7.1";
+
 export interface DevContainerCliError {
   outcome: 'error';
   code: number;
@@ -50,7 +53,7 @@ async function installCli(exec: ExecFunction): Promise<boolean> {
     return exitCode === 0;
   }
   console.log('** Installing @devcontainers/cli');
-  const {exitCode, stdout, stderr} = await exec('bash', ['-c', 'npm install -g @devcontainers/cli'], {});
+  const {exitCode, stdout, stderr} = await exec('bash', ['-c', `npm install -g @devcontainers/cli@${cliVersion}`], {});
   if (exitCode != 0) {
     console.log(stdout);
     console.error(stderr);

diff --git a/common_lib/dev-container-cli.js b/common_lib/dev-container-cli.js
@@ -16,6 +16,7 @@ exports.devcontainer = void 0;
 const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
 const util_1 = require("util");
+const cliVersion = "0.7.1";
 function getSpecCliInfo() {
     // // TODO - this is temporary until the CLI is installed via npm
     // // TODO - ^ could consider an `npm install` from the folder
@@ -60,7 +61,7 @@ function installCli(exec) {
             return exitCode === 0;
         }
         console.log('** Installing @devcontainers/cli');
-        const { exitCode, stdout, stderr } = yield exec('bash', ['-c', 'npm install -g @devcontainers/cli'], {});
+        const { exitCode, stdout, stderr } = yield exec('bash', ['-c', `npm install -g @devcontainers/cli@${cliVersion}`], {});
         if (exitCode != 0) {
             console.log(stdout);
             console.error(stderr);

diff --git a/github-action/dist/index.js b/github-action/dist/index.js
diff --git a/github-action/dist/index.js.map b/github-action/dist/index.js.map