Update branch name and version resolution#1055
Merged
Merged
Conversation
joehoyle
approved these changes
May 8, 2026
4 tasks
mikelittle
added a commit
that referenced
this pull request
May 8, 2026
PR #1055 changed the alias for `dev-*` installed versions from the version itself (matching Travis's `/^dev/q` short-circuit) to a flat `9999.9.9`. That breaks any sibling whose constraint on the package under test is a literal `dev-master` (or similar): the alias `9999.9.9` only satisfies numeric constraints, so a `dev-master` constraint fails to resolve. altis/dev-tools is the most exposed example — most altis modules require it as `dev-master`, so dev-tools' own CI on a feature branch fails with "X dev-master requires altis/dev-tools dev-master -> conflicts with your root composer.json require (dev-feat as 9999.9.9)". Restore the Travis-equivalent behaviour: - empty installed_version -> alias=9999.9.9 (sensible fallback) - dev-* installed_version -> alias=$INSTALLED_VERSION (e.g. dev-master) - concrete X.Y.Z -> alias=X.Y.Z9 Update ci-version-resolution.sh to match. Also flip the dev-tools self-CI caller to the relative-path form `./.github/workflows/module-ci.yml`. Without this, this PR's CI runs master's copy of the reusable workflow and so does not exercise the workflow change under review. Module repos that consume module-ci.yml continue to pin to a SHA in their own ci.yml. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin v26-branch
git worktree add -d .worktree/backport-1055-to-v26-branch origin/v26-branch
cd .worktree/backport-1055-to-v26-branch
git switch --create backport-1055-to-v26-branch
git cherry-pick -x 0bc4e62e1689f5ccc398e8920aed88e0e742ccd7 28a2752b8765e4cfd5fd69e024db0a9dc34759a3 |
After resolving conflicts, continue with:# Add the resolved files
git add .
# Continue the cherry-pick
git cherry-pick --continue
# Push the branch to GitHub
git push --set-upstream origin backport-1055-to-v26-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktree/backport-1055-to-v26-branchThen create a pull request using the GitHub CLI: gh pr create --base v26-branch --head backport-1055-to-v26-branch --title "[Backport v26-branch] Update branch name and version resolution" --body "Backport of #1055 to \`v26-branch\`." |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes:
Test run: https://github.com/humanmade/altis-local-server/actions/runs/25475566704/job/74748912461