@catladder/pipeline 4.5.0 → 4.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/constants.js +1 -1
- package/dist/pipeline/createMainPipeline.js +1 -1
- package/dist/pipeline/gitlab/createGitlabPipeline.js +1 -1
- package/dist/rules/index.d.ts +3 -2
- package/dist/rules/index.js +7 -4
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/examples/__snapshots__/automatic-releases.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-execute-script-on-deploy.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-existing-image.test.ts.snap +3 -3
- package/examples/__snapshots__/cloud-run-health-check-defaults.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-health-check-only-startup.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-health-check.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-http2.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-llama.test.ts.snap +3 -3
- package/examples/__snapshots__/cloud-run-memory-limit.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-meteor-with-worker.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-n8n.test.ts.snap +3 -3
- package/examples/__snapshots__/cloud-run-nextjs.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-no-cpu-throttling.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-no-service.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-non-public.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-post-stop-job.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-service-custom-vpc-connector.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-service-custom-vpc.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-service-gen2.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-service-increase-timout.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-service-with-volumes.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-session-affinity.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-storybook.test.ts.snap +5 -5
- package/examples/__snapshots__/cloud-run-with-agents.test.ts.snap +10 -10
- package/examples/__snapshots__/cloud-run-with-gpu.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-with-ngnix.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-with-sql-legacy-jobs.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-with-sql-multiple-dbs.test.ts.snap +22 -22
- package/examples/__snapshots__/cloud-run-with-sql-reuse-db.test.ts.snap +15 -15
- package/examples/__snapshots__/cloud-run-with-sql.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-with-worker.test.ts.snap +8 -8
- package/examples/__snapshots__/cloud-run-worker-pool.test.ts.snap +8 -8
- package/examples/__snapshots__/custom-build-job-with-tests.test.ts.snap +8 -8
- package/examples/__snapshots__/custom-build-job.test.ts.snap +5 -5
- package/examples/__snapshots__/custom-deploy.test.ts.snap +7 -7
- package/examples/__snapshots__/custom-docker-file.test.ts.snap +8 -8
- package/examples/__snapshots__/custom-envs.test.ts.snap +13 -13
- package/examples/__snapshots__/custom-verify-job.test.ts.snap +9 -9
- package/examples/__snapshots__/git-submodule.test.ts.snap +8 -8
- package/examples/__snapshots__/kubernetes-application-customization.test.ts.snap +9 -9
- package/examples/__snapshots__/kubernetes-with-cloud-sql.test.ts.snap +9 -9
- package/examples/__snapshots__/kubernetes-with-jobs.test.ts.snap +17 -17
- package/examples/__snapshots__/kubernetes-with-mongodb.test.ts.snap +9 -9
- package/examples/__snapshots__/local-dot-env.test.ts.snap +8 -8
- package/examples/__snapshots__/meteor-kubernetes.test.ts.snap +9 -9
- package/examples/__snapshots__/modify-generated-files.test.ts.snap +5 -5
- package/examples/__snapshots__/modify-generated-yaml.test.ts.snap +5 -5
- package/examples/__snapshots__/multiline-var.test.ts.snap +23 -23
- package/examples/__snapshots__/native-app.test.ts.snap +13 -13
- package/examples/__snapshots__/node-build-with-custom-image.test.ts.snap +8 -8
- package/examples/__snapshots__/node-build-with-docker-additions.test.ts.snap +8 -8
- package/examples/__snapshots__/override-secrets.test.ts.snap +8 -8
- package/examples/__snapshots__/rails-k8s-with-worker-dockerfile.test.ts.snap +8 -8
- package/examples/__snapshots__/rails-k8s-with-worker.test.ts.snap +8 -8
- package/examples/__snapshots__/referencing-other-vars.test.ts.snap +23 -23
- package/examples/__snapshots__/wait-for-other-deploy.test.ts.snap +11 -11
- package/examples/__snapshots__/workspace-api-www-turbo-cache.test.ts.snap +11 -11
- package/examples/__snapshots__/workspace-api-www.test.ts.snap +11 -11
- package/package.json +1 -1
- package/src/pipeline/createMainPipeline.ts +2 -2
- package/src/pipeline/gitlab/createGitlabPipeline.ts +2 -2
- package/src/rules/index.ts +10 -6
package/dist/constants.js
CHANGED
|
@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
|
|
7
|
-
exports.PIPELINE_IMAGE_TAG = "v4-
|
|
7
|
+
exports.PIPELINE_IMAGE_TAG = "v4-6-0-59713d0f" || "latest";
|
|
8
8
|
exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";
|
|
@@ -279,7 +279,7 @@ function getGitlabRulesForTrigger(trigger) {
|
|
|
279
279
|
// taggedRelease: on tag
|
|
280
280
|
switch (trigger) {
|
|
281
281
|
case "mainBranch":
|
|
282
|
-
return [rules_1.RULE_NEVER_ON_AGENT_TRIGGER, rules_1.
|
|
282
|
+
return [rules_1.RULE_NEVER_ON_AGENT_TRIGGER, rules_1.RULE_IS_MAIN_BRANCH_AND_NOT_RELEASE_COMMIT];
|
|
283
283
|
case "mr":
|
|
284
284
|
return [rules_1.RULE_NEVER_ON_AGENT_TRIGGER, rules_1.RULE_IS_MERGE_REQUEST];
|
|
285
285
|
case "taggedRelease":
|
|
@@ -94,7 +94,7 @@ var createGitlabPipelineWithDefaults = function (_a) {
|
|
|
94
94
|
PIPELINE_NAME: "Release $CI_COMMIT_TAG"
|
|
95
95
|
}
|
|
96
96
|
}, {
|
|
97
|
-
if: rules_1.
|
|
97
|
+
if: rules_1.RULE_IS_MAIN_BRANCH_AND_NOT_RELEASE_COMMIT.if,
|
|
98
98
|
variables: {
|
|
99
99
|
PIPELINE_ICON: "🐱🔨",
|
|
100
100
|
PIPELINE_NAME: "Main - $CI_COMMIT_TITLE"
|
package/dist/rules/index.d.ts
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import type { GitlabRule } from "../types";
|
|
2
2
|
export declare const RULE_CONDITION_MAIN_BRANCH = "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH";
|
|
3
3
|
export declare const RULE_CONDITION_RELEASE_COMMIT = "$CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/";
|
|
4
|
-
export declare const
|
|
4
|
+
export declare const RULE_CONDITION_NOT_RELEASE_COMMIT = "$CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/";
|
|
5
|
+
export declare const RULE_CONDITION_NOT_RELEASE_COMMIT_ON_PUSH = "($CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/ || $CI_PIPELINE_SOURCE != \"push\")";
|
|
5
6
|
export declare const RULE_IS_MAIN_BRANCH: GitlabRule;
|
|
6
|
-
export declare const
|
|
7
|
+
export declare const RULE_IS_MAIN_BRANCH_AND_NOT_RELEASE_COMMIT: GitlabRule;
|
|
7
8
|
export declare const RULE_NEVER_ON_RELEASE_COMMIT: GitlabRule;
|
|
8
9
|
export declare const RULE_NEVER_ON_AGENT_TRIGGER: GitlabRule;
|
|
9
10
|
export declare const RULE_NEVER_ON_SCHEDULE: GitlabRule;
|
package/dist/rules/index.js
CHANGED
|
@@ -3,15 +3,18 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.RULE_CONDITION_HOTFIX_BRANCH = exports.RULE_IS_TAGGED_RELEASE = exports.RULE_IS_MERGE_REQUEST = exports.RULE_NEVER_ON_SCHEDULE = exports.RULE_NEVER_ON_AGENT_TRIGGER = exports.RULE_NEVER_ON_RELEASE_COMMIT = exports.
|
|
6
|
+
exports.RULE_CONDITION_HOTFIX_BRANCH = exports.RULE_IS_TAGGED_RELEASE = exports.RULE_IS_MERGE_REQUEST = exports.RULE_NEVER_ON_SCHEDULE = exports.RULE_NEVER_ON_AGENT_TRIGGER = exports.RULE_NEVER_ON_RELEASE_COMMIT = exports.RULE_IS_MAIN_BRANCH_AND_NOT_RELEASE_COMMIT = exports.RULE_IS_MAIN_BRANCH = exports.RULE_CONDITION_NOT_RELEASE_COMMIT_ON_PUSH = exports.RULE_CONDITION_NOT_RELEASE_COMMIT = exports.RULE_CONDITION_RELEASE_COMMIT = exports.RULE_CONDITION_MAIN_BRANCH = void 0;
|
|
7
7
|
exports.RULE_CONDITION_MAIN_BRANCH = "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH";
|
|
8
8
|
exports.RULE_CONDITION_RELEASE_COMMIT = "$CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/";
|
|
9
|
-
exports.
|
|
9
|
+
exports.RULE_CONDITION_NOT_RELEASE_COMMIT = "$CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/";
|
|
10
|
+
// NOT(release_commit AND push) — skip release commits on push, but allow
|
|
11
|
+
// manually triggered (web/API) pipelines even on release commits.
|
|
12
|
+
exports.RULE_CONDITION_NOT_RELEASE_COMMIT_ON_PUSH = '($CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/ || $CI_PIPELINE_SOURCE != "push")';
|
|
10
13
|
exports.RULE_IS_MAIN_BRANCH = {
|
|
11
14
|
if: exports.RULE_CONDITION_MAIN_BRANCH
|
|
12
15
|
};
|
|
13
|
-
exports.
|
|
14
|
-
if: exports.RULE_CONDITION_MAIN_BRANCH + " &&
|
|
16
|
+
exports.RULE_IS_MAIN_BRANCH_AND_NOT_RELEASE_COMMIT = {
|
|
17
|
+
if: exports.RULE_CONDITION_MAIN_BRANCH + " && " + exports.RULE_CONDITION_NOT_RELEASE_COMMIT_ON_PUSH
|
|
15
18
|
};
|
|
16
19
|
exports.RULE_NEVER_ON_RELEASE_COMMIT = {
|
|
17
20
|
if: exports.RULE_CONDITION_RELEASE_COMMIT,
|