@bakers-build/addon-orca 0.8.1-next.3 → 0.8.1-next.5
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/src/workspace.js +2 -3
- package/package.json +6 -6
package/dist/src/workspace.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { existsSync } from 'node:fs';
|
|
2
2
|
import { resolve } from 'node:path';
|
|
3
|
-
import { resolveBaseRef, restoreWritable,
|
|
3
|
+
import { resolveBaseRef, restoreWritable, } from '@bakers-build/addon-herdr/shared';
|
|
4
4
|
import { loadInstructions, removeGitWorktree, runBranchGit, } from '@bakers-build/addon-workspace-git';
|
|
5
5
|
import { deriveCheckoutRoot, exec } from '@bakers-build/core';
|
|
6
6
|
import { assertOrcaReachable, createOrcaExec, isRecord, OrcaError, } from './orca-cli.js';
|
|
@@ -105,7 +105,6 @@ export class OrcaWorkspace {
|
|
|
105
105
|
if (branch === undefined) {
|
|
106
106
|
throw new Error('orca workspace requires a branch name');
|
|
107
107
|
}
|
|
108
|
-
validateBranch(branch);
|
|
109
108
|
const extra = this.options.autoSetupMerge
|
|
110
109
|
? {}
|
|
111
110
|
: { env: await runBranchGit(this.root, this.logger) };
|
|
@@ -153,7 +152,7 @@ export class OrcaWorkspace {
|
|
|
153
152
|
return;
|
|
154
153
|
}
|
|
155
154
|
try {
|
|
156
|
-
await this.execGit(['-C', this.root, 'fetch', 'origin', branch]);
|
|
155
|
+
await this.execGit(['-C', this.root, 'fetch', 'origin', '--', branch]);
|
|
157
156
|
}
|
|
158
157
|
catch {
|
|
159
158
|
// Non-fatal: the branch is simply not on origin (yet).
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bakers-build/addon-orca",
|
|
3
|
-
"version": "0.8.1-next.
|
|
3
|
+
"version": "0.8.1-next.5",
|
|
4
4
|
"description": "bakers.build Orca integration: executor + per-ticket worktree workspace hosted in Orca.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|
|
@@ -22,15 +22,15 @@
|
|
|
22
22
|
"directory": "bakers-cli/addons/orca"
|
|
23
23
|
},
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"@bakers-build/addon-herdr": "^0.8.1-next.
|
|
26
|
-
"@bakers-build/addon-workspace-git": "^0.8.1-next.
|
|
25
|
+
"@bakers-build/addon-herdr": "^0.8.1-next.5",
|
|
26
|
+
"@bakers-build/addon-workspace-git": "^0.8.1-next.5"
|
|
27
27
|
},
|
|
28
28
|
"peerDependencies": {
|
|
29
|
-
"@bakers-build/conductor": "^0.8.1-next.
|
|
30
|
-
"@bakers-build/core": "^0.8.1-next.
|
|
29
|
+
"@bakers-build/conductor": "^0.8.1-next.5",
|
|
30
|
+
"@bakers-build/core": "^0.8.1-next.5"
|
|
31
31
|
},
|
|
32
32
|
"bakersBuild": {
|
|
33
|
-
"commit": "
|
|
33
|
+
"commit": "0a852637a4317a2ba18e831a2dcee4be2e67d060",
|
|
34
34
|
"channel": "next"
|
|
35
35
|
}
|
|
36
36
|
}
|