@docupace/pipeline 1.0.39-matttest.18 → 1.0.39-matttest.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.39-matttest.18",
+  "version": "1.0.39-matttest.2",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/next/util.js

@@ -1,7 +1,6 @@
 import { existsSync } from 'fs';
 import { join } from 'path';
 import { $, nothrow } from 'zx';
-import path from 'path';
 
 export function isMonoRepo() {
   // Check for the presence of turbo.json which indicates a Turborepo monorepo
@@ -16,21 +15,22 @@ export function isMonoRepo() {
  */
 export async function getChangedPackagesInternal(fromRef, toRef) {
   try {
-    console.log(process.cwd());
     // Run the turbo command to get changed packages between branches
     const filterArg = `[${fromRef}...${toRef}]`;
     const turboDryOutput =
-      await $`turbo run build -vvv --filter=${filterArg} --dry=json`;
+      await $`turbo run build --filter=${filterArg} --dry=json`;
+    const packageNames =
+      await $`echo ${turboDryOutput} | jq -r '.tasks[].taskId' | cut -d'#' -f1 | sort -u`;
 
-    const dryRunJson = turboDryOutput.stdout.trim();
-
-    const dryRun = JSON.parse(dryRunJson);
-
-    const packageNamesList = dryRun.tasks.map(
-      (task) => task.taskId.split('#')[0],
-    );
+    // If we didn't get any package names, return empty array
+    if (!packageNames.stdout.trim()) {
+      return [];
+    }
 
+    // For each package name, get its path
     const packages = [];
+    const packageNamesList = packageNames.stdout.trim().split('\n');
+
     for (const packageName of packageNamesList) {
       if (packageName) {
         const packagePath =
@@ -55,10 +55,7 @@ export async function getChangedPackages() {
   const branch = process.env.BITBUCKET_BRANCH;
   const destBranch = process.env.BITBUCKET_PR_DESTINATION_BRANCH;
 
-  await $`git fetch origin ${destBranch}:${destBranch}`;
-  console.log(`Getting changed packages for [${destBranch}...${branch}]`);
   const changedPackages = await getChangedPackagesInternal(destBranch, branch);
-  console.log('Changed Packages:\n', JSON.stringify(changedPackages, null, 2));
   return changedPackages;
 }
 
@@ -72,19 +69,16 @@ export async function getChangedAppPackages() {
 
 export async function buildChangePackages() {
   const appPackages = await getChangedAppPackages();
-  if (appPackages.length == 0) {
-    throw new Error('Nothing to build');
-  }
   for (const appPackage of appPackages) {
     await dockerBuild(appPackage.path);
   }
 }
 
-export async function dockerBuild(buildPath) {
+export async function dockerBuild(path) {
   process.env.DOCKER_HOST = '';
   const imageName = `${process.env.BITBUCKET_REPO_SLUG}:sha-${process.env.GIT_SHA}-withMaps`;
   console.log(`Building Docker image ${imageName}...`);
-  await $`docker build --secret id=npm_token,env=DOCUPACE_NPM_TOKEN . --file ${path.resolve(buildPath, 'Dockerfile')} --target builder --tag ${imageName}`;
+  await $`docker build --secret id=npm_token,env=DOCUPACE_NPM_TOKEN ${path} --file Dockerfile --target builder --tag ${imageName}`;
 }
 
 export async function setGitInfo() {