Skip to content

Merge ../jdk

Merge ../jdk #15

Workflow file for this run

# DO NOT EDIT ci.yml. Edit ci.yml.m4 and defs.m4 instead.
name: CF CI
on:
push:
pull_request:
workflow_dispatch:
defaults:
run:
shell: bash --noprofile --norc -eo pipefail {0}
jobs:
check_generated_ci:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v7
- name: Check generated ci.yml
run: make -B -C .github/workflows && git diff --exit-code -- .github/workflows/ci.yml
build_jdk:
needs:
- check_generated_ci
runs-on: ubuntu-latest
container: mdernst/cf-ubuntu-jdk21-plus:latest
steps:
- name: Checkout repository
uses: actions/checkout@v7
- name: show environment
run: |
whoami
git config --get remote.origin.url || true
pwd
ls -al
echo "HOME=${HOME}"
echo "USER=${USER}"
echo "SHELL=${SHELL}"
echo "GITHUB_WORKSPACE=${GITHUB_WORKSPACE}"
- name: configure
run: |
pwd
bash ./configure --with-jtreg=/usr/share/jtreg --disable-warnings-as-errors
- name: make jdk
timeout-minutes: 90
run: make jdk
build_jdk21u:
if: endsWith(github.repository, '/jdk')
needs:
- check_generated_ci
runs-on: ubuntu-latest
container: mdernst/cf-ubuntu-jdk21-plus:latest
steps:
- name: Checkout repository
uses: actions/checkout@v7
- name: show environment
run: |
whoami
git config --get remote.origin.url || true
pwd
ls -al
echo "HOME=${HOME}"
echo "USER=${USER}"
echo "SHELL=${SHELL}"
echo "GITHUB_WORKSPACE=${GITHUB_WORKSPACE}"
- name: clone git-scripts
run: |
set -ex
if test -d /tmp/$USER/git-scripts ; \
then git -C /tmp/$USER/git-scripts pull -q > /dev/null 2>&1 ; \
else mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/git-scripts.git ; \
fi
- name: clone plume-scripts
run: |
set -ex
if test -d /tmp/$USER/plume-scripts ; \
then git -C /tmp/$USER/plume-scripts pull -q > /dev/null 2>&1 ; \
else mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/plume-scripts.git ; \
fi
- name: git config
run: |
git config --global user.email "you@example.com"
git config --global user.name "Your Name"
git config --global pull.ff true
git config --global pull.rebase false
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-org-and-branch
run: /tmp/$USER/plume-scripts/ci-org-and-branch --debug
- name: clone-related-jdk21u
run: |
set -ex
echo "pwd = $(pwd)"
if test -d ../jdk21u; then
echo "../jdk21u should not exist yet"
false
fi
df .
/tmp/$USER/git-scripts/git-clone-related typetools jdk21u ../jdk21u --single-branch
cd ../jdk21u
git diff --exit-code
- name: git merge plan
run: |
set -ex
cd ../jdk21u
git status
/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
echo "Merge failed; see 'Pull request merge conflicts' at https://github.com/typetools/jdk/blob/master/README.md"
false
fi
shell: bash --noprofile --norc -e {0}
- name: configure
run: |
cd ../jdk21u
export JT_HOME=/usr/share/jtreg
bash ./configure --with-jtreg --disable-warnings-as-errors
- name: make jdk
timeout-minutes: 90
run: make -C ../jdk21u jdk
canary_jobs:
needs:
- build_jdk
- build_jdk21u
runs-on: ubuntu-latest
steps:
- name: canary_jobs
run: true
cftests_junit_jdk17:
needs:
- canary_jobs
timeout-minutes: 120
runs-on: ubuntu-latest
container: mdernst/cf-ubuntu-jdk17:latest
steps:
- name: Checkout repository
uses: actions/checkout@v7
with:
fetch-depth: 25
- name: clone git-scripts
run: mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/git-scripts.git
- name: clone checker-framework
run: /tmp/$USER/git-scripts/git-clone-related typetools checker-framework
- name: test-cftests-junit.sh
run: (cd ../checker-framework && checker/bin-devel/test-cftests-junit.sh)
cftests_nonjunit_jdk17:
needs:
- canary_jobs
timeout-minutes: 120
runs-on: ubuntu-latest
container: mdernst/cf-ubuntu-jdk17:latest
steps:
- name: Checkout repository
uses: actions/checkout@v7
with:
fetch-depth: 25
- name: clone git-scripts
run: mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/git-scripts.git
- name: clone checker-framework
run: /tmp/$USER/git-scripts/git-clone-related typetools checker-framework
- name: test-cftests-nonjunit.sh
run: (cd ../checker-framework && checker/bin-devel/test-cftests-nonjunit.sh)
cftests_typecheck_jdk17:
needs:
- canary_jobs
timeout-minutes: 120
runs-on: ubuntu-latest
container: mdernst/cf-ubuntu-jdk17:latest
steps:
- name: Checkout repository
uses: actions/checkout@v7
with:
fetch-depth: 25
- name: clone git-scripts
run: mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/git-scripts.git
- name: clone checker-framework
run: /tmp/$USER/git-scripts/git-clone-related typetools checker-framework
- name: test-typecheck.sh
run: (cd ../checker-framework && checker/bin-devel/test-typecheck.sh)
cftests_inference_jdk17:
needs:
- canary_jobs
timeout-minutes: 120
runs-on: ubuntu-latest
container: mdernst/cf-ubuntu-jdk17:latest
steps:
- name: Checkout repository
uses: actions/checkout@v7
with:
fetch-depth: 25
- name: clone git-scripts
run: mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/git-scripts.git
- name: clone checker-framework
run: /tmp/$USER/git-scripts/git-clone-related typetools checker-framework
- name: test-cftests-inference.sh
run: (cd ../checker-framework && checker/bin-devel/test-cftests-inference.sh)
cftests_junit_jdk21:
needs:
- canary_jobs
timeout-minutes: 120
runs-on: ubuntu-latest
container: mdernst/cf-ubuntu-jdk21:latest
steps:
- name: Checkout repository
uses: actions/checkout@v7
with:
fetch-depth: 25
- name: clone git-scripts
run: mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/git-scripts.git
- name: clone checker-framework
run: /tmp/$USER/git-scripts/git-clone-related typetools checker-framework
- name: test-cftests-junit.sh
run: (cd ../checker-framework && checker/bin-devel/test-cftests-junit.sh)
cftests_nonjunit_jdk21:
needs:
- canary_jobs
timeout-minutes: 120
runs-on: ubuntu-latest
container: mdernst/cf-ubuntu-jdk21:latest
steps:
- name: Checkout repository
uses: actions/checkout@v7
with:
fetch-depth: 25
- name: clone git-scripts
run: mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/git-scripts.git
- name: clone checker-framework
run: /tmp/$USER/git-scripts/git-clone-related typetools checker-framework
- name: test-cftests-nonjunit.sh
run: (cd ../checker-framework && checker/bin-devel/test-cftests-nonjunit.sh)
cftests_inference_jdk21:
needs:
- canary_jobs
timeout-minutes: 120
runs-on: ubuntu-latest
container: mdernst/cf-ubuntu-jdk21:latest
steps:
- name: Checkout repository
uses: actions/checkout@v7
with:
fetch-depth: 25
- name: clone git-scripts
run: mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/git-scripts.git
- name: clone checker-framework
run: /tmp/$USER/git-scripts/git-clone-related typetools checker-framework
- name: test-cftests-inference.sh
run: (cd ../checker-framework && checker/bin-devel/test-cftests-inference.sh)
cftests_typecheck_jdk21:
needs:
- canary_jobs
timeout-minutes: 120
runs-on: ubuntu-latest
container: mdernst/cf-ubuntu-jdk21:latest
steps:
- name: Checkout repository
uses: actions/checkout@v7
with:
fetch-depth: 25
- name: clone git-scripts
run: mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/git-scripts.git
- name: clone checker-framework
run: /tmp/$USER/git-scripts/git-clone-related typetools checker-framework
- name: test-typecheck.sh
run: (cd ../checker-framework && checker/bin-devel/test-typecheck.sh)
cftests_junit_jdk25:
needs:
- canary_jobs
timeout-minutes: 120
runs-on: ubuntu-latest
container: mdernst/cf-ubuntu-jdk25:latest
steps:
- name: Checkout repository
uses: actions/checkout@v7
with:
fetch-depth: 25
- name: clone git-scripts
run: mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/git-scripts.git
- name: clone checker-framework
run: /tmp/$USER/git-scripts/git-clone-related typetools checker-framework
- name: test-cftests-junit.sh
run: (cd ../checker-framework && checker/bin-devel/test-cftests-junit.sh)
cftests_nonjunit_jdk25:
needs:
- canary_jobs
timeout-minutes: 120
runs-on: ubuntu-latest
container: mdernst/cf-ubuntu-jdk25:latest
steps:
- name: Checkout repository
uses: actions/checkout@v7
with:
fetch-depth: 25
- name: clone git-scripts
run: mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/git-scripts.git
- name: clone checker-framework
run: /tmp/$USER/git-scripts/git-clone-related typetools checker-framework
- name: test-cftests-nonjunit.sh
run: (cd ../checker-framework && checker/bin-devel/test-cftests-nonjunit.sh)
cftests_inference_jdk25:
needs:
- canary_jobs
timeout-minutes: 120
runs-on: ubuntu-latest
container: mdernst/cf-ubuntu-jdk25:latest
steps:
- name: Checkout repository
uses: actions/checkout@v7
with:
fetch-depth: 25
- name: clone git-scripts
run: mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/git-scripts.git
- name: clone checker-framework
run: /tmp/$USER/git-scripts/git-clone-related typetools checker-framework
- name: test-cftests-inference.sh
run: (cd ../checker-framework && checker/bin-devel/test-cftests-inference.sh)
cftests_typecheck_jdk25:
needs:
- canary_jobs
timeout-minutes: 120
runs-on: ubuntu-latest
container: mdernst/cf-ubuntu-jdk25:latest
steps:
- name: Checkout repository
uses: actions/checkout@v7
with:
fetch-depth: 25
- name: clone git-scripts
run: mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/git-scripts.git
- name: clone checker-framework
run: /tmp/$USER/git-scripts/git-clone-related typetools checker-framework
- name: test-typecheck.sh
run: (cd ../checker-framework && checker/bin-devel/test-typecheck.sh)
cftests_junit_jdk26:
needs:
- canary_jobs
timeout-minutes: 120
runs-on: ubuntu-latest
container: mdernst/cf-ubuntu-jdk26:latest
steps:
- name: Checkout repository
uses: actions/checkout@v7
with:
fetch-depth: 25
- name: clone git-scripts
run: mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/git-scripts.git
- name: clone checker-framework
run: /tmp/$USER/git-scripts/git-clone-related typetools checker-framework
- name: test-cftests-junit.sh
run: (cd ../checker-framework && checker/bin-devel/test-cftests-junit.sh)
cftests_nonjunit_jdk26:
needs:
- canary_jobs
timeout-minutes: 120
runs-on: ubuntu-latest
container: mdernst/cf-ubuntu-jdk26:latest
steps:
- name: Checkout repository
uses: actions/checkout@v7
with:
fetch-depth: 25
- name: clone git-scripts
run: mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/git-scripts.git
- name: clone checker-framework
run: /tmp/$USER/git-scripts/git-clone-related typetools checker-framework
- name: test-cftests-nonjunit.sh
run: (cd ../checker-framework && checker/bin-devel/test-cftests-nonjunit.sh)
cftests_inference_jdk26:
needs:
- canary_jobs
timeout-minutes: 120
runs-on: ubuntu-latest
container: mdernst/cf-ubuntu-jdk26:latest
steps:
- name: Checkout repository
uses: actions/checkout@v7
with:
fetch-depth: 25
- name: clone git-scripts
run: mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/git-scripts.git
- name: clone checker-framework
run: /tmp/$USER/git-scripts/git-clone-related typetools checker-framework
- name: test-cftests-inference.sh
run: (cd ../checker-framework && checker/bin-devel/test-cftests-inference.sh)
cftests_typecheck_jdk26:
needs:
- canary_jobs
timeout-minutes: 120
runs-on: ubuntu-latest
container: mdernst/cf-ubuntu-jdk26:latest
steps:
- name: Checkout repository
uses: actions/checkout@v7
with:
fetch-depth: 25
- name: clone git-scripts
run: mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/git-scripts.git
- name: clone checker-framework
run: /tmp/$USER/git-scripts/git-clone-related typetools checker-framework
- name: test-typecheck.sh
run: (cd ../checker-framework && checker/bin-devel/test-typecheck.sh)
test_daikon_part1:
needs:
- canary_jobs
timeout-minutes: 70
runs-on: ubuntu-latest
container: mdernst/cf-ubuntu-jdk25:latest
steps:
- name: Checkout repository
uses: actions/checkout@v7
with:
fetch-depth: 25
- name: clone git-scripts
run: mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/git-scripts.git
- name: clone checker-framework
run: /tmp/$USER/git-scripts/git-clone-related typetools checker-framework
- name: test-daikon-part1.sh
run: (cd ../checker-framework && checker/bin-devel/test-daikon-part1.sh)
test_daikon_part2:
needs:
- canary_jobs
timeout-minutes: 70
runs-on: ubuntu-latest
container: mdernst/cf-ubuntu-jdk25:latest
steps:
- name: Checkout repository
uses: actions/checkout@v7
with:
fetch-depth: 25
- name: clone git-scripts
run: mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/git-scripts.git
- name: clone checker-framework
run: /tmp/$USER/git-scripts/git-clone-related typetools checker-framework
- name: test-daikon-part2.sh
run: (cd ../checker-framework && checker/bin-devel/test-daikon-part2.sh)
test_daikon_part3:
needs:
- canary_jobs
timeout-minutes: 70
runs-on: ubuntu-latest
container: mdernst/cf-ubuntu-jdk25:latest
steps:
- name: Checkout repository
uses: actions/checkout@v7
with:
fetch-depth: 25
- name: clone git-scripts
run: mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/git-scripts.git
- name: clone checker-framework
run: /tmp/$USER/git-scripts/git-clone-related typetools checker-framework
- name: test-daikon-part3.sh
run: (cd ../checker-framework && checker/bin-devel/test-daikon-part3.sh)
test_plume_lib:
needs:
- canary_jobs
runs-on: ubuntu-latest
container: mdernst/cf-ubuntu-jdk25:latest
steps:
- name: Checkout repository
uses: actions/checkout@v7
with:
fetch-depth: 25
- name: clone git-scripts
run: mkdir -p /tmp/$USER && git -C /tmp/$USER clone --depth=1 -q https://github.com/plume-lib/git-scripts.git
- name: clone checker-framework
run: /tmp/$USER/git-scripts/git-clone-related typetools checker-framework
- name: test-plume-lib.sh
run: (cd ../checker-framework && checker/bin-devel/test-plume-lib.sh)