Skip to content

Use ci-org-and-branch instead of ci-info #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mernst merged 5 commits into from
May 26, 2026
Merged

Use ci-org-and-branch instead of ci-info #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4cd8bb1
Use `ci-org-and-branch` instead of `ci-info`
mernst May 25, 2026
f307e1f
Use diff3 style for merge conflicts
mernst May 25, 2026
49d095f
Reduce duplication in `git config` commands
mernst May 25, 2026
8ab68ec
Merge ../jdk-fork-typetools into no-ciinfo
mernst May 25, 2026
aeceae0
Fix variable name
mernst May 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions .azure/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ jobs:
- bash: |
git config --global --add safe.directory $(cd ../jdk21u && pwd)
cd ../jdk21u && git status
eval $(/tmp/$USER/plume-scripts/ci-info typetools)
set
echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
/tmp/$USER/plume-scripts/ci-org-and-branch typetools --debug
eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH}"
displayName: git merge plan
- bash: |
set -ex
Expand All @@ -93,10 +93,9 @@ jobs:
git config --global core.protectNTFS false
git config --global merge.conflictstyle diff3
cd ../jdk21u && git status
eval $(/tmp/$USER/plume-scripts/ci-info typetools)
set
echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
cd ../jdk21u && git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME} || (git --version && git show | head -100 && git status && git diff | head -1000 && echo "Merge failed; see 'Pull request merge conflicts' at https://github.com/typetools/jdk/blob/master/README.md " && false)
eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH}"
cd ../jdk21u && git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH} || (git --version && git show | head -100 && git status && git diff | head -1000 && echo "Merge failed; see 'Pull request merge conflicts' at https://github.com/typetools/jdk/blob/master/README.md " && false)
displayName: git merge
- bash: cd ../jdk21u && export JT_HOME=/usr/share/jtreg && bash ./configure --with-jtreg --disable-warnings-as-errors
displayName: configure
Expand Down
13 changes: 6 additions & 7 deletions .azure/azure-pipelines.yml.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ jobs:
- bash: |
git config --global --add safe.directory $(cd ../jdk21u && pwd)
cd ../jdk21u && git status
eval $(/tmp/$USER/plume-scripts/ci-info typetools)
set
echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
/tmp/$USER/plume-scripts/ci-org-and-branch typetools --debug
eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH}"
displayName: git merge plan
- bash: |
set -ex
Expand All @@ -96,10 +96,9 @@ jobs:
git config --global core.protectNTFS false
git config --global merge.conflictstyle diff3
cd ../jdk21u && git status
eval $(/tmp/$USER/plume-scripts/ci-info typetools)
set
echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
cd ../jdk21u && git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME} || (git --version && git show | head -100 && git status && git diff | head -1000 && echo "Merge failed; see 'Pull request merge conflicts' at https://github.com/typetools/jdk/blob/master/README.md " && false)
eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH}"
cd ../jdk21u && git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH} || (git --version && git show | head -100 && git status && git diff | head -1000 && echo "Merge failed; see 'Pull request merge conflicts' at https://github.com/typetools/jdk/blob/master/README.md " && false)
displayName: git merge
- bash: cd ../jdk21u && export JT_HOME=/usr/share/jtreg && bash ./configure --with-jtreg --disable-warnings-as-errors
displayName: configure
Expand Down
24 changes: 15 additions & 9 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,13 @@ jobs:
git config --global core.longpaths true
git config --global core.protectNTFS false
git config --global --add safe.directory /__w/jdk/jdk
git config --global merge.conflictstyle diff3
# This creates ../jdk21u .
# Run `git-clone-related` without a limit on depth, because if the depth is
# too small, the merge will fail. Don't use "--filter=blob:none" because that
# leads to "fatal: remote error: filter 'combine' not supported".
- name: ci-info
run: /tmp/$USER/plume-scripts/ci-info --debug
- name: ci-org-and-branch
run: /tmp/$USER/plume-scripts/ci-org-and-branch --debug
- name: clone-related-jdk21u
run: |
set -ex
Expand All @@ -107,20 +108,25 @@ jobs:
false
fi
df .
git config --global --add safe.directory /__w/jdk/jdk
git config --global merge.conflictstyle diff3
/tmp/$USER/git-scripts/git-clone-related typetools jdk21u ../jdk21u --single-branch
cd ../jdk21u
git diff --exit-code
- name: git merge
- name: git merge plan
run: |
set -ex
cd ../jdk21u
git status
eval $(/tmp/$USER/plume-scripts/ci-info typetools)
echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
if ! git pull --no-edit "https://github.com/${CI_ORGANIZATION}/jdk" "${CI_BRANCH_NAME}"; then
git config --global merge.conflictstyle diff3
/tmp/$USER/plume-scripts/ci-org-and-branch typetools --debug
eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH}"
shell: bash --noprofile --norc -e {0}
- name: git merge
run: |
set -ex
cd ../jdk21u
eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH}"
if ! git pull --no-edit "https://github.com/${CI_ORGANIZATION}/jdk" "${CI_BRANCH}"; then
git --version
git show | head -100
git status && git diff | head -1000
Expand Down
24 changes: 15 additions & 9 deletions .github/workflows/ci.yml.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,13 @@ jobs:
git config --global core.longpaths true
git config --global core.protectNTFS false
git config --global --add safe.directory /__w/jdk/jdk
git config --global merge.conflictstyle diff3
# This creates ../jdk21u .
# Run `git-clone-related` without a limit on depth, because if the depth is
# too small, the merge will fail. Don't use "--filter=blob:none" because that
# leads to "fatal: remote error: filter 'combine' not supported".
- name: ci-info
run: /tmp/$USER/plume-scripts/ci-info --debug
- name: ci-org-and-branch
run: /tmp/$USER/plume-scripts/ci-org-and-branch --debug
- name: clone-related-jdk21u
run: |
set -ex
Expand All @@ -111,20 +112,25 @@ jobs:
false
fi
df .
git config --global --add safe.directory /__w/jdk/jdk
git config --global merge.conflictstyle diff3
/tmp/$USER/git-scripts/git-clone-related typetools jdk21u ../jdk21u --single-branch
cd ../jdk21u
git diff --exit-code
- name: git merge
- name: git merge plan
run: |
set -ex
cd ../jdk21u
git status
eval $(/tmp/$USER/plume-scripts/ci-info typetools)
echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
if ! git pull --no-edit "https://github.com/${CI_ORGANIZATION}/jdk" "${CI_BRANCH_NAME}"; then
git config --global merge.conflictstyle diff3
/tmp/$USER/plume-scripts/ci-org-and-branch typetools --debug
eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH}"
shell: bash --noprofile --norc -e {0}
- name: git merge
run: |
set -ex
cd ../jdk21u
eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH}"
if ! git pull --no-edit "https://github.com/${CI_ORGANIZATION}/jdk" "${CI_BRANCH}"; then
git --version
git show | head -100
git status && git diff | head -1000
Expand Down