@atomist/atomist-sdm - npm Package Compare versions

Comparing version 0.0.1-release-goal.20180509210541 to 0.1.0-20180510001510

git-info.json

 {
-  "sha": "b9631ffd89552d9f41345dcb202bb00d4c7ecf23",
-  "branch": "b9631ffd89552d9f41345dcb202bb00d4c7ecf23",
+  "sha": "1b57374793c5fb6ff7cde98cd7a55c7df34874af",
+  "branch": "1b57374793c5fb6ff7cde98cd7a55c7df34874af",
   "repository": "[e-mail]:atomist/atomist-sdm.git"
 }

machine/goals.d.ts

@@ -9,3 +9,5 @@ import { Goal, Goals, GoalWithPrecondition } from "@atomist/sdm";
 export declare const BuildGoals: Goals;
+export declare const BuildReleaseGoals: Goals;
 export declare const DockerGoals: Goals;
+export declare const DockerReleaseGoals: Goals;
 export declare const KubernetesDeployGoals: Goals;
@@ -12,0 +14,0 @@ export declare const SimplifiedKubernetesDeployGoals: Goals;

machine/goals.js

@@ -73,5 +73,9 @@ "use strict";
 // Just running the build and publish
-exports.BuildGoals = new sdm_1.Goals("Build", ...exports.CheckGoals.goals, sdm_1.BuildGoal, new sdm_1.GoalWithPrecondition(Object.assign({}, exports.PublishGoal.definition, { approvalRequired: true }), ...exports.PublishGoal.dependsOn), commonGoals_1.TagGoal, new sdm_1.GoalWithPrecondition(exports.ReleaseNpmGoal.definition, exports.PublishGoal));
+exports.BuildGoals = new sdm_1.Goals("Build", ...exports.CheckGoals.goals, sdm_1.BuildGoal, exports.PublishGoal, commonGoals_1.TagGoal);
+// Just running the build and publish
+exports.BuildReleaseGoals = new sdm_1.Goals("Build with Release", ...exports.CheckGoals.goals, sdm_1.BuildGoal, new sdm_1.GoalWithPrecondition(Object.assign({}, exports.PublishGoal.definition, { approvalRequired: true }), ...exports.PublishGoal.dependsOn), commonGoals_1.TagGoal, new sdm_1.GoalWithPrecondition(exports.ReleaseNpmGoal.definition, exports.PublishGoal));
 // Build including docker build
-exports.DockerGoals = new sdm_1.Goals("Docker Build", ...exports.BuildGoals.goals, new sdm_1.GoalWithPrecondition(Object.assign({}, commonGoals_1.DockerBuildGoal.definition, { approvalRequired: true }), ...commonGoals_1.DockerBuildGoal.dependsOn), new sdm_1.GoalWithPrecondition(exports.ReleaseDockerGoal.definition, commonGoals_1.DockerBuildGoal));
+exports.DockerGoals = new sdm_1.Goals("Docker Build", ...exports.BuildGoals.goals, commonGoals_1.DockerBuildGoal);
+// Build including docker build
+exports.DockerReleaseGoals = new sdm_1.Goals("Docker Build with Release", ...exports.CheckGoals.goals, sdm_1.BuildGoal, new sdm_1.GoalWithPrecondition(Object.assign({}, exports.PublishGoal.definition, { approvalRequired: true }), ...exports.PublishGoal.dependsOn), new sdm_1.GoalWithPrecondition(commonGoals_1.TagGoal.definition, sdm_1.BuildGoal), new sdm_1.GoalWithPrecondition(exports.ReleaseNpmGoal.definition, exports.PublishGoal), new sdm_1.GoalWithPrecondition(Object.assign({}, commonGoals_1.DockerBuildGoal.definition, { approvalRequired: true }), ...commonGoals_1.DockerBuildGoal.dependsOn), new sdm_1.GoalWithPrecondition(exports.ReleaseDockerGoal.definition, commonGoals_1.DockerBuildGoal));
 // Docker build and testing and production kubernetes deploy
@@ -78,0 +82,0 @@ exports.KubernetesDeployGoals = new sdm_1.Goals("Deploy", ...exports.CheckGoals.goals, sdm_1.BuildGoal, exports.PublishGoal, commonGoals_1.DockerBuildGoal, commonGoals_1.TagGoal, exports.StagingDeploymentGoal, new sdm_1.GoalWithPrecondition(exports.ProductionDeploymentGoal.definition, exports.StagingDeploymentGoal), new sdm_1.GoalWithPrecondition(exports.ReleaseNpmGoal.definition, exports.StagingDeploymentGoal), new sdm_1.GoalWithPrecondition(exports.ReleaseDockerGoal.definition, exports.StagingDeploymentGoal));

machine/machine.js

@@ -49,8 +49,10 @@ "use strict";
         .itMeans("Deploy")
-        .setGoals(goals_1.KubernetesDeployGoals), sdm_1.whenPushSatisfies(nodePushTests_1.IsNode, dockerPushTests_1.HasDockerfile, sdm_1.IsAtomistAutomationClient)
+        .setGoals(goals_1.KubernetesDeployGoals), sdm_1.whenPushSatisfies(nodePushTests_1.IsNode, dockerPushTests_1.HasDockerfile, sdm_1.ToDefaultBranch, sdm_1.IsAtomistAutomationClient)
+        .itMeans("Docker Release Build")
+        .setGoals(goals_1.DockerReleaseGoals), sdm_1.whenPushSatisfies(nodePushTests_1.IsNode, dockerPushTests_1.HasDockerfile, sdm_1.IsAtomistAutomationClient)
         .itMeans("Docker Build")
-        .setGoals(goals_1.DockerGoals), sdm_1.whenPushSatisfies(nodePushTests_1.IsNode, sdm_1.not(dockerPushTests_1.HasDockerfile), sdm_1.IsAtomistAutomationClient)
+        .setGoals(goals_1.DockerGoals), sdm_1.whenPushSatisfies(nodePushTests_1.IsNode, sdm_1.not(dockerPushTests_1.HasDockerfile), sdm_1.ToDefaultBranch)
+        .itMeans("Release Build")
+        .setGoals(goals_1.BuildReleaseGoals), sdm_1.whenPushSatisfies(nodePushTests_1.IsNode, sdm_1.not(dockerPushTests_1.HasDockerfile))
         .itMeans("Build")
-        .setGoals(goals_1.BuildGoals), sdm_1.whenPushSatisfies(nodePushTests_1.IsNode, sdm_1.not(dockerPushTests_1.HasDockerfile), sdm_1.not(sdm_1.IsAtomistAutomationClient))
-        .itMeans("Module Build")
         .setGoals(goals_1.BuildGoals), 
@@ -57,0 +59,0 @@ // Clojure

machine/release.js

@@ -151,3 +151,3 @@ "use strict";
         const version = yield rwlcVersion(rwlc);
-        const dockerOptions = configuration_1.configurationValue("sdm.docker");
+        const dockerOptions = configuration_1.configurationValue("sdm.docker.hub");
         const image = dockerImage({
@@ -154,0 +154,0 @@ registry: dockerOptions.registry,

package.json

 {
   "name": "@atomist/atomist-sdm",
-  "version": "0.0.1-release-goal.20180509210541",
+  "version": "0.1.0-20180510001510",
   "description": "an Atomist SDM to deliver automation client projects",
@@ -5,0 +5,0 @@ "author": "Atomist, Inc.",

No alert changes

Improved metrics

Total package byte prevSize

199665

increased by0.76%

Lines of code

2554

increased by0.35%

No dependency changes