@catladder/pipeline 1.100.2 → 1.101.0

package/src/pipeline/commitInfo/getBuildId.ts

@@ -4,3 +4,14 @@ export const getBuildId = async () =>
   await exec("git describe --tags || git rev-parse HEAD").then((s) =>
     s.stdout.trim()
   );
+
+// thx chat gpt
+/**
+ * returns the last tagged version string Major.minor.patch
+ * returns 0.0.0 if there is no tag
+ */
+export const getCurrentVersionString = async () => {
+  return await exec(
+    'latest_tag=$(git describe --tags --abbrev=0 2>/dev/null); if [ -z "$latest_tag" ]; then echo "0.0.0"; else echo "${latest_tag#v}"; fi | cut -d "." -f 1-3'
+  ).then((s) => s.stdout.trim());
+};

package/src/pipeline/commitInfo/getCommitInfo.ts

@@ -1,5 +1,5 @@
 import type { CommitInfo } from "../../types";
-import { getBuildId } from "./getBuildId";
+import { getBuildId, getCurrentVersionString } from "./getBuildId";
 export const getBaseCommitInfo = async (): Promise<
   Omit<CommitInfo, "trigger">
 > => ({
@@ -9,4 +9,5 @@ export const getBaseCommitInfo = async (): Promise<
     : "unknown",
   buildTime: new Date().toISOString(),
   buildId: await getBuildId(),
+  currentVersion: await getCurrentVersionString(),
 });

package/src/pipeline/gitlab/createGitlabJobs.ts

@@ -51,6 +51,7 @@ export const makeGitlabJob = (
     needsOtherComponent,
     name,
     needs,
+    jobTags,
     ...job
   }: CatladderJob<string>,
   allJobs: AllCatladderJobs
@@ -101,6 +102,7 @@ export const makeGitlabJob = (
 
   const gitlabJob: GitlabJobDef = removeUndefined({
     ...job,
+    tags: jobTags,
     stage,
     environment: job.environment?.on_stop
       ? {

package/src/types/context.ts

@@ -35,6 +35,7 @@ export type CommitInfo = {
   buildTime: string;
   buildId: string;
   trigger: PipelineTrigger;
+  currentVersion: string;
 };
 
 type Workspace = {

package/src/types/gitlab-types.ts

@@ -77,6 +77,7 @@ export type GitlabJobDef = {
   environment?: GitlabEnvironment;
   allow_failure?: boolean;
   parallel?: number;
+  tags?: string[];
   trigger?: {
     strategy: "depend";
     include: Array<{

package/src/types/jobs.ts

@@ -109,4 +109,9 @@ export type CatladderJob<S = BaseStage> = {
    * We use the same shape as GitLab itself.
    */
   parallel?: number;
+
+  /**
+   * tags for the underlying job runner (e.g gitlab)
+   */
+  jobTags?: string[];
 };

package/src/utils/index.ts

@@ -6,7 +6,7 @@ export function notNil<TValue>(
   return value !== null && value !== undefined;
 }
 
-export const ensureArray = <T>(s: T | T[]): T[] | null =>
+export const ensureArray = <T>(s: undefined | T | T[]): T[] | null =>
   isNil(s) ? null : Array.isArray(s) ? s : [s];
 
 // see https://github.com/lodash/lodash/issues/5384