Console Output
+ export BASE_REPO=omero-build.git
+ BASE_REPO=omero-build.git
+ export BASE_BRANCH=master
+ BASE_BRANCH=master
+ export VERSION_LOG=/home/omero/workspace/OMERO-build-push/build/version.tsv
+ VERSION_LOG=/home/omero/workspace/OMERO-build-push/build/version.tsv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/OMERO-build-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-build-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
++ '[' -n /bin/bash -o -n '' ']'
++ 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)
2025-01-23 00:51:21,403 [ scc.config] DEBUG Found github.token
2025-01-23 00:51:21,406 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-01-23 00:51:21,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-23 00:51:21,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-23 00:51:22,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2025-01-23 00:51:22,345 [ scc.gh] DEBUG 4485 remaining from 5000 (Reset at 01:01
2025-01-23 00:51:22,346 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-01-23 00:51:22,350 [ scc.git] DEBUG Check current status
2025-01-23 00:51:22,350 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-01-23 00:51:22,353 [ scc.git] DEBUG f57dfbf Merge pull request #217 from ome/dependabot/submodules/omero-server-5b5a782
2025-01-23 00:51:22,353 [ scc.git] DEBUG Calling 'git submodule status'
2025-01-23 00:51:22,392 [ scc.git] DEBUG ffca80b87d019d6f2d06152842c88773dd332e0f omero-blitz (v5.8.0-1-gffca80b8)
2025-01-23 00:51:22,395 [ scc.git] DEBUG cc055967a8ed9cf2ca42c9aba34f18e0a1b128c8 omero-common (v5.7.0-1-gcc05596)
2025-01-23 00:51:22,398 [ scc.git] DEBUG dc3af36501dcce1d51c4069c049dd27f7b26a3ff omero-gateway-java (v5.10.0-1-gdc3af36)
2025-01-23 00:51:22,401 [ scc.git] DEBUG 73bac6e3066d2680534511e6d97dec07e5335cf8 omero-model (v5.7.0-1-g73bac6e)
2025-01-23 00:51:22,404 [ scc.git] DEBUG 05383d47607d6657ed61c5fab099bacd5f5023b7 omero-renderer (v5.6.0-1-g05383d4)
2025-01-23 00:51:22,407 [ scc.git] DEBUG 47a1380f98cd5b6ae157a36422a89530de06c793 omero-romio (v5.8.0-1-g47a1380)
2025-01-23 00:51:22,410 [ scc.git] DEBUG 5b5a78233c34e2ad99316686ad4272f520d7bb1c omero-server (v5.7.0-1-g5b5a7823)
2025-01-23 00:51:22,414 [ scc.config] DEBUG Found remote.origin.url
2025-01-23 00:51:22,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None
2025-01-23 00:51:23,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-01-23 00:51:23,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-01-23 00:51:24,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-01-23 00:51:24,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-01-23 00:51:24,433 [ scc.git] DEBUG Resetting...
2025-01-23 00:51:24,434 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2025-01-23 00:51:24,440 [ scc.git] DEBUG HEAD is now at f57dfbf Merge pull request #217 from ome/dependabot/submodules/omero-server-5b5a782
2025-01-23 00:51:24,440 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2025-01-23 00:51:24,496 [ scc.git] DEBUG Check current status
2025-01-23 00:51:24,497 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-01-23 00:51:24,501 [ scc.git] DEBUG f57dfbf Merge pull request #217 from ome/dependabot/submodules/omero-server-5b5a782
2025-01-23 00:51:24,501 [ scc.git] DEBUG Calling 'git submodule status'
2025-01-23 00:51:24,545 [ scc.git] DEBUG ffca80b87d019d6f2d06152842c88773dd332e0f omero-blitz (v5.8.0-1-gffca80b8)
2025-01-23 00:51:24,549 [ scc.git] DEBUG cc055967a8ed9cf2ca42c9aba34f18e0a1b128c8 omero-common (v5.7.0-1-gcc05596)
2025-01-23 00:51:24,552 [ scc.git] DEBUG dc3af36501dcce1d51c4069c049dd27f7b26a3ff omero-gateway-java (v5.10.0-1-gdc3af36)
2025-01-23 00:51:24,556 [ scc.git] DEBUG 73bac6e3066d2680534511e6d97dec07e5335cf8 omero-model (v5.7.0-1-g73bac6e)
2025-01-23 00:51:24,559 [ scc.git] DEBUG 05383d47607d6657ed61c5fab099bacd5f5023b7 omero-renderer (v5.6.0-1-g05383d4)
2025-01-23 00:51:24,562 [ scc.git] DEBUG 47a1380f98cd5b6ae157a36422a89530de06c793 omero-romio (v5.8.0-1-g47a1380)
2025-01-23 00:51:24,565 [ scc.git] DEBUG 5b5a78233c34e2ad99316686ad4272f520d7bb1c omero-server (v5.7.0-1-g5b5a7823)
2025-01-23 00:51:24,566 [ scc.merge] INFO Merging Pull Request(s) based on master
2025-01-23 00:51:24,566 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2025-01-23 00:51:24,566 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2025-01-23 00:51:24,566 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2025-01-23 00:51:24,566 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2025-01-23 00:51:24,567 [ scc.repo] DEBUG ## PRs found:
2025-01-23 00:51:24,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 2
2025-01-23 00:51:24,846 [ scc.repo] DEBUG ## Branches found:
2025-01-23 00:51:24,846 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:51:24,846 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:51:24,851 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-23 00:51:24,854 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-23 00:51:24,854 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-23 00:51:24,858 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-23 00:51:24,862 [ scc.git] DEBUG Already up to date.
2025-01-23 00:51:24,862 [ scc.git] DEBUG ## Unique users: []
2025-01-23 00:51:24,862 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:51:24,862 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:51:24,866 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-23 00:51:24,908 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:51:24,908 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:51:24,912 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-23 00:51:25,530 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4780706370> has no local changes
2025-01-23 00:51:25,530 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone
Repository: ome/omero-build
Already up to date.
Generated by OMERO-build-push#308 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/308/)'
2025-01-23 00:51:25,565 [ scc.git] DEBUG [detached HEAD a60b5c2] merge master -Dorg -Snone
2025-01-23 00:51:25,565 [ scc.merge] INFO Repository: ome/omero-build
2025-01-23 00:51:25,565 [ scc.merge] INFO Already up to date.
2025-01-23 00:51:25,565 [ scc.merge] INFO
2025-01-23 00:51:25,565 [ scc.merge] INFO
2025-01-23 00:51:25,565 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-01-23 00:51:25,565 [ scc.git] DEBUG Calling 'git remote'
Synchronizing submodule url for 'omero-blitz'
Synchronizing submodule url for 'omero-common'
Synchronizing submodule url for 'omero-gateway-java'
Synchronizing submodule url for 'omero-model'
Synchronizing submodule url for 'omero-renderer'
Synchronizing submodule url for 'omero-romio'
Synchronizing submodule url for 'omero-server'
Merge all submodules2025-01-23 00:51:29,167 [ scc.config] DEBUG Found github.token
2025-01-23 00:51:29,170 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-01-23 00:51:29,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-23 00:51:29,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-23 00:51:30,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2025-01-23 00:51:30,088 [ scc.gh] DEBUG 4477 remaining from 5000 (Reset at 01:01
2025-01-23 00:51:30,089 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-01-23 00:51:30,092 [ scc.git] DEBUG Check current status
2025-01-23 00:51:30,093 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-01-23 00:51:30,097 [ scc.git] DEBUG a60b5c2 merge master -Dorg -Snone
2025-01-23 00:51:30,097 [ scc.git] DEBUG Calling 'git submodule status'
2025-01-23 00:51:30,137 [ scc.git] DEBUG ffca80b87d019d6f2d06152842c88773dd332e0f omero-blitz (v5.8.0-1-gffca80b8)
2025-01-23 00:51:30,141 [ scc.git] DEBUG cc055967a8ed9cf2ca42c9aba34f18e0a1b128c8 omero-common (v5.7.0-1-gcc05596)
2025-01-23 00:51:30,144 [ scc.git] DEBUG dc3af36501dcce1d51c4069c049dd27f7b26a3ff omero-gateway-java (v5.10.0-1-gdc3af36)
2025-01-23 00:51:30,148 [ scc.git] DEBUG 73bac6e3066d2680534511e6d97dec07e5335cf8 omero-model (v5.7.0-1-g73bac6e)
2025-01-23 00:51:30,151 [ scc.git] DEBUG 05383d47607d6657ed61c5fab099bacd5f5023b7 omero-renderer (v5.6.0-1-g05383d4)
2025-01-23 00:51:30,154 [ scc.git] DEBUG 47a1380f98cd5b6ae157a36422a89530de06c793 omero-romio (v5.8.0-1-g47a1380)
2025-01-23 00:51:30,157 [ scc.git] DEBUG 5b5a78233c34e2ad99316686ad4272f520d7bb1c omero-server (v5.7.0-1-g5b5a7823)
2025-01-23 00:51:30,161 [ scc.config] DEBUG Found remote.origin.url
2025-01-23 00:51:30,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None
2025-01-23 00:51:31,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-01-23 00:51:31,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-01-23 00:51:31,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-01-23 00:51:32,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-01-23 00:51:32,269 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-23 00:51:32,318 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz
2025-01-23 00:51:32,318 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-01-23 00:51:32,322 [ scc.git] DEBUG Check current status
2025-01-23 00:51:32,322 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-01-23 00:51:32,335 [ scc.git] DEBUG ffca80b8 Revert snapshot
2025-01-23 00:51:32,336 [ scc.git] DEBUG Calling 'git submodule status'
2025-01-23 00:51:32,379 [ scc.config] DEBUG Found remote.origin.url
2025-01-23 00:51:32,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz HTTP/1.1" 200 None
2025-01-23 00:51:33,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-01-23 00:51:33,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-01-23 00:51:34,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-01-23 00:51:34,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-01-23 00:51:34,414 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-23 00:51:34,456 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2025-01-23 00:51:34,457 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common
2025-01-23 00:51:34,457 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-01-23 00:51:34,461 [ scc.git] DEBUG Check current status
2025-01-23 00:51:34,461 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-01-23 00:51:34,519 [ scc.git] DEBUG cc05596 Revert to snapshot
2025-01-23 00:51:34,519 [ scc.git] DEBUG Calling 'git submodule status'
2025-01-23 00:51:34,564 [ scc.config] DEBUG Found remote.origin.url
2025-01-23 00:51:34,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common HTTP/1.1" 200 None
2025-01-23 00:51:35,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-01-23 00:51:35,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-01-23 00:51:36,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-01-23 00:51:36,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-01-23 00:51:36,516 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-23 00:51:36,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2025-01-23 00:51:36,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java
2025-01-23 00:51:36,558 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-01-23 00:51:36,561 [ scc.git] DEBUG Check current status
2025-01-23 00:51:36,561 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-01-23 00:51:36,617 [ scc.git] DEBUG dc3af36 Revert to snapshot
2025-01-23 00:51:36,617 [ scc.git] DEBUG Calling 'git submodule status'
2025-01-23 00:51:36,659 [ scc.config] DEBUG Found remote.origin.url
2025-01-23 00:51:37,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java HTTP/1.1" 200 None
2025-01-23 00:51:37,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-01-23 00:51:37,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-01-23 00:51:38,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-01-23 00:51:38,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-01-23 00:51:38,707 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-23 00:51:38,747 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2025-01-23 00:51:38,748 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model
2025-01-23 00:51:38,748 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-01-23 00:51:38,752 [ scc.git] DEBUG Check current status
2025-01-23 00:51:38,752 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-01-23 00:51:38,805 [ scc.git] DEBUG 73bac6e Revert to snapshot
2025-01-23 00:51:38,805 [ scc.git] DEBUG Calling 'git submodule status'
2025-01-23 00:51:38,849 [ scc.config] DEBUG Found remote.origin.url
2025-01-23 00:51:39,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model HTTP/1.1" 200 None
2025-01-23 00:51:39,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-01-23 00:51:40,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-01-23 00:51:40,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-01-23 00:51:40,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-01-23 00:51:40,980 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-23 00:51:41,020 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2025-01-23 00:51:41,021 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer
2025-01-23 00:51:41,021 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-01-23 00:51:41,025 [ scc.git] DEBUG Check current status
2025-01-23 00:51:41,025 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-01-23 00:51:41,062 [ scc.git] DEBUG 05383d4 Revert to snapshot
2025-01-23 00:51:41,063 [ scc.git] DEBUG Calling 'git submodule status'
2025-01-23 00:51:41,107 [ scc.config] DEBUG Found remote.origin.url
2025-01-23 00:51:41,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer HTTP/1.1" 200 None
2025-01-23 00:51:41,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-01-23 00:51:42,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-01-23 00:51:42,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-01-23 00:51:43,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-01-23 00:51:43,086 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-23 00:51:43,126 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2025-01-23 00:51:43,128 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio
2025-01-23 00:51:43,128 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-01-23 00:51:43,132 [ scc.git] DEBUG Check current status
2025-01-23 00:51:43,133 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-01-23 00:51:43,137 [ scc.git] DEBUG 47a1380 Revert to snapshot
2025-01-23 00:51:43,137 [ scc.git] DEBUG Calling 'git submodule status'
2025-01-23 00:51:43,180 [ scc.config] DEBUG Found remote.origin.url
2025-01-23 00:51:43,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio HTTP/1.1" 200 None
2025-01-23 00:51:43,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-01-23 00:51:44,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-01-23 00:51:44,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-01-23 00:51:45,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-01-23 00:51:45,205 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-23 00:51:45,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2025-01-23 00:51:45,246 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server
2025-01-23 00:51:45,247 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-01-23 00:51:45,251 [ scc.git] DEBUG Check current status
2025-01-23 00:51:45,251 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-01-23 00:51:45,268 [ scc.git] DEBUG 5b5a7823 Revert to snapshot
2025-01-23 00:51:45,268 [ scc.git] DEBUG Calling 'git submodule status'
2025-01-23 00:51:45,313 [ scc.config] DEBUG Found remote.origin.url
2025-01-23 00:51:45,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server HTTP/1.1" 200 None
2025-01-23 00:51:46,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-01-23 00:51:46,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-01-23 00:51:46,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-01-23 00:51:47,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-01-23 00:51:47,378 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-23 00:51:47,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2025-01-23 00:51:47,421 [ scc.git] DEBUG Resetting...
2025-01-23 00:51:47,421 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2025-01-23 00:51:47,427 [ scc.git] DEBUG HEAD is now at a60b5c2 merge master -Dorg -Snone
2025-01-23 00:51:47,428 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2025-01-23 00:51:47,487 [ scc.git] DEBUG Check current status
2025-01-23 00:51:47,487 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-01-23 00:51:47,491 [ scc.git] DEBUG a60b5c2 merge master -Dorg -Snone
2025-01-23 00:51:47,491 [ scc.git] DEBUG Calling 'git submodule status'
2025-01-23 00:51:47,534 [ scc.git] DEBUG ffca80b87d019d6f2d06152842c88773dd332e0f omero-blitz (v5.8.0-1-gffca80b8)
2025-01-23 00:51:47,537 [ scc.git] DEBUG cc055967a8ed9cf2ca42c9aba34f18e0a1b128c8 omero-common (v5.7.0-1-gcc05596)
2025-01-23 00:51:47,540 [ scc.git] DEBUG dc3af36501dcce1d51c4069c049dd27f7b26a3ff omero-gateway-java (v5.10.0-1-gdc3af36)
2025-01-23 00:51:47,543 [ scc.git] DEBUG 73bac6e3066d2680534511e6d97dec07e5335cf8 omero-model (v5.7.0-1-g73bac6e)
2025-01-23 00:51:47,547 [ scc.git] DEBUG 05383d47607d6657ed61c5fab099bacd5f5023b7 omero-renderer (v5.6.0-1-g05383d4)
2025-01-23 00:51:47,550 [ scc.git] DEBUG 47a1380f98cd5b6ae157a36422a89530de06c793 omero-romio (v5.8.0-1-g47a1380)
2025-01-23 00:51:47,553 [ scc.git] DEBUG 5b5a78233c34e2ad99316686ad4272f520d7bb1c omero-server (v5.7.0-1-g5b5a7823)
2025-01-23 00:51:47,554 [ scc.merge] INFO Merging Pull Request(s) based on master
2025-01-23 00:51:47,554 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2025-01-23 00:51:47,554 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2025-01-23 00:51:47,554 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2025-01-23 00:51:47,554 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2025-01-23 00:51:47,554 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2025-01-23 00:51:47,554 [ scc.repo] DEBUG ## PRs found:
2025-01-23 00:51:47,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 2
2025-01-23 00:51:47,779 [ scc.repo] DEBUG ## Branches found:
2025-01-23 00:51:47,779 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:51:47,780 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:51:47,784 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-23 00:51:47,788 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-23 00:51:47,788 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-23 00:51:47,793 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-23 00:51:47,797 [ scc.git] DEBUG Already up to date.
2025-01-23 00:51:47,797 [ scc.git] DEBUG ## Unique users: []
2025-01-23 00:51:47,797 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:51:47,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:51:47,801 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-23 00:51:47,843 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:51:47,844 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:51:47,849 [ scc.repo] DEBUG ## PRs found:
2025-01-23 00:51:48,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/pulls HTTP/1.1" 200 None
2025-01-23 00:51:48,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132 HTTP/1.1" 200 None
2025-01-23 00:51:49,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132/comments HTTP/1.1" 200 None
2025-01-23 00:51:49,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None
2025-01-23 00:51:50,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-23 00:51:50,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-23 00:51:51,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None
2025-01-23 00:51:51,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/statuses/6d887b53b85d244eed855703effd0e470c83bab9?per_page=1 HTTP/1.1" 200 2
2025-01-23 00:51:51,691 [ scc.repo] DEBUG - PR 132 jburel 'Fix javadoc warning'
2025-01-23 00:51:52,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119 HTTP/1.1" 200 None
2025-01-23 00:51:52,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119/comments HTTP/1.1" 200 None
2025-01-23 00:51:53,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None
2025-01-23 00:51:53,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-23 00:51:53,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None
2025-01-23 00:51:54,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/statuses/4ef8809efaee231eb83e45e64a852a9808bc4723?per_page=1 HTTP/1.1" 200 2
2025-01-23 00:51:54,376 [ scc.repo] DEBUG - PR 119 dominikl 'Take Ice and omero sysenv variables into account'
2025-01-23 00:51:54,376 [ scc.repo] DEBUG ## Branches found:
2025-01-23 00:51:54,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz
2025-01-23 00:51:54,377 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:51:54,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:51:54,382 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-23 00:51:54,386 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-23 00:51:54,386 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-23 00:51:54,390 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-23 00:51:54,395 [ scc.git] DEBUG Already up to date.
2025-01-23 00:51:54,395 [ scc.git] DEBUG Calling 'git fetch origin pull/119/head'
2025-01-23 00:51:54,984 [ scc.git] DEBUG From https://github.com/ome/omero-blitz
2025-01-23 00:51:54,984 [ scc.git] DEBUG * branch refs/pull/119/head -> FETCH_HEAD
2025-01-23 00:51:54,989 [ scc.git] DEBUG Calling 'git fetch origin pull/132/head'
2025-01-23 00:51:55,560 [ scc.git] DEBUG From https://github.com/ome/omero-blitz
2025-01-23 00:51:55,561 [ scc.git] DEBUG * branch refs/pull/132/head -> FETCH_HEAD
2025-01-23 00:51:55,565 [ scc.git] DEBUG ## Unique users: []
2025-01-23 00:51:55,566 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:51:55,566 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:51:55,570 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4ef8809efaee231eb83e45e64a852a9808bc4723'
2025-01-23 00:51:55,576 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:51:55,580 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 119 (Take Ice and omero sysenv variables into account) 4ef8809efaee231eb83e45e64a852a9808bc4723'
2025-01-23 00:51:55,594 [ scc.git] DEBUG Auto-merging src/main/java/omero/client.java
2025-01-23 00:51:55,596 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-23 00:51:55,599 [ scc.git] DEBUG src/main/java/omero/client.java | 6 ++++++
2025-01-23 00:51:55,599 [ scc.git] DEBUG 1 file changed, 6 insertions(+)
2025-01-23 00:51:55,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-23 00:51:55,758 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6d887b53b85d244eed855703effd0e470c83bab9'
2025-01-23 00:51:55,766 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:51:55,771 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 132 (Fix javadoc warning) 6d887b53b85d244eed855703effd0e470c83bab9'
2025-01-23 00:51:55,786 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-23 00:51:55,789 [ scc.git] DEBUG src/main/slice/omero/api/ThumbnailStore.ice | 2 +-
2025-01-23 00:51:55,789 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-01-23 00:51:56,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-23 00:51:56,148 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-23 00:51:56,191 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:51:56,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:51:56,197 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-23 00:51:56,241 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-23 00:51:56,251 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f03169e9ee0> has no local changes
2025-01-23 00:51:56,252 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-blitz
Already up to date.
Merged PRs:
- PR 119 dominikl 'Take Ice and omero sysenv variables into account'
- PR 132 jburel 'Fix javadoc warning'
Generated by OMERO-build-push#308 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/308/)'
2025-01-23 00:51:56,262 [ scc.git] DEBUG [detached HEAD a804927e] merge master -Dorg -Ssuccess-only
2025-01-23 00:51:56,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2025-01-23 00:51:56,263 [ scc.repo] DEBUG ## PRs found:
2025-01-23 00:51:56,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/pulls HTTP/1.1" 200 None
2025-01-23 00:51:57,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/45 HTTP/1.1" 200 None
2025-01-23 00:51:57,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/45/comments HTTP/1.1" 200 None
2025-01-23 00:51:58,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42 HTTP/1.1" 200 None
2025-01-23 00:51:58,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42/comments HTTP/1.1" 200 None
2025-01-23 00:51:59,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None
2025-01-23 00:51:59,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-23 00:52:00,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None
2025-01-23 00:52:00,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/statuses/92e4d3ee9bd655e531156415863a1defa7d0ab39?per_page=1 HTTP/1.1" 200 2
2025-01-23 00:52:00,483 [ scc.repo] DEBUG - PR 42 jburel 'include all'
2025-01-23 00:52:00,483 [ scc.repo] DEBUG ## Branches found:
2025-01-23 00:52:00,483 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common
2025-01-23 00:52:00,483 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:52:00,483 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:52:00,489 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-23 00:52:00,493 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-23 00:52:00,494 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-23 00:52:00,499 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-23 00:52:00,504 [ scc.git] DEBUG Already up to date.
2025-01-23 00:52:00,505 [ scc.git] DEBUG Calling 'git fetch origin pull/42/head'
2025-01-23 00:52:00,999 [ scc.git] DEBUG From https://github.com/ome/omero-common
2025-01-23 00:52:00,999 [ scc.git] DEBUG * branch refs/pull/42/head -> FETCH_HEAD
2025-01-23 00:52:01,004 [ scc.git] DEBUG ## Unique users: []
2025-01-23 00:52:01,004 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:52:01,005 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:52:01,009 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...92e4d3ee9bd655e531156415863a1defa7d0ab39'
2025-01-23 00:52:01,014 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:52:01,018 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 42 (include all) 92e4d3ee9bd655e531156415863a1defa7d0ab39'
2025-01-23 00:52:01,031 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-23 00:52:01,034 [ scc.git] DEBUG publish.gradle | 17 +----------------
2025-01-23 00:52:01,034 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 16 deletions(-)
2025-01-23 00:52:01,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-23 00:52:01,186 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-23 00:52:01,227 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:52:01,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:52:01,232 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-23 00:52:01,273 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-23 00:52:01,280 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f03169ecf40> has no local changes
2025-01-23 00:52:01,280 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-common
Excluded PRs:
- PR 45 ehrenfeu 'Do not hide "Make Movie" from script menu' (user: ehrenfeu)
- PR 40 jburel 'set classifier' (exclude comment)
- PR 29 dominikl 'Add method to get pixel min max' (exclude comment)
Already up to date.
Merged PRs:
- PR 42 jburel 'include all'
Generated by OMERO-build-push#308 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/308/)'
2025-01-23 00:52:01,289 [ scc.git] DEBUG [detached HEAD 55bf4a1] merge master -Dorg -Ssuccess-only
2025-01-23 00:52:01,289 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2025-01-23 00:52:01,289 [ scc.repo] DEBUG ## PRs found:
2025-01-23 00:52:01,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/pulls HTTP/1.1" 200 None
2025-01-23 00:52:02,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/93 HTTP/1.1" 200 None
2025-01-23 00:52:02,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/3f1e5fd7a279d0793ceccb8c1f3a0d6bac666126 HTTP/1.1" 200 None
2025-01-23 00:52:03,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/3f1e5fd7a279d0793ceccb8c1f3a0d6bac666126/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-23 00:52:03,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/3f1e5fd7a279d0793ceccb8c1f3a0d6bac666126/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-01-23 00:52:04,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/3f1e5fd7a279d0793ceccb8c1f3a0d6bac666126 HTTP/1.1" 200 None
2025-01-23 00:52:04,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/statuses/3f1e5fd7a279d0793ceccb8c1f3a0d6bac666126?per_page=1 HTTP/1.1" 200 2
2025-01-23 00:52:04,949 [ scc.repo] DEBUG - PR 93 dominikl 'Renderfacility'
2025-01-23 00:52:05,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30 HTTP/1.1" 200 None
2025-01-23 00:52:05,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30/comments HTTP/1.1" 200 None
2025-01-23 00:52:05,887 [ scc.repo] DEBUG ## Branches found:
2025-01-23 00:52:05,887 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java
2025-01-23 00:52:05,887 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:52:05,887 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:52:05,892 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-23 00:52:05,896 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-23 00:52:05,896 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-23 00:52:05,901 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-23 00:52:05,905 [ scc.git] DEBUG Already up to date.
2025-01-23 00:52:05,905 [ scc.git] DEBUG Calling 'git fetch origin pull/93/head'
2025-01-23 00:52:06,955 [ scc.git] DEBUG From https://github.com/ome/omero-gateway-java
2025-01-23 00:52:06,955 [ scc.git] DEBUG * branch refs/pull/93/head -> FETCH_HEAD
2025-01-23 00:52:06,961 [ scc.git] DEBUG ## Unique users: []
2025-01-23 00:52:06,962 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:52:06,962 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:52:06,967 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3f1e5fd7a279d0793ceccb8c1f3a0d6bac666126'
2025-01-23 00:52:06,973 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:52:06,978 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 93 (Renderfacility) 3f1e5fd7a279d0793ceccb8c1f3a0d6bac666126'
2025-01-23 00:52:07,031 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-23 00:52:07,035 [ scc.git] DEBUG src/main/java/omero/gateway/Gateway.java | 9 +-
2025-01-23 00:52:07,035 [ scc.git] DEBUG src/main/java/omero/gateway/facility/Facility.java | 8 +-
2025-01-23 00:52:07,035 [ scc.git] DEBUG .../omero/gateway/facility/RenderFacility.java | 236 +++++++++++++++++++++
2025-01-23 00:52:07,035 [ scc.git] DEBUG 3 files changed, 249 insertions(+), 4 deletions(-)
2025-01-23 00:52:07,035 [ scc.git] DEBUG create mode 100644 src/main/java/omero/gateway/facility/RenderFacility.java
2025-01-23 00:52:07,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-23 00:52:07,168 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-23 00:52:07,209 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:52:07,209 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:52:07,214 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-23 00:52:07,253 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-23 00:52:07,259 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0315995dc0> has no local changes
2025-01-23 00:52:07,259 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-gateway-java
Excluded PRs:
- PR 30 jburel 'Import image' (exclude comment)
Already up to date.
Merged PRs:
- PR 93 dominikl 'Renderfacility'
Generated by OMERO-build-push#308 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/308/)'
2025-01-23 00:52:07,268 [ scc.git] DEBUG [detached HEAD 13859e1] merge master -Dorg -Ssuccess-only
2025-01-23 00:52:07,269 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2025-01-23 00:52:07,269 [ scc.repo] DEBUG ## PRs found:
2025-01-23 00:52:07,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/pulls HTTP/1.1" 200 2
2025-01-23 00:52:07,590 [ scc.repo] DEBUG ## Branches found:
2025-01-23 00:52:07,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model
2025-01-23 00:52:07,590 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:52:07,590 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:52:07,595 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-23 00:52:07,599 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-23 00:52:07,599 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-23 00:52:07,603 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-23 00:52:07,607 [ scc.git] DEBUG Already up to date.
2025-01-23 00:52:07,607 [ scc.git] DEBUG ## Unique users: []
2025-01-23 00:52:07,607 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:52:07,607 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:52:07,611 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-23 00:52:07,652 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:52:07,653 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:52:07,657 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-23 00:52:07,696 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-23 00:52:07,703 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f031599bdf0> has no local changes
2025-01-23 00:52:07,704 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-model
Already up to date.
Generated by OMERO-build-push#308 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/308/)'
2025-01-23 00:52:07,712 [ scc.git] DEBUG [detached HEAD 845c6a7] merge master -Dorg -Ssuccess-only
2025-01-23 00:52:07,713 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2025-01-23 00:52:07,713 [ scc.repo] DEBUG ## PRs found:
2025-01-23 00:52:08,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/pulls HTTP/1.1" 200 None
2025-01-23 00:52:08,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10 HTTP/1.1" 200 None
2025-01-23 00:52:09,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10/comments HTTP/1.1" 200 None
2025-01-23 00:52:09,015 [ scc.repo] DEBUG # ... Exclude label: exclude
2025-01-23 00:52:09,015 [ scc.repo] DEBUG ## Branches found:
2025-01-23 00:52:09,015 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer
2025-01-23 00:52:09,015 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:52:09,015 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:52:09,020 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-23 00:52:09,023 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-23 00:52:09,024 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-23 00:52:09,028 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-23 00:52:09,033 [ scc.git] DEBUG Already up to date.
2025-01-23 00:52:09,033 [ scc.git] DEBUG ## Unique users: []
2025-01-23 00:52:09,033 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:52:09,033 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:52:09,037 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-23 00:52:09,077 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:52:09,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:52:09,082 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-23 00:52:09,123 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-23 00:52:09,130 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f03159b92e0> has no local changes
2025-01-23 00:52:09,130 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-renderer
Excluded PRs:
- PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude)
Already up to date.
Generated by OMERO-build-push#308 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/308/)'
2025-01-23 00:52:09,137 [ scc.git] DEBUG [detached HEAD 80f8f30] merge master -Dorg -Ssuccess-only
2025-01-23 00:52:09,138 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2025-01-23 00:52:09,138 [ scc.repo] DEBUG ## PRs found:
2025-01-23 00:52:09,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/pulls HTTP/1.1" 200 None
2025-01-23 00:52:09,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14 HTTP/1.1" 200 None
2025-01-23 00:52:10,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14/comments HTTP/1.1" 200 None
2025-01-23 00:52:10,481 [ scc.repo] DEBUG ## Branches found:
2025-01-23 00:52:10,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio
2025-01-23 00:52:10,481 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:52:10,481 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:52:10,486 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-23 00:52:10,489 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-23 00:52:10,490 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-23 00:52:10,494 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-23 00:52:10,499 [ scc.git] DEBUG Already up to date.
2025-01-23 00:52:10,499 [ scc.git] DEBUG ## Unique users: []
2025-01-23 00:52:10,500 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:52:10,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:52:10,504 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-23 00:52:10,543 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:52:10,543 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:52:10,548 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-23 00:52:10,585 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-23 00:52:10,591 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f03149607c0> has no local changes
2025-01-23 00:52:10,591 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-romio
Excluded PRs:
- PR 14 chris-allan 'Bye bye commons-io' (exclude comment)
Already up to date.
Generated by OMERO-build-push#308 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/308/)'
2025-01-23 00:52:10,598 [ scc.git] DEBUG [detached HEAD 466dfd1] merge master -Dorg -Ssuccess-only
2025-01-23 00:52:10,598 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2025-01-23 00:52:10,598 [ scc.repo] DEBUG ## PRs found:
2025-01-23 00:52:11,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/pulls HTTP/1.1" 200 None
2025-01-23 00:52:11,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166 HTTP/1.1" 200 None
2025-01-23 00:52:12,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166/comments HTTP/1.1" 200 None
2025-01-23 00:52:12,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152 HTTP/1.1" 200 None
2025-01-23 00:52:12,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152/comments HTTP/1.1" 200 None
2025-01-23 00:52:13,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None
2025-01-23 00:52:13,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-23 00:52:14,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None
2025-01-23 00:52:14,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/statuses/3e65b9de901fc160c380da602def943206fe9b1d?per_page=1 HTTP/1.1" 200 2
2025-01-23 00:52:14,843 [ scc.repo] DEBUG - PR 152 jburel 'Set class in doc'
2025-01-23 00:52:15,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61 HTTP/1.1" 200 None
2025-01-23 00:52:15,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61/comments HTTP/1.1" 200 None
2025-01-23 00:52:16,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None
2025-01-23 00:52:16,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-01-23 00:52:17,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None
2025-01-23 00:52:17,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/statuses/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf?per_page=1 HTTP/1.1" 200 2
2025-01-23 00:52:17,449 [ scc.repo] DEBUG - PR 61 joshmoore 'Pass user executor to rendering tasks'
2025-01-23 00:52:17,449 [ scc.repo] DEBUG ## Branches found:
2025-01-23 00:52:17,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server
2025-01-23 00:52:17,450 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:52:17,450 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:52:17,454 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-01-23 00:52:17,458 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-01-23 00:52:17,458 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-01-23 00:52:17,462 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-01-23 00:52:17,467 [ scc.git] DEBUG Already up to date.
2025-01-23 00:52:17,468 [ scc.git] DEBUG Calling 'git fetch origin pull/61/head'
2025-01-23 00:52:17,905 [ scc.git] DEBUG From https://github.com/ome/omero-server
2025-01-23 00:52:17,905 [ scc.git] DEBUG * branch refs/pull/61/head -> FETCH_HEAD
2025-01-23 00:52:17,910 [ scc.git] DEBUG Calling 'git fetch origin pull/152/head'
2025-01-23 00:52:18,228 [ scc.git] DEBUG From https://github.com/ome/omero-server
2025-01-23 00:52:18,228 [ scc.git] DEBUG * branch refs/pull/152/head -> FETCH_HEAD
2025-01-23 00:52:18,232 [ scc.git] DEBUG ## Unique users: []
2025-01-23 00:52:18,232 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:52:18,233 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:52:18,237 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf'
2025-01-23 00:52:18,244 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:52:18,248 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 61 (Pass user executor to rendering tasks) 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf'
2025-01-23 00:52:18,819 [ scc.git] DEBUG CONFLICT (modify/delete): .travis.yml deleted in HEAD and modified in 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf. Version 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf of .travis.yml left in tree.
2025-01-23 00:52:18,819 [ scc.git] DEBUG Auto-merging build.gradle
2025-01-23 00:52:18,819 [ scc.git] DEBUG CONFLICT (content): Merge conflict in build.gradle
2025-01-23 00:52:18,820 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-01-23 00:52:18,820 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-01-23 00:52:18,827 [ scc.git] DEBUG Calling 'git reset --hard 5b5a78233c34e2ad99316686ad4272f520d7bb1c'
2025-01-23 00:52:18,835 [ scc.git] DEBUG HEAD is now at 5b5a7823 Revert to snapshot
2025-01-23 00:52:18,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-23 00:52:18,980 [ scc.git] DEBUG Calling 'git merge-base 5b5a78233c34e2ad99316686ad4272f520d7bb1c 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf'
2025-01-23 00:52:18,987 [ scc.git] DEBUG Calling 'git diff --name-only dee098f9c5138f2e746928fb31973abfe33d1718..5b5a78233c34e2ad99316686ad4272f520d7bb1c'
2025-01-23 00:52:18,992 [ scc.git] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks'
Conflicting PR. Removed from build [OMERO-build-push#308](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/308/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/308/consoleText) for more details.
Possible conflicts:
- Upstream changes
- build.gradle
- .travis.yml
--conflicts
2025-01-23 00:52:18,995 [ scc.config] DEBUG Found github.token
2025-01-23 00:52:18,995 [ scc.git] DEBUG Not adding comment to issue #61, already --conflicts.
2025-01-23 00:52:18,995 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e65b9de901fc160c380da602def943206fe9b1d'
2025-01-23 00:52:19,002 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:52:19,006 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 152 (Set class in doc) 3e65b9de901fc160c380da602def943206fe9b1d'
2025-01-23 00:52:19,021 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-01-23 00:52:19,024 [ scc.git] DEBUG src/main/java/ome/api/local/LocalSession.java | 2 +-
2025-01-23 00:52:19,024 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-01-23 00:52:19,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-23 00:52:19,358 [ scc.git] DEBUG Calling 'git submodule update'
2025-01-23 00:52:19,395 [ scc.git] DEBUG Get sha1 of %s
2025-01-23 00:52:19,395 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-01-23 00:52:19,400 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-23 00:52:19,440 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-23 00:52:19,449 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f031498ae80> has no local changes
2025-01-23 00:52:19,450 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-server
Excluded PRs:
- PR 166 kkoz 'Experimenter group cache' (stage: draft)
- PR 116 dominikl 'Add method to get pixel min max' (exclude comment)
Already up to date.
Merged PRs:
- PR 152 jburel 'Set class in doc'
Conflicting PRs (not included):
- PR 61 joshmoore 'Pass user executor to rendering tasks'
Generated by OMERO-build-push#308 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/308/)'
2025-01-23 00:52:19,461 [ scc.git] DEBUG [detached HEAD a417349a] merge master -Dorg -Ssuccess-only
2025-01-23 00:52:19,461 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2025-01-23 00:52:19,461 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-01-23 00:52:19,513 [ scc.config] DEBUG Found submodule.omero-blitz.url
2025-01-23 00:52:19,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-23 00:52:19,745 [ scc.config] DEBUG Found submodule.omero-blitz.branch
2025-01-23 00:52:19,749 [ scc.config] DEBUG Found submodule.omero-common.url
2025-01-23 00:52:20,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-23 00:52:20,122 [ scc.config] DEBUG Found submodule.omero-common.branch
2025-01-23 00:52:20,126 [ scc.config] DEBUG Found submodule.omero-gateway-java.url
2025-01-23 00:52:20,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-23 00:52:20,508 [ scc.config] DEBUG Found submodule.omero-gateway-java.branch
2025-01-23 00:52:20,512 [ scc.config] DEBUG Found submodule.omero-model.url
2025-01-23 00:52:20,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-23 00:52:20,904 [ scc.config] DEBUG Found submodule.omero-model.branch
2025-01-23 00:52:20,907 [ scc.config] DEBUG Found submodule.omero-renderer.url
2025-01-23 00:52:21,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-23 00:52:21,281 [ scc.config] DEBUG Found submodule.omero-renderer.branch
2025-01-23 00:52:21,285 [ scc.config] DEBUG Found submodule.omero-romio.url
2025-01-23 00:52:21,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-23 00:52:21,660 [ scc.config] DEBUG Found submodule.omero-romio.branch
2025-01-23 00:52:21,664 [ scc.config] DEBUG Found submodule.omero-server.url
2025-01-23 00:52:22,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-01-23 00:52:22,049 [ scc.config] DEBUG Found submodule.omero-server.branch
2025-01-23 00:52:22,049 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-01-23 00:52:22,084 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0316a77370> has local changes
2025-01-23 00:52:22,084 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-build
Already up to date.
Repository: ome/omero-blitz
Already up to date.
Merged PRs:
- PR 119 dominikl 'Take Ice and omero sysenv variables into account'
- PR 132 jburel 'Fix javadoc warning'
Repository: ome/omero-common
Excluded PRs:
- PR 45 ehrenfeu 'Do not hide "Make Movie" from script menu' (user: ehrenfeu)
- PR 40 jburel 'set classifier' (exclude comment)
- PR 29 dominikl 'Add method to get pixel min max' (exclude comment)
Already up to date.
Merged PRs:
- PR 42 jburel 'include all'
Repository: ome/omero-gateway-java
Excluded PRs:
- PR 30 jburel 'Import image' (exclude comment)
Already up to date.
Merged PRs:
- PR 93 dominikl 'Renderfacility'
Repository: ome/omero-model
Already up to date.
Repository: ome/omero-renderer
Excluded PRs:
- PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude)
Already up to date.
Repository: ome/omero-romio
Excluded PRs:
- PR 14 chris-allan 'Bye bye commons-io' (exclude comment)
Already up to date.
Repository: ome/omero-server
Excluded PRs:
- PR 166 kkoz 'Experimenter group cache' (stage: draft)
- PR 116 dominikl 'Add method to get pixel min max' (exclude comment)
Already up to date.
Merged PRs:
- PR 152 jburel 'Set class in doc'
Conflicting PRs (not included):
- PR 61 joshmoore 'Pass user executor to rendering tasks'
Generated by OMERO-build-push#308 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/308/)'
2025-01-23 00:52:22,093 [ scc.git] DEBUG [detached HEAD ff8ff9b] merge master -Dorg -Ssuccess-only
2025-01-23 00:52:22,094 [ scc.merge] INFO Repository: ome/omero-build
2025-01-23 00:52:22,094 [ scc.git] DEBUG 8 files changed, 14 insertions(+), 14 deletions(-)
2025-01-23 00:52:22,094 [ scc.merge] INFO Already up to date.
2025-01-23 00:52:22,094 [ scc.merge] INFO
2025-01-23 00:52:22,094 [ scc.merge] INFO
2025-01-23 00:52:22,094 [ scc.merge] INFO Repository: ome/omero-blitz
2025-01-23 00:52:22,094 [ scc.merge] INFO Already up to date.
2025-01-23 00:52:22,094 [ scc.merge] INFO
2025-01-23 00:52:22,094 [ scc.merge] INFO Merged PRs:
2025-01-23 00:52:22,094 [ scc.merge] INFO - PR 119 dominikl 'Take Ice and omero sysenv variables into account'
2025-01-23 00:52:22,094 [ scc.merge] INFO - PR 132 jburel 'Fix javadoc warning'
2025-01-23 00:52:22,094 [ scc.merge] INFO
2025-01-23 00:52:22,094 [ scc.merge] INFO Repository: ome/omero-common
2025-01-23 00:52:22,094 [ scc.merge] INFO Excluded PRs:
2025-01-23 00:52:22,094 [ scc.merge] INFO - PR 45 ehrenfeu 'Do not hide "Make Movie" from script menu' (user: ehrenfeu)
2025-01-23 00:52:22,094 [ scc.merge] INFO - PR 40 jburel 'set classifier' (exclude comment)
2025-01-23 00:52:22,094 [ scc.merge] INFO - PR 29 dominikl 'Add method to get pixel min max' (exclude comment)
2025-01-23 00:52:22,094 [ scc.merge] INFO Already up to date.
2025-01-23 00:52:22,094 [ scc.merge] INFO
2025-01-23 00:52:22,094 [ scc.merge] INFO Merged PRs:
2025-01-23 00:52:22,094 [ scc.merge] INFO - PR 42 jburel 'include all'
2025-01-23 00:52:22,094 [ scc.merge] INFO
2025-01-23 00:52:22,094 [ scc.merge] INFO Repository: ome/omero-gateway-java
2025-01-23 00:52:22,094 [ scc.merge] INFO Excluded PRs:
2025-01-23 00:52:22,094 [ scc.merge] INFO - PR 30 jburel 'Import image' (exclude comment)
2025-01-23 00:52:22,094 [ scc.merge] INFO Already up to date.
2025-01-23 00:52:22,095 [ scc.merge] INFO
2025-01-23 00:52:22,095 [ scc.merge] INFO Merged PRs:
2025-01-23 00:52:22,095 [ scc.merge] INFO - PR 93 dominikl 'Renderfacility'
2025-01-23 00:52:22,095 [ scc.merge] INFO
2025-01-23 00:52:22,095 [ scc.merge] INFO Repository: ome/omero-model
2025-01-23 00:52:22,095 [ scc.merge] INFO Already up to date.
2025-01-23 00:52:22,095 [ scc.merge] INFO
2025-01-23 00:52:22,095 [ scc.merge] INFO
2025-01-23 00:52:22,095 [ scc.merge] INFO Repository: ome/omero-renderer
2025-01-23 00:52:22,095 [ scc.merge] INFO Excluded PRs:
2025-01-23 00:52:22,095 [ scc.merge] INFO - PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude)
2025-01-23 00:52:22,095 [ scc.merge] INFO Already up to date.
2025-01-23 00:52:22,095 [ scc.merge] INFO
2025-01-23 00:52:22,095 [ scc.merge] INFO
2025-01-23 00:52:22,095 [ scc.merge] INFO Repository: ome/omero-romio
2025-01-23 00:52:22,095 [ scc.merge] INFO Excluded PRs:
2025-01-23 00:52:22,095 [ scc.merge] INFO - PR 14 chris-allan 'Bye bye commons-io' (exclude comment)
2025-01-23 00:52:22,095 [ scc.merge] INFO Already up to date.
2025-01-23 00:52:22,095 [ scc.merge] INFO
2025-01-23 00:52:22,095 [ scc.merge] INFO
2025-01-23 00:52:22,095 [ scc.merge] INFO Repository: ome/omero-server
2025-01-23 00:52:22,095 [ scc.merge] INFO Excluded PRs:
2025-01-23 00:52:22,096 [ scc.merge] INFO - PR 166 kkoz 'Experimenter group cache' (stage: draft)
2025-01-23 00:52:22,096 [ scc.merge] INFO - PR 116 dominikl 'Add method to get pixel min max' (exclude comment)
2025-01-23 00:52:22,096 [ scc.merge] INFO Already up to date.
2025-01-23 00:52:22,096 [ scc.merge] INFO
2025-01-23 00:52:22,096 [ scc.merge] INFO Merged PRs:
2025-01-23 00:52:22,096 [ scc.merge] INFO - PR 152 jburel 'Set class in doc'
2025-01-23 00:52:22,096 [ scc.merge] INFO
2025-01-23 00:52:22,096 [ scc.merge] INFO Conflicting PRs (not included):
2025-01-23 00:52:22,096 [ scc.merge] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks'
2025-01-23 00:52:22,096 [ scc.merge] INFO
2025-01-23 00:52:22,096 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-01-23 00:52:22,096 [ scc.git] DEBUG Calling 'git remote'
2025-01-23 00:52:22,100 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz
2025-01-23 00:52:22,100 [ scc.git] DEBUG Calling 'git remote'
2025-01-23 00:52:22,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2025-01-23 00:52:22,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common
2025-01-23 00:52:22,104 [ scc.git] DEBUG Calling 'git remote'
2025-01-23 00:52:22,107 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2025-01-23 00:52:22,107 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java
2025-01-23 00:52:22,107 [ scc.git] DEBUG Calling 'git remote'
2025-01-23 00:52:22,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2025-01-23 00:52:22,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model
2025-01-23 00:52:22,111 [ scc.git] DEBUG Calling 'git remote'
2025-01-23 00:52:22,114 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2025-01-23 00:52:22,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer
2025-01-23 00:52:22,115 [ scc.git] DEBUG Calling 'git remote'
2025-01-23 00:52:22,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2025-01-23 00:52:22,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio
2025-01-23 00:52:22,118 [ scc.git] DEBUG Calling 'git remote'
2025-01-23 00:52:22,122 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2025-01-23 00:52:22,122 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server
2025-01-23 00:52:22,122 [ scc.git] DEBUG Calling 'git remote'
2025-01-23 00:52:22,126 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
Update component versions
Updating omero-common-test from 5.7.0 to 5.7.1-SNAPSHOT
Updating omero-server from 5.7.0 to 5.7.1-SNAPSHOT
Updating omero-model from 5.7.0 to 5.7.1-SNAPSHOT
Updating omero-blitz from 5.8.0 to 5.8.1-SNAPSHOT
Updating formats-gpl from 8.0.1 to 8.1.0-SNAPSHOT
Updating omero-romio from 5.8.0 to 5.8.1-SNAPSHOT
Updating omero-common from 5.7.0 to 5.7.1-SNAPSHOT
Updating omero-common-test from 5.7.0 to 5.7.1-SNAPSHOT
Updating omero-renderer from 5.6.0 to 5.6.1-SNAPSHOT
Commit all component version changes
Entering 'omero-blitz'
Entering 'omero-common'
Entering 'omero-gateway-java'
Entering 'omero-model'
Entering 'omero-renderer'
Entering 'omero-romio'
Entering 'omero-server'
Entering 'omero-blitz'
[detached HEAD 7c43fd1e] Update component versions
1 file changed, 2 insertions(+), 2 deletions(-)
Entering 'omero-common'
[detached HEAD 87e6203] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-gateway-java'
[detached HEAD 495199e] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-model'
[detached HEAD f043526] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-renderer'
[detached HEAD d925cca] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-romio'
[detached HEAD a8f3f2c] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-server'
[detached HEAD 96963725] Update component versions
1 file changed, 2 insertions(+), 2 deletions(-)
[detached HEAD af078b3] Update component versions
7 files changed, 7 insertions(+), 7 deletions(-)
2025-01-23 00:52:54,642 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-build/tree/merge_ci