Console Output
+ export BASE_REPO=omero-zarr-pixel-buffer.git
+ BASE_REPO=omero-zarr-pixel-buffer.git
+ export BASE_BRANCH=master
+ BASE_BRANCH=master
+ export VERSION_LOG=/home/omero/workspace/OMERO-zarr-pixel-buffer-push/build/version.tsv
+ VERSION_LOG=/home/omero/workspace/OMERO-zarr-pixel-buffer-push/build/version.tsv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ unset VIRTUAL_ENV_PROMPT
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/OMERO-zarr-pixel-buffer-push/build/venv
++ export VIRTUAL_ENV
++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ PATH=/home/omero/workspace/OMERO-zarr-pixel-buffer-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(venv) '
++ export PS1
++ VIRTUAL_ENV_PROMPT='(venv) '
++ export VIRTUAL_ENV_PROMPT
++ hash -r
+ '[' merge_ci '!=' null ']'
+ export PUSH_BRANCH=merge_ci
+ PUSH_BRANCH=merge_ci
+ '[' null '!=' null ']'
+ export STATUS=success-only 'MERGE_OPTIONS=-vvv --no-ask --reset --comment'
+ STATUS=success-only
+ MERGE_OPTIONS='-vvv --no-ask --reset --comment'
+ bash build/build-infra-master/recursive-merge
Merge base repository (no submodule updates)
2026-07-25 01:09:02,936 [ scc.config] DEBUG Found github.token
2026-07-25 01:09:02,937 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2026-07-25 01:09:03,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2026-07-25 01:09:03,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2026-07-25 01:09:04,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2026-07-25 01:09:04,214 [ scc.gh] DEBUG 4996 remaining from 5000 (Reset at 01:07
2026-07-25 01:09:04,214 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2026-07-25 01:09:04,226 [ scc.git] DEBUG Check current status
2026-07-25 01:09:04,226 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2026-07-25 01:09:04,247 [ scc.git] DEBUG 3e9b9da Merge remote-tracking branch 'glencoe/master'
2026-07-25 01:09:04,248 [ scc.git] DEBUG Calling 'git submodule status'
2026-07-25 01:09:04,360 [ scc.config] DEBUG Found remote.origin.url
2026-07-25 01:09:04,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer HTTP/1.1" 200 None
2026-07-25 01:09:05,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2026-07-25 01:09:05,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2026-07-25 01:09:06,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2026-07-25 01:09:06,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2026-07-25 01:09:06,878 [ scc.git] DEBUG Resetting...
2026-07-25 01:09:06,878 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2026-07-25 01:09:06,996 [ scc.git] DEBUG HEAD is now at 3e9b9da Merge remote-tracking branch 'glencoe/master'
2026-07-25 01:09:06,997 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2026-07-25 01:09:07,100 [ scc.git] DEBUG Check current status
2026-07-25 01:09:07,100 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2026-07-25 01:09:07,127 [ scc.git] DEBUG 3e9b9da Merge remote-tracking branch 'glencoe/master'
2026-07-25 01:09:07,129 [ scc.git] DEBUG Calling 'git submodule status'
2026-07-25 01:09:07,223 [ scc.merge] INFO Merging Pull Request(s) based on master
2026-07-25 01:09:07,223 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2026-07-25 01:09:07,223 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2026-07-25 01:09:07,223 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2026-07-25 01:09:07,223 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2026-07-25 01:09:07,223 [ scc.repo] DEBUG ## PRs found:
2026-07-25 01:09:07,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/pulls HTTP/1.1" 200 None
2026-07-25 01:09:08,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/issues/16 HTTP/1.1" 200 None
2026-07-25 01:09:08,016 [ scc.repo] DEBUG - PR 16 dominikl 'Zarr v3 support'
2026-07-25 01:09:08,016 [ scc.repo] DEBUG ## Branches found:
2026-07-25 01:09:08,016 [ scc.git] DEBUG Get sha1 of %s
2026-07-25 01:09:08,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2026-07-25 01:09:08,027 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2026-07-25 01:09:08,041 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2026-07-25 01:09:08,041 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2026-07-25 01:09:08,054 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2026-07-25 01:09:08,097 [ scc.git] DEBUG Already up to date.
2026-07-25 01:09:08,097 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2026-07-25 01:09:08,526 [ scc.git] DEBUG From https://github.com/ome/omero-zarr-pixel-buffer
2026-07-25 01:09:08,527 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2026-07-25 01:09:08,550 [ scc.git] DEBUG ## Unique users: []
2026-07-25 01:09:08,550 [ scc.git] DEBUG Get sha1 of %s
2026-07-25 01:09:08,551 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2026-07-25 01:09:08,561 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a9aba3e336972d6e4ebb8d916d5eff71a3e7ed4c'
2026-07-25 01:09:08,577 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2026-07-25 01:09:08,587 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 16 (Zarr v3 support) a9aba3e336972d6e4ebb8d916d5eff71a3e7ed4c'
2026-07-25 01:09:08,872 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2026-07-25 01:09:08,980 [ scc.git] DEBUG .github/workflows/codeql.yml | 48 -
2026-07-25 01:09:08,980 [ scc.git] DEBUG build.gradle | 44 +-
2026-07-25 01:09:08,980 [ scc.git] DEBUG config/checkstyle/checkstyle.xml | 9 +-
2026-07-25 01:09:08,980 [ scc.git] DEBUG settings.gradle | 2 +
2026-07-25 01:09:08,980 [ scc.git] DEBUG .../com/bc/zarr/storage/OmeroFileSystemStore.java | 78 --
2026-07-25 01:09:08,980 [ scc.git] DEBUG .../omero/zarr/OmeroAmazonS3ClientFactory.java | 138 ---
2026-07-25 01:09:08,980 [ scc.git] DEBUG .../omero/zarr/OmeroS3FileSystem.java | 44 -
2026-07-25 01:09:08,980 [ scc.git] DEBUG .../zarr/OmeroS3ReadOnlySeekableByteChannel.java | 194 ----
2026-07-25 01:09:08,980 [ scc.git] DEBUG .../java/com/glencoesoftware/omero/zarr/Utils.java | 88 ++
2026-07-25 01:09:08,980 [ scc.git] DEBUG .../com/glencoesoftware/omero/zarr/ZarrPath.java | 64 ++
2026-07-25 01:09:08,980 [ scc.git] DEBUG .../omero/zarr/ZarrPixelBuffer.java | 464 ++++-----
2026-07-25 01:09:08,980 [ scc.git] DEBUG .../omero/zarr/ZarrPixelsService.java | 266 ++----
2026-07-25 01:09:08,981 [ scc.git] DEBUG .../com/glencoesoftware/omero/zarr/ZarrStore.java | 393 ++++++++
2026-07-25 01:09:08,981 [ scc.git] DEBUG .../s3fs/OmeroS3FilesystemProvider.java | 187 ----
2026-07-25 01:09:08,981 [ scc.git] DEBUG .../omero/zarr/ZarrPixelBufferTest.java | 1001 ++++----------------
2026-07-25 01:09:08,981 [ scc.git] DEBUG .../omero/zarr/ZarrPixelsServiceTest.java | 45 +-
2026-07-25 01:09:08,981 [ scc.git] DEBUG 16 files changed, 1089 insertions(+), 1976 deletions(-)
2026-07-25 01:09:08,981 [ scc.git] DEBUG delete mode 100644 .github/workflows/codeql.yml
2026-07-25 01:09:08,981 [ scc.git] DEBUG create mode 100644 settings.gradle
2026-07-25 01:09:08,981 [ scc.git] DEBUG delete mode 100644 src/main/java/com/bc/zarr/storage/OmeroFileSystemStore.java
2026-07-25 01:09:08,981 [ scc.git] DEBUG delete mode 100644 src/main/java/com/glencoesoftware/omero/zarr/OmeroAmazonS3ClientFactory.java
2026-07-25 01:09:08,981 [ scc.git] DEBUG delete mode 100644 src/main/java/com/glencoesoftware/omero/zarr/OmeroS3FileSystem.java
2026-07-25 01:09:08,981 [ scc.git] DEBUG delete mode 100644 src/main/java/com/glencoesoftware/omero/zarr/OmeroS3ReadOnlySeekableByteChannel.java
2026-07-25 01:09:08,981 [ scc.git] DEBUG create mode 100644 src/main/java/com/glencoesoftware/omero/zarr/Utils.java
2026-07-25 01:09:08,981 [ scc.git] DEBUG create mode 100644 src/main/java/com/glencoesoftware/omero/zarr/ZarrPath.java
2026-07-25 01:09:08,981 [ scc.git] DEBUG create mode 100644 src/main/java/com/glencoesoftware/omero/zarr/ZarrStore.java
2026-07-25 01:09:08,981 [ scc.git] DEBUG delete mode 100644 src/main/java/com/upplication/s3fs/OmeroS3FilesystemProvider.java
2026-07-25 01:09:09,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2026-07-25 01:09:09,199 [ scc.git] DEBUG Calling 'git submodule update'
2026-07-25 01:09:09,294 [ scc.git] DEBUG Get sha1 of %s
2026-07-25 01:09:09,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2026-07-25 01:09:09,303 [ scc.git] DEBUG Calling 'git status --porcelain'
2026-07-25 01:09:09,371 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9948f2dc10> has no local changes
2026-07-25 01:09:09,371 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone
Repository: ome/omero-zarr-pixel-buffer
Already up to date.
Merged PRs:
- PR 16 dominikl 'Zarr v3 support'
Generated by OMERO-zarr-pixel-buffer-push#18 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-zarr-pixel-buffer-push/18/)'
2026-07-25 01:09:09,477 [ scc.git] DEBUG [detached HEAD bacb963] merge master -Dorg -Snone
2026-07-25 01:09:09,479 [ scc.merge] INFO Repository: ome/omero-zarr-pixel-buffer
2026-07-25 01:09:09,479 [ scc.merge] INFO Already up to date.
2026-07-25 01:09:09,479 [ scc.merge] INFO
2026-07-25 01:09:09,479 [ scc.merge] INFO Merged PRs:
2026-07-25 01:09:09,479 [ scc.merge] INFO - PR 16 dominikl 'Zarr v3 support'
2026-07-25 01:09:09,479 [ scc.merge] INFO
2026-07-25 01:09:09,479 [ scc.merge] DEBUG Cleaning remote branches created for merging
2026-07-25 01:09:09,479 [ scc.git] DEBUG Calling 'git remote'
Merge all submodules2026-07-25 01:09:10,577 [ scc.config] DEBUG Found github.token
2026-07-25 01:09:10,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2026-07-25 01:09:10,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2026-07-25 01:09:11,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2026-07-25 01:09:11,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2026-07-25 01:09:11,728 [ scc.gh] DEBUG 4995 remaining from 5000 (Reset at 01:07
2026-07-25 01:09:11,729 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2026-07-25 01:09:11,740 [ scc.git] DEBUG Check current status
2026-07-25 01:09:11,740 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2026-07-25 01:09:11,762 [ scc.git] DEBUG bacb963 merge master -Dorg -Snone
2026-07-25 01:09:11,762 [ scc.git] DEBUG Calling 'git submodule status'
2026-07-25 01:09:11,864 [ scc.config] DEBUG Found remote.origin.url
2026-07-25 01:09:12,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer HTTP/1.1" 200 None
2026-07-25 01:09:13,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2026-07-25 01:09:13,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2026-07-25 01:09:14,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2026-07-25 01:09:14,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2026-07-25 01:09:14,475 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2026-07-25 01:09:14,554 [ scc.git] DEBUG Resetting...
2026-07-25 01:09:14,554 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2026-07-25 01:09:14,649 [ scc.git] DEBUG HEAD is now at bacb963 merge master -Dorg -Snone
2026-07-25 01:09:14,650 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2026-07-25 01:09:14,776 [ scc.git] DEBUG Check current status
2026-07-25 01:09:14,776 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2026-07-25 01:09:14,795 [ scc.git] DEBUG bacb963 merge master -Dorg -Snone
2026-07-25 01:09:14,796 [ scc.git] DEBUG Calling 'git submodule status'
2026-07-25 01:09:14,877 [ scc.merge] INFO Merging Pull Request(s) based on master
2026-07-25 01:09:14,877 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2026-07-25 01:09:14,877 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2026-07-25 01:09:14,877 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2026-07-25 01:09:14,877 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2026-07-25 01:09:14,877 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2026-07-25 01:09:14,877 [ scc.repo] DEBUG ## PRs found:
2026-07-25 01:09:15,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/pulls HTTP/1.1" 200 None
2026-07-25 01:09:15,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/issues/16 HTTP/1.1" 200 None
2026-07-25 01:09:16,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/commits/a9aba3e336972d6e4ebb8d916d5eff71a3e7ed4c?page=1 HTTP/1.1" 200 None
2026-07-25 01:09:17,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/commits/a9aba3e336972d6e4ebb8d916d5eff71a3e7ed4c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2026-07-25 01:09:17,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/commits/a9aba3e336972d6e4ebb8d916d5eff71a3e7ed4c/check-suites?app_id=15368 HTTP/1.1" 200 None
2026-07-25 01:09:18,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/commits/a9aba3e336972d6e4ebb8d916d5eff71a3e7ed4c?page=1 HTTP/1.1" 200 None
2026-07-25 01:09:18,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/statuses/a9aba3e336972d6e4ebb8d916d5eff71a3e7ed4c?per_page=1 HTTP/1.1" 200 2
2026-07-25 01:09:18,575 [ scc.repo] DEBUG - PR 16 dominikl 'Zarr v3 support'
2026-07-25 01:09:18,575 [ scc.repo] DEBUG ## Branches found:
2026-07-25 01:09:18,575 [ scc.git] DEBUG Get sha1 of %s
2026-07-25 01:09:18,575 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2026-07-25 01:09:18,586 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2026-07-25 01:09:18,599 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2026-07-25 01:09:18,599 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2026-07-25 01:09:18,615 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2026-07-25 01:09:18,664 [ scc.git] DEBUG Already up to date.
2026-07-25 01:09:18,665 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2026-07-25 01:09:19,083 [ scc.git] DEBUG From https://github.com/ome/omero-zarr-pixel-buffer
2026-07-25 01:09:19,083 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2026-07-25 01:09:19,109 [ scc.git] DEBUG ## Unique users: []
2026-07-25 01:09:19,109 [ scc.git] DEBUG Get sha1 of %s
2026-07-25 01:09:19,109 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2026-07-25 01:09:19,119 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a9aba3e336972d6e4ebb8d916d5eff71a3e7ed4c'
2026-07-25 01:09:19,155 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2026-07-25 01:09:19,166 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Zarr v3 support) a9aba3e336972d6e4ebb8d916d5eff71a3e7ed4c'
2026-07-25 01:09:19,216 [ scc.git] DEBUG Already up to date.
2026-07-25 01:09:19,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2026-07-25 01:09:19,401 [ scc.git] DEBUG Calling 'git submodule update'
2026-07-25 01:09:19,507 [ scc.git] DEBUG Get sha1 of %s
2026-07-25 01:09:19,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2026-07-25 01:09:19,517 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2026-07-25 01:09:19,611 [ scc.git] DEBUG Calling 'git status --porcelain'
2026-07-25 01:09:19,660 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe4c509b710> has no local changes
2026-07-25 01:09:19,661 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-zarr-pixel-buffer
Already up to date.
Merged PRs:
- PR 16 dominikl 'Zarr v3 support'
Generated by OMERO-zarr-pixel-buffer-push#18 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-zarr-pixel-buffer-push/18/)'
2026-07-25 01:09:19,789 [ scc.git] DEBUG [detached HEAD fae3ff0] merge master -Dorg -Ssuccess-only
2026-07-25 01:09:19,791 [ scc.merge] INFO Repository: ome/omero-zarr-pixel-buffer
2026-07-25 01:09:19,791 [ scc.merge] INFO Already up to date.
2026-07-25 01:09:19,791 [ scc.merge] INFO
2026-07-25 01:09:19,791 [ scc.merge] INFO Merged PRs:
2026-07-25 01:09:19,791 [ scc.merge] INFO - PR 16 dominikl 'Zarr v3 support'
2026-07-25 01:09:19,791 [ scc.merge] INFO
2026-07-25 01:09:19,791 [ scc.merge] DEBUG Cleaning remote branches created for merging
2026-07-25 01:09:19,791 [ scc.git] DEBUG Calling 'git remote'
Update component versions
Commit all component version changes
HEAD detached from 3e9b9da
nothing to commit, working tree clean
2026-07-25 01:09:27,795 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-zarr-pixel-buffer/tree/merge_ci
