Commit e3d5e7b
committed
Fix: Convert branch names to valid Composer dev-branch format
When building nightly packages, branch names like "develop" or "master" were being used directly as version strings, causing Satis to fail with "Invalid version string" errors. This fix ensures all
branch names are converted to Composer's dev-branch format (e.g., "develop" → "dev-develop").
Changes:
- package-modules.js: Update chooseNameAndVersion() to convert branch names from composer.json files or git refs to dev-branch format
- package-modules.js: Update createComposerJsonOnlyPackage() to convert branch refs to dev-branch format for package filenames
- release-branch-build-tools.js: Remove early conversion of branch refs that was causing issues with version determination
The fix handles multiple scenarios:
1. When version comes from composer.json containing a branch name
2. When no version exists and git ref is a branch
3. When creating package filenames from branch refs
This ensures compatibility with Composer's version constraints and allows Satis to properly process packages from development branches.1 parent f9cec98 commit e3d5e7b
2 files changed
+49
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
94 | 94 | | |
95 | 95 | | |
96 | 96 | | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
97 | 109 | | |
98 | 110 | | |
99 | 111 | | |
| |||
166 | 178 | | |
167 | 179 | | |
168 | 180 | | |
169 | | - | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
170 | 186 | | |
171 | 187 | | |
172 | 188 | | |
| |||
375 | 391 | | |
376 | 392 | | |
377 | 393 | | |
378 | | - | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
379 | 406 | | |
380 | 407 | | |
381 | 408 | | |
| |||
587 | 614 | | |
588 | 615 | | |
589 | 616 | | |
| 617 | + | |
| 618 | + | |
| 619 | + | |
| 620 | + | |
| 621 | + | |
590 | 622 | | |
591 | 623 | | |
592 | 624 | | |
| |||
613 | 645 | | |
614 | 646 | | |
615 | 647 | | |
| 648 | + | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
| 652 | + | |
616 | 653 | | |
617 | 654 | | |
618 | 655 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
81 | 81 | | |
82 | 82 | | |
83 | 83 | | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
84 | 89 | | |
85 | 90 | | |
86 | 91 | | |
| |||
100 | 105 | | |
101 | 106 | | |
102 | 107 | | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
103 | 113 | | |
104 | 114 | | |
105 | 115 | | |
| |||
0 commit comments