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)
2024-08-31 00:22:59,603 [ scc.config] DEBUG Found github.token
2024-08-31 00:22:59,606 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-08-31 00:22:59,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:23:00,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:23:00,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-08-31 00:23:00,561 [ scc.gh] DEBUG 4863 remaining from 5000 (Reset at 01:08
2024-08-31 00:23:00,562 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-31 00:23:00,566 [ scc.git] DEBUG Check current status
2024-08-31 00:23:00,566 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-31 00:23:00,569 [ scc.git] DEBUG f67bcaf Merge pull request #202 from ome/dependabot/submodules/omero-gateway-java-62d4ba9
2024-08-31 00:23:00,569 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-31 00:23:00,611 [ scc.git] DEBUG bf9a738b0417973de01be3b2f7ccf45ee2eacd19 omero-blitz (v5.7.4-1-gbf9a738b)
2024-08-31 00:23:00,614 [ scc.git] DEBUG bc5ae5db33bfe961b8a3d04eabe269eeced81701 omero-common (v5.6.7-1-gbc5ae5d)
2024-08-31 00:23:00,618 [ scc.git] DEBUG 62d4ba9e6cab7d6a7bdd1ab5d0c72695e4f71fea omero-gateway-java (v5.9.2-1-g62d4ba9)
2024-08-31 00:23:00,621 [ scc.git] DEBUG 7e89fbd253f75213d1c3c0dc9fb202ecf3296b6c omero-model (v5.6.15-1-g7e89fbd)
2024-08-31 00:23:00,624 [ scc.git] DEBUG 97fb4155049100b22bbc685b814326adc69f723e omero-renderer (v5.5.17-1-g97fb415)
2024-08-31 00:23:00,627 [ scc.git] DEBUG 7b5f8f5b3052e761cd82bab5fa956bdbdad79ca7 omero-romio (v5.7.7-1-g7b5f8f5)
2024-08-31 00:23:00,630 [ scc.git] DEBUG 8eb311d45642163b79463c38c4b06884a637923d omero-server (v5.6.12-1-g8eb311d4)
2024-08-31 00:23:00,635 [ scc.config] DEBUG Found remote.origin.url
2024-08-31 00:23:01,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None
2024-08-31 00:23:01,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-31 00:23:01,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-31 00:23:02,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-31 00:23:02,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-31 00:23:02,695 [ scc.git] DEBUG Resetting...
2024-08-31 00:23:02,695 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-08-31 00:23:02,701 [ scc.git] DEBUG HEAD is now at f67bcaf Merge pull request #202 from ome/dependabot/submodules/omero-gateway-java-62d4ba9
2024-08-31 00:23:02,702 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-08-31 00:23:02,757 [ scc.git] DEBUG Check current status
2024-08-31 00:23:02,758 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-31 00:23:02,762 [ scc.git] DEBUG f67bcaf Merge pull request #202 from ome/dependabot/submodules/omero-gateway-java-62d4ba9
2024-08-31 00:23:02,762 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-31 00:23:02,802 [ scc.git] DEBUG bf9a738b0417973de01be3b2f7ccf45ee2eacd19 omero-blitz (v5.7.4-1-gbf9a738b)
2024-08-31 00:23:02,806 [ scc.git] DEBUG bc5ae5db33bfe961b8a3d04eabe269eeced81701 omero-common (v5.6.7-1-gbc5ae5d)
2024-08-31 00:23:02,809 [ scc.git] DEBUG 62d4ba9e6cab7d6a7bdd1ab5d0c72695e4f71fea omero-gateway-java (v5.9.2-1-g62d4ba9)
2024-08-31 00:23:02,812 [ scc.git] DEBUG 7e89fbd253f75213d1c3c0dc9fb202ecf3296b6c omero-model (v5.6.15-1-g7e89fbd)
2024-08-31 00:23:02,815 [ scc.git] DEBUG 97fb4155049100b22bbc685b814326adc69f723e omero-renderer (v5.5.17-1-g97fb415)
2024-08-31 00:23:02,818 [ scc.git] DEBUG 7b5f8f5b3052e761cd82bab5fa956bdbdad79ca7 omero-romio (v5.7.7-1-g7b5f8f5)
2024-08-31 00:23:02,821 [ scc.git] DEBUG 8eb311d45642163b79463c38c4b06884a637923d omero-server (v5.6.12-1-g8eb311d4)
2024-08-31 00:23:02,822 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-08-31 00:23:02,822 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-08-31 00:23:02,822 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-08-31 00:23:02,822 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-08-31 00:23:02,822 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-08-31 00:23:02,822 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:23:03,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 2
2024-08-31 00:23:03,100 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:23:03,100 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:23:03,101 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:23:03,105 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:23:03,108 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:23:03,108 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:23:03,112 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:23:03,116 [ scc.git] DEBUG Already up to date.
2024-08-31 00:23:03,116 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:23:03,116 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:23:03,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:23:03,120 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:23:03,162 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:23:03,163 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:23:03,167 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:23:03,378 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0bae5bf760> has no local changes
2024-08-31 00:23:03,379 [ 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/167/)'
2024-08-31 00:23:03,414 [ scc.git] DEBUG [detached HEAD 594443f] merge master -Dorg -Snone
2024-08-31 00:23:03,414 [ scc.merge] INFO Repository: ome/omero-build
2024-08-31 00:23:03,414 [ scc.merge] INFO Already up to date.
2024-08-31 00:23:03,414 [ scc.merge] INFO
2024-08-31 00:23:03,414 [ scc.merge] INFO
2024-08-31 00:23:03,414 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-31 00:23:03,414 [ 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 submodules2024-08-31 00:23:06,431 [ scc.config] DEBUG Found github.token
2024-08-31 00:23:06,434 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-08-31 00:23:06,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:23:07,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:23:07,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-08-31 00:23:07,386 [ scc.gh] DEBUG 4855 remaining from 5000 (Reset at 01:08
2024-08-31 00:23:07,387 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-31 00:23:07,392 [ scc.git] DEBUG Check current status
2024-08-31 00:23:07,392 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-31 00:23:07,398 [ scc.git] DEBUG 594443f merge master -Dorg -Snone
2024-08-31 00:23:07,398 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-31 00:23:07,439 [ scc.git] DEBUG bf9a738b0417973de01be3b2f7ccf45ee2eacd19 omero-blitz (v5.7.4-1-gbf9a738b)
2024-08-31 00:23:07,442 [ scc.git] DEBUG bc5ae5db33bfe961b8a3d04eabe269eeced81701 omero-common (v5.6.7-1-gbc5ae5d)
2024-08-31 00:23:07,446 [ scc.git] DEBUG 62d4ba9e6cab7d6a7bdd1ab5d0c72695e4f71fea omero-gateway-java (v5.9.2-1-g62d4ba9)
2024-08-31 00:23:07,448 [ scc.git] DEBUG 7e89fbd253f75213d1c3c0dc9fb202ecf3296b6c omero-model (v5.6.15-1-g7e89fbd)
2024-08-31 00:23:07,451 [ scc.git] DEBUG 97fb4155049100b22bbc685b814326adc69f723e omero-renderer (v5.5.17-1-g97fb415)
2024-08-31 00:23:07,454 [ scc.git] DEBUG 7b5f8f5b3052e761cd82bab5fa956bdbdad79ca7 omero-romio (v5.7.7-1-g7b5f8f5)
2024-08-31 00:23:07,456 [ scc.git] DEBUG 8eb311d45642163b79463c38c4b06884a637923d omero-server (v5.6.12-1-g8eb311d4)
2024-08-31 00:23:07,461 [ scc.config] DEBUG Found remote.origin.url
2024-08-31 00:23:07,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None
2024-08-31 00:23:08,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-31 00:23:08,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-31 00:23:09,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-31 00:23:09,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-31 00:23:09,491 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:23:09,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz
2024-08-31 00:23:09,547 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-31 00:23:09,552 [ scc.git] DEBUG Check current status
2024-08-31 00:23:09,552 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-31 00:23:09,557 [ scc.git] DEBUG bf9a738b revert to snapshot
2024-08-31 00:23:09,557 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-31 00:23:09,604 [ scc.config] DEBUG Found remote.origin.url
2024-08-31 00:23:09,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz HTTP/1.1" 200 None
2024-08-31 00:23:10,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-31 00:23:10,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-31 00:23:11,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-31 00:23:11,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-31 00:23:11,714 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:23:11,757 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-08-31 00:23:11,759 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common
2024-08-31 00:23:11,759 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-31 00:23:11,763 [ scc.git] DEBUG Check current status
2024-08-31 00:23:11,763 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-31 00:23:11,767 [ scc.git] DEBUG bc5ae5d revert to snapshot
2024-08-31 00:23:11,767 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-31 00:23:11,817 [ scc.config] DEBUG Found remote.origin.url
2024-08-31 00:23:12,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common HTTP/1.1" 200 None
2024-08-31 00:23:12,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-31 00:23:13,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-31 00:23:13,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-31 00:23:13,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-31 00:23:13,863 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:23:13,902 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-08-31 00:23:13,903 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java
2024-08-31 00:23:13,903 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-31 00:23:13,909 [ scc.git] DEBUG Check current status
2024-08-31 00:23:13,909 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-31 00:23:13,913 [ scc.git] DEBUG 62d4ba9 revert to snapshot
2024-08-31 00:23:13,913 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-31 00:23:13,952 [ scc.config] DEBUG Found remote.origin.url
2024-08-31 00:23:14,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java HTTP/1.1" 200 None
2024-08-31 00:23:14,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-31 00:23:15,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-31 00:23:15,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-31 00:23:16,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-31 00:23:16,033 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:23:16,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-08-31 00:23:16,075 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model
2024-08-31 00:23:16,075 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-31 00:23:16,079 [ scc.git] DEBUG Check current status
2024-08-31 00:23:16,079 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-31 00:23:16,083 [ scc.git] DEBUG 7e89fbd revert to snapshot
2024-08-31 00:23:16,083 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-31 00:23:16,140 [ scc.config] DEBUG Found remote.origin.url
2024-08-31 00:23:16,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model HTTP/1.1" 200 None
2024-08-31 00:23:16,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-31 00:23:17,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-31 00:23:17,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-31 00:23:18,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-31 00:23:18,239 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:23:18,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-08-31 00:23:18,285 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer
2024-08-31 00:23:18,285 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-31 00:23:18,289 [ scc.git] DEBUG Check current status
2024-08-31 00:23:18,289 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-31 00:23:18,295 [ scc.git] DEBUG 97fb415 revert to snapshot
2024-08-31 00:23:18,296 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-31 00:23:18,353 [ scc.config] DEBUG Found remote.origin.url
2024-08-31 00:23:18,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer HTTP/1.1" 200 None
2024-08-31 00:23:19,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-31 00:23:19,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-31 00:23:20,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-31 00:23:20,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-31 00:23:20,418 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:23:20,465 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-08-31 00:23:20,466 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio
2024-08-31 00:23:20,466 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-31 00:23:20,472 [ scc.git] DEBUG Check current status
2024-08-31 00:23:20,472 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-31 00:23:20,477 [ scc.git] DEBUG 7b5f8f5 revert to snapshot
2024-08-31 00:23:20,478 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-31 00:23:20,526 [ scc.config] DEBUG Found remote.origin.url
2024-08-31 00:23:20,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio HTTP/1.1" 200 None
2024-08-31 00:23:21,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-31 00:23:21,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-31 00:23:22,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-31 00:23:22,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-31 00:23:22,540 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:23:22,583 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-08-31 00:23:22,584 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server
2024-08-31 00:23:22,584 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-08-31 00:23:22,589 [ scc.git] DEBUG Check current status
2024-08-31 00:23:22,590 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-31 00:23:22,602 [ scc.git] DEBUG 8eb311d4 revert to snapshot
2024-08-31 00:23:22,602 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-31 00:23:22,657 [ scc.config] DEBUG Found remote.origin.url
2024-08-31 00:23:23,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server HTTP/1.1" 200 None
2024-08-31 00:23:23,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-08-31 00:23:23,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-08-31 00:23:24,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-08-31 00:23:24,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-08-31 00:23:24,643 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:23:24,682 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-08-31 00:23:24,683 [ scc.git] DEBUG Resetting...
2024-08-31 00:23:24,683 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-08-31 00:23:24,690 [ scc.git] DEBUG HEAD is now at 594443f merge master -Dorg -Snone
2024-08-31 00:23:24,690 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-08-31 00:23:24,753 [ scc.git] DEBUG Check current status
2024-08-31 00:23:24,753 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-08-31 00:23:24,758 [ scc.git] DEBUG 594443f merge master -Dorg -Snone
2024-08-31 00:23:24,758 [ scc.git] DEBUG Calling 'git submodule status'
2024-08-31 00:23:24,806 [ scc.git] DEBUG bf9a738b0417973de01be3b2f7ccf45ee2eacd19 omero-blitz (v5.7.4-1-gbf9a738b)
2024-08-31 00:23:24,811 [ scc.git] DEBUG bc5ae5db33bfe961b8a3d04eabe269eeced81701 omero-common (v5.6.7-1-gbc5ae5d)
2024-08-31 00:23:24,815 [ scc.git] DEBUG 62d4ba9e6cab7d6a7bdd1ab5d0c72695e4f71fea omero-gateway-java (v5.9.2-1-g62d4ba9)
2024-08-31 00:23:24,818 [ scc.git] DEBUG 7e89fbd253f75213d1c3c0dc9fb202ecf3296b6c omero-model (v5.6.15-1-g7e89fbd)
2024-08-31 00:23:24,821 [ scc.git] DEBUG 97fb4155049100b22bbc685b814326adc69f723e omero-renderer (v5.5.17-1-g97fb415)
2024-08-31 00:23:24,824 [ scc.git] DEBUG 7b5f8f5b3052e761cd82bab5fa956bdbdad79ca7 omero-romio (v5.7.7-1-g7b5f8f5)
2024-08-31 00:23:24,827 [ scc.git] DEBUG 8eb311d45642163b79463c38c4b06884a637923d omero-server (v5.6.12-1-g8eb311d4)
2024-08-31 00:23:24,828 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-08-31 00:23:24,828 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-08-31 00:23:24,828 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-08-31 00:23:24,828 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-08-31 00:23:24,828 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-08-31 00:23:24,828 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-08-31 00:23:24,829 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:23:25,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 2
2024-08-31 00:23:25,052 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:23:25,052 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:23:25,052 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:23:25,059 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:23:25,065 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:23:25,065 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:23:25,073 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:23:25,081 [ scc.git] DEBUG Already up to date.
2024-08-31 00:23:25,081 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:23:25,081 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:23:25,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:23:25,085 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:23:25,131 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:23:25,131 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:23:25,136 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:23:25,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/pulls HTTP/1.1" 200 None
2024-08-31 00:23:26,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132 HTTP/1.1" 200 None
2024-08-31 00:23:26,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132/comments HTTP/1.1" 200 None
2024-08-31 00:23:27,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None
2024-08-31 00:23:27,492 [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
2024-08-31 00:23:27,955 [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
2024-08-31 00:23:28,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None
2024-08-31 00:23:28,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/statuses/6d887b53b85d244eed855703effd0e470c83bab9?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:23:28,760 [ scc.repo] DEBUG - PR 132 jburel 'Fix javadoc warning'
2024-08-31 00:23:29,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/131 HTTP/1.1" 200 None
2024-08-31 00:23:29,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None
2024-08-31 00:23:30,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:23:30,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None
2024-08-31 00:23:30,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/statuses/112d3abc997c6cda0078483bb91786e37a3f1f87?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:23:30,955 [ scc.repo] DEBUG - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-08-31 00:23:31,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119 HTTP/1.1" 200 None
2024-08-31 00:23:31,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119/comments HTTP/1.1" 200 None
2024-08-31 00:23:32,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None
2024-08-31 00:23:32,847 [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
2024-08-31 00:23:33,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None
2024-08-31 00:23:33,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/statuses/4ef8809efaee231eb83e45e64a852a9808bc4723?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:23:33,657 [ scc.repo] DEBUG - PR 119 dominikl 'Take Ice and omero sysenv variables into account'
2024-08-31 00:23:33,657 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:23:33,657 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz
2024-08-31 00:23:33,657 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:23:33,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:23:33,663 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:23:33,667 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:23:33,667 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:23:33,672 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:23:33,677 [ scc.git] DEBUG Already up to date.
2024-08-31 00:23:33,677 [ scc.git] DEBUG Calling 'git fetch origin pull/119/head'
2024-08-31 00:23:33,991 [ scc.git] DEBUG From https://github.com/ome/omero-blitz
2024-08-31 00:23:33,992 [ scc.git] DEBUG * branch refs/pull/119/head -> FETCH_HEAD
2024-08-31 00:23:33,997 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-08-31 00:23:34,306 [ scc.git] DEBUG From https://github.com/ome/omero-blitz
2024-08-31 00:23:34,306 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-08-31 00:23:34,316 [ scc.git] DEBUG Calling 'git fetch origin pull/132/head'
2024-08-31 00:23:34,606 [ scc.git] DEBUG From https://github.com/ome/omero-blitz
2024-08-31 00:23:34,606 [ scc.git] DEBUG * branch refs/pull/132/head -> FETCH_HEAD
2024-08-31 00:23:34,613 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:23:34,613 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:23:34,614 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:23:34,619 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4ef8809efaee231eb83e45e64a852a9808bc4723'
2024-08-31 00:23:34,627 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:23:34,635 [ 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'
2024-08-31 00:23:34,651 [ scc.git] DEBUG Auto-merging src/main/java/omero/client.java
2024-08-31 00:23:34,652 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:23:34,655 [ scc.git] DEBUG src/main/java/omero/client.java | 6 ++++++
2024-08-31 00:23:34,656 [ scc.git] DEBUG 1 file changed, 6 insertions(+)
2024-08-31 00:23:34,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:23:34,785 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...112d3abc997c6cda0078483bb91786e37a3f1f87'
2024-08-31 00:23:34,795 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:23:34,802 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (bump org.openmicroscopy.project 5.6.0) 112d3abc997c6cda0078483bb91786e37a3f1f87'
2024-08-31 00:23:34,822 [ scc.git] DEBUG Auto-merging build.gradle
2024-08-31 00:23:34,823 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:23:34,827 [ scc.git] DEBUG build.gradle | 2 +-
2024-08-31 00:23:34,828 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-31 00:23:35,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:23:35,191 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6d887b53b85d244eed855703effd0e470c83bab9'
2024-08-31 00:23:35,202 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:23:35,207 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 132 (Fix javadoc warning) 6d887b53b85d244eed855703effd0e470c83bab9'
2024-08-31 00:23:35,224 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:23:35,227 [ scc.git] DEBUG src/main/slice/omero/api/ThumbnailStore.ice | 2 +-
2024-08-31 00:23:35,227 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-31 00:23:35,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:23:35,584 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:23:35,635 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:23:35,635 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:23:35,640 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:23:35,691 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:23:35,699 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fda062d5550> has no local changes
2024-08-31 00:23:35,700 [ 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 131 jburel 'bump org.openmicroscopy.project 5.6.0'
- PR 132 jburel 'Fix javadoc warning'
Generated by OMERO-build-push#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/167/)'
2024-08-31 00:23:35,711 [ scc.git] DEBUG [detached HEAD 205dd28f] merge master -Dorg -Ssuccess-only
2024-08-31 00:23:35,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-08-31 00:23:35,711 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:23:36,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/pulls HTTP/1.1" 200 None
2024-08-31 00:23:36,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/45 HTTP/1.1" 200 None
2024-08-31 00:23:37,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/45/comments HTTP/1.1" 200 None
2024-08-31 00:23:37,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42 HTTP/1.1" 200 None
2024-08-31 00:23:37,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42/comments HTTP/1.1" 200 None
2024-08-31 00:23:38,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None
2024-08-31 00:23:38,860 [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
2024-08-31 00:23:39,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-31 00:23:39,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None
2024-08-31 00:23:40,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/statuses/92e4d3ee9bd655e531156415863a1defa7d0ab39?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:23:40,222 [ scc.repo] DEBUG - PR 42 jburel 'include all'
2024-08-31 00:23:40,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/39 HTTP/1.1" 200 None
2024-08-31 00:23:41,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None
2024-08-31 00:23:41,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:23:42,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None
2024-08-31 00:23:42,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/statuses/4a9d6c24778791d07f2c42951a5c1a6e3c711007?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:23:42,488 [ scc.repo] DEBUG - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-08-31 00:23:42,488 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:23:42,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common
2024-08-31 00:23:42,489 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:23:42,489 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:23:42,494 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:23:42,499 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:23:42,499 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:23:42,504 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:23:42,510 [ scc.git] DEBUG Already up to date.
2024-08-31 00:23:42,510 [ scc.git] DEBUG Calling 'git fetch origin pull/39/head'
2024-08-31 00:23:43,005 [ scc.git] DEBUG From https://github.com/ome/omero-common
2024-08-31 00:23:43,005 [ scc.git] DEBUG * branch refs/pull/39/head -> FETCH_HEAD
2024-08-31 00:23:43,011 [ scc.git] DEBUG Calling 'git fetch origin pull/42/head'
2024-08-31 00:23:43,353 [ scc.git] DEBUG From https://github.com/ome/omero-common
2024-08-31 00:23:43,353 [ scc.git] DEBUG * branch refs/pull/42/head -> FETCH_HEAD
2024-08-31 00:23:43,363 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:23:43,364 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:23:43,364 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:23:43,369 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4a9d6c24778791d07f2c42951a5c1a6e3c711007'
2024-08-31 00:23:43,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:23:43,384 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 39 (bump org.openmicroscopy.project 5.6.0) 4a9d6c24778791d07f2c42951a5c1a6e3c711007'
2024-08-31 00:23:43,417 [ scc.git] DEBUG Auto-merging build.gradle
2024-08-31 00:23:43,418 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:23:43,421 [ scc.git] DEBUG build.gradle | 2 +-
2024-08-31 00:23:43,422 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-31 00:23:43,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:23:43,554 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...92e4d3ee9bd655e531156415863a1defa7d0ab39'
2024-08-31 00:23:43,563 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:23:43,569 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 42 (include all) 92e4d3ee9bd655e531156415863a1defa7d0ab39'
2024-08-31 00:23:43,603 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:23:43,606 [ scc.git] DEBUG publish.gradle | 17 +----------------
2024-08-31 00:23:43,606 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 16 deletions(-)
2024-08-31 00:23:43,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:23:43,948 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:23:44,016 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:23:44,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:23:44,023 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:23:44,069 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:23:44,078 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fda0631bee0> has no local changes
2024-08-31 00:23:44,078 [ 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 39 jburel 'bump org.openmicroscopy.project 5.6.0'
- PR 42 jburel 'include all'
Generated by OMERO-build-push#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/167/)'
2024-08-31 00:23:44,093 [ scc.git] DEBUG [detached HEAD f9c386c] merge master -Dorg -Ssuccess-only
2024-08-31 00:23:44,093 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-08-31 00:23:44,094 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:23:44,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/pulls HTTP/1.1" 200 None
2024-08-31 00:23:44,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/91 HTTP/1.1" 200 None
2024-08-31 00:23:45,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/9169fc9c591b3a354d58bd6f579693c255c7fd53 HTTP/1.1" 200 None
2024-08-31 00:23:45,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/9169fc9c591b3a354d58bd6f579693c255c7fd53/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:23:46,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/9169fc9c591b3a354d58bd6f579693c255c7fd53/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-31 00:23:46,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/9169fc9c591b3a354d58bd6f579693c255c7fd53 HTTP/1.1" 200 None
2024-08-31 00:23:47,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/statuses/9169fc9c591b3a354d58bd6f579693c255c7fd53?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:23:47,200 [ scc.repo] DEBUG - PR 91 dominikl 'Prepare for a next 5.9.3 relase'
2024-08-31 00:23:47,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/90 HTTP/1.1" 200 None
2024-08-31 00:23:48,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/33dcdb940c424974d7ea513075b2da3d4766a5af HTTP/1.1" 200 None
2024-08-31 00:23:48,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/33dcdb940c424974d7ea513075b2da3d4766a5af/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:23:49,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/33dcdb940c424974d7ea513075b2da3d4766a5af/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-31 00:23:50,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/33dcdb940c424974d7ea513075b2da3d4766a5af HTTP/1.1" 200 None
2024-08-31 00:23:50,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/statuses/33dcdb940c424974d7ea513075b2da3d4766a5af?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:23:50,830 [ scc.repo] DEBUG - PR 90 sbesson 'Fix order of the directory separators when downloading an image'
2024-08-31 00:23:51,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/69 HTTP/1.1" 200 None
2024-08-31 00:23:51,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None
2024-08-31 00:23:52,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:23:53,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None
2024-08-31 00:23:53,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/statuses/91d77158637953fa8fd1bdcd6a6a738b064b536c?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:23:53,607 [ scc.repo] DEBUG - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-08-31 00:23:54,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30 HTTP/1.1" 200 None
2024-08-31 00:23:54,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30/comments HTTP/1.1" 200 None
2024-08-31 00:23:54,494 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:23:54,494 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java
2024-08-31 00:23:54,494 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:23:54,494 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:23:54,501 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:23:54,510 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:23:54,510 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:23:54,518 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:23:54,525 [ scc.git] DEBUG Already up to date.
2024-08-31 00:23:54,526 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-08-31 00:23:55,960 [ scc.git] DEBUG From https://github.com/ome/omero-gateway-java
2024-08-31 00:23:55,960 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-08-31 00:23:55,965 [ scc.git] DEBUG Calling 'git fetch origin pull/90/head'
2024-08-31 00:23:56,277 [ scc.git] DEBUG From https://github.com/ome/omero-gateway-java
2024-08-31 00:23:56,277 [ scc.git] DEBUG * branch refs/pull/90/head -> FETCH_HEAD
2024-08-31 00:23:56,284 [ scc.git] DEBUG Calling 'git fetch origin pull/91/head'
2024-08-31 00:23:56,935 [ scc.git] DEBUG From https://github.com/ome/omero-gateway-java
2024-08-31 00:23:56,935 [ scc.git] DEBUG * branch refs/pull/91/head -> FETCH_HEAD
2024-08-31 00:23:56,941 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:23:56,941 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:23:56,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:23:56,947 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91d77158637953fa8fd1bdcd6a6a738b064b536c'
2024-08-31 00:23:56,956 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:23:56,961 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (bump org.openmicroscopy.project 5.6.0) 91d77158637953fa8fd1bdcd6a6a738b064b536c'
2024-08-31 00:23:56,974 [ scc.git] DEBUG Auto-merging build.gradle
2024-08-31 00:23:56,975 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:23:56,978 [ scc.git] DEBUG build.gradle | 2 +-
2024-08-31 00:23:56,978 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-31 00:23:57,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:23:57,145 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...33dcdb940c424974d7ea513075b2da3d4766a5af'
2024-08-31 00:23:57,152 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:23:57,158 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 90 (Fix order of the directory separators when downloading an image) 33dcdb940c424974d7ea513075b2da3d4766a5af'
2024-08-31 00:23:57,171 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:23:57,174 [ scc.git] DEBUG src/main/java/omero/gateway/facility/TransferFacilityHelper.java | 2 +-
2024-08-31 00:23:57,174 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-31 00:23:57,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:23:57,550 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9169fc9c591b3a354d58bd6f579693c255c7fd53'
2024-08-31 00:23:57,558 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:23:57,563 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 91 (Prepare for a next 5.9.3 relase) 9169fc9c591b3a354d58bd6f579693c255c7fd53'
2024-08-31 00:23:57,581 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:23:57,584 [ scc.git] DEBUG CHANGELOG.md | 5 +++++
2024-08-31 00:23:57,584 [ scc.git] DEBUG 1 file changed, 5 insertions(+)
2024-08-31 00:23:57,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:23:57,937 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:23:57,986 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:23:57,986 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:23:57,993 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:23:58,045 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:23:58,052 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fda062d55e0> has no local changes
2024-08-31 00:23:58,052 [ 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 69 jburel 'bump org.openmicroscopy.project 5.6.0'
- PR 90 sbesson 'Fix order of the directory separators when downloading an image'
- PR 91 dominikl 'Prepare for a next 5.9.3 relase'
Generated by OMERO-build-push#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/167/)'
2024-08-31 00:23:58,061 [ scc.git] DEBUG [detached HEAD 383d92a] merge master -Dorg -Ssuccess-only
2024-08-31 00:23:58,062 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-08-31 00:23:58,062 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:23:58,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/pulls HTTP/1.1" 200 None
2024-08-31 00:23:58,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/101 HTTP/1.1" 200 None
2024-08-31 00:23:59,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/c44d218d002ee1377cb34ea58550baa214f8fb44 HTTP/1.1" 200 None
2024-08-31 00:23:59,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/c44d218d002ee1377cb34ea58550baa214f8fb44/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:24:00,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/c44d218d002ee1377cb34ea58550baa214f8fb44/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-31 00:24:00,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/c44d218d002ee1377cb34ea58550baa214f8fb44 HTTP/1.1" 200 None
2024-08-31 00:24:01,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/statuses/c44d218d002ee1377cb34ea58550baa214f8fb44?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:24:01,132 [ scc.repo] DEBUG - PR 101 jburel 'Review action'
2024-08-31 00:24:01,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90 HTTP/1.1" 200 None
2024-08-31 00:24:02,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90/comments HTTP/1.1" 200 None
2024-08-31 00:24:02,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None
2024-08-31 00:24:03,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:24:03,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None
2024-08-31 00:24:03,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/statuses/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:24:03,907 [ scc.repo] DEBUG - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-08-31 00:24:03,907 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:24:03,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model
2024-08-31 00:24:03,908 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:24:03,908 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:24:03,914 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:24:03,925 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:24:03,926 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:24:03,934 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:24:03,942 [ scc.git] DEBUG Already up to date.
2024-08-31 00:24:03,942 [ scc.git] DEBUG Calling 'git fetch origin pull/90/head'
2024-08-31 00:24:04,369 [ scc.git] DEBUG From https://github.com/ome/omero-model
2024-08-31 00:24:04,370 [ scc.git] DEBUG * branch refs/pull/90/head -> FETCH_HEAD
2024-08-31 00:24:04,376 [ scc.git] DEBUG Calling 'git fetch origin pull/101/head'
2024-08-31 00:24:04,706 [ scc.git] DEBUG From https://github.com/ome/omero-model
2024-08-31 00:24:04,706 [ scc.git] DEBUG * branch refs/pull/101/head -> FETCH_HEAD
2024-08-31 00:24:04,712 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:24:04,712 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:24:04,713 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:24:04,720 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5'
2024-08-31 00:24:04,731 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:24:04,738 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 90 (bump org.openmicroscopy.project 5.6.0) 3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5'
2024-08-31 00:24:04,797 [ scc.git] DEBUG Auto-merging build.gradle
2024-08-31 00:24:04,799 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:24:04,803 [ scc.git] DEBUG build.gradle | 2 +-
2024-08-31 00:24:04,803 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-31 00:24:04,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:24:04,941 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c44d218d002ee1377cb34ea58550baa214f8fb44'
2024-08-31 00:24:04,951 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:24:04,960 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 101 (Review action) c44d218d002ee1377cb34ea58550baa214f8fb44'
2024-08-31 00:24:04,976 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:24:04,980 [ scc.git] DEBUG .github/workflows/gradle.yml | 24 +++++++++++++++++++++++-
2024-08-31 00:24:04,980 [ scc.git] DEBUG README.md | 2 +-
2024-08-31 00:24:04,980 [ scc.git] DEBUG 2 files changed, 24 insertions(+), 2 deletions(-)
2024-08-31 00:24:05,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:24:05,337 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:24:05,386 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:24:05,386 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:24:05,392 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:24:05,438 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:24:05,446 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fda0631fb50> has no local changes
2024-08-31 00:24:05,446 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-model
Already up to date.
Merged PRs:
- PR 90 jburel 'bump org.openmicroscopy.project 5.6.0'
- PR 101 jburel 'Review action'
Generated by OMERO-build-push#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/167/)'
2024-08-31 00:24:05,455 [ scc.git] DEBUG [detached HEAD 7cfc740] merge master -Dorg -Ssuccess-only
2024-08-31 00:24:05,455 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-08-31 00:24:05,455 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:24:05,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/pulls HTTP/1.1" 200 None
2024-08-31 00:24:06,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/23 HTTP/1.1" 200 None
2024-08-31 00:24:06,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None
2024-08-31 00:24:07,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:24:07,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None
2024-08-31 00:24:08,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/statuses/4431628b7553af56df3e6dceb1241be4b2e6a751?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:24:08,214 [ scc.repo] DEBUG - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-08-31 00:24:08,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10 HTTP/1.1" 200 None
2024-08-31 00:24:09,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10/comments HTTP/1.1" 200 None
2024-08-31 00:24:09,147 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-08-31 00:24:09,148 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:24:09,148 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer
2024-08-31 00:24:09,148 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:24:09,148 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:24:09,153 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:24:09,157 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:24:09,158 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:24:09,163 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:24:09,168 [ scc.git] DEBUG Already up to date.
2024-08-31 00:24:09,168 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head'
2024-08-31 00:24:09,454 [ scc.git] DEBUG From https://github.com/ome/omero-renderer
2024-08-31 00:24:09,455 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD
2024-08-31 00:24:09,459 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:24:09,459 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:24:09,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:24:09,463 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4431628b7553af56df3e6dceb1241be4b2e6a751'
2024-08-31 00:24:09,468 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:24:09,472 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 23 (bump org.openmicroscopy.project 5.6.0) 4431628b7553af56df3e6dceb1241be4b2e6a751'
2024-08-31 00:24:09,484 [ scc.git] DEBUG Auto-merging build.gradle
2024-08-31 00:24:09,484 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:24:09,487 [ scc.git] DEBUG build.gradle | 2 +-
2024-08-31 00:24:09,487 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-31 00:24:09,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:24:09,623 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:24:09,685 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:24:09,686 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:24:09,693 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:24:09,752 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:24:09,760 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fda06303820> has no local changes
2024-08-31 00:24:09,760 [ 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.
Merged PRs:
- PR 23 jburel 'bump org.openmicroscopy.project 5.6.0'
Generated by OMERO-build-push#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/167/)'
2024-08-31 00:24:09,772 [ scc.git] DEBUG [detached HEAD f345bc3] merge master -Dorg -Ssuccess-only
2024-08-31 00:24:09,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-08-31 00:24:09,773 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:24:10,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/pulls HTTP/1.1" 200 None
2024-08-31 00:24:10,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/41 HTTP/1.1" 200 None
2024-08-31 00:24:11,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None
2024-08-31 00:24:11,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:24:11,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None
2024-08-31 00:24:12,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/statuses/3e957802ff410901610d23f11c9f2a7db50fa19d?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:24:12,364 [ scc.repo] DEBUG - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-08-31 00:24:12,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14 HTTP/1.1" 200 None
2024-08-31 00:24:13,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14/comments HTTP/1.1" 200 None
2024-08-31 00:24:13,253 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:24:13,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio
2024-08-31 00:24:13,253 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:24:13,253 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:24:13,259 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:24:13,263 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:24:13,263 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:24:13,268 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:24:13,273 [ scc.git] DEBUG Already up to date.
2024-08-31 00:24:13,274 [ scc.git] DEBUG Calling 'git fetch origin pull/41/head'
2024-08-31 00:24:13,626 [ scc.git] DEBUG From https://github.com/ome/omero-romio
2024-08-31 00:24:13,626 [ scc.git] DEBUG * branch refs/pull/41/head -> FETCH_HEAD
2024-08-31 00:24:13,632 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:24:13,632 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:24:13,633 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:24:13,641 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e957802ff410901610d23f11c9f2a7db50fa19d'
2024-08-31 00:24:13,649 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:24:13,653 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 41 (bump org.openmicroscopy.project 5.6.0) 3e957802ff410901610d23f11c9f2a7db50fa19d'
2024-08-31 00:24:13,697 [ scc.git] DEBUG Auto-merging build.gradle
2024-08-31 00:24:13,698 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:24:13,701 [ scc.git] DEBUG build.gradle | 2 +-
2024-08-31 00:24:13,701 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-31 00:24:13,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:24:13,841 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:24:13,881 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:24:13,881 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:24:13,886 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:24:13,931 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:24:13,939 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fda062cc0d0> has no local changes
2024-08-31 00:24:13,940 [ 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.
Merged PRs:
- PR 41 jburel 'bump org.openmicroscopy.project 5.6.0'
Generated by OMERO-build-push#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/167/)'
2024-08-31 00:24:13,950 [ scc.git] DEBUG [detached HEAD 7df12a7] merge master -Dorg -Ssuccess-only
2024-08-31 00:24:13,951 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-08-31 00:24:13,951 [ scc.repo] DEBUG ## PRs found:
2024-08-31 00:24:14,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/pulls HTTP/1.1" 200 None
2024-08-31 00:24:14,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166 HTTP/1.1" 200 None
2024-08-31 00:24:15,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166/comments HTTP/1.1" 200 None
2024-08-31 00:24:15,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152 HTTP/1.1" 200 None
2024-08-31 00:24:16,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152/comments HTTP/1.1" 200 None
2024-08-31 00:24:16,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None
2024-08-31 00:24:17,121 [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
2024-08-31 00:24:17,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None
2024-08-31 00:24:17,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/statuses/3e65b9de901fc160c380da602def943206fe9b1d?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:24:17,978 [ scc.repo] DEBUG - PR 152 jburel 'Set class in doc'
2024-08-31 00:24:18,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/151 HTTP/1.1" 200 None
2024-08-31 00:24:18,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None
2024-08-31 00:24:19,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-31 00:24:19,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None
2024-08-31 00:24:20,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/statuses/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:24:20,187 [ scc.repo] DEBUG - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-08-31 00:24:20,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61 HTTP/1.1" 200 None
2024-08-31 00:24:21,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61/comments HTTP/1.1" 200 None
2024-08-31 00:24:21,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None
2024-08-31 00:24:22,040 [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
2024-08-31 00:24:22,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None
2024-08-31 00:24:22,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/statuses/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf?per_page=1 HTTP/1.1" 200 2
2024-08-31 00:24:22,866 [ scc.repo] DEBUG - PR 61 joshmoore 'Pass user executor to rendering tasks'
2024-08-31 00:24:22,868 [ scc.repo] DEBUG ## Branches found:
2024-08-31 00:24:22,868 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server
2024-08-31 00:24:22,868 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:24:22,869 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:24:22,877 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-31 00:24:22,885 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-31 00:24:22,886 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-31 00:24:22,895 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-31 00:24:22,905 [ scc.git] DEBUG Already up to date.
2024-08-31 00:24:22,905 [ scc.git] DEBUG Calling 'git fetch origin pull/61/head'
2024-08-31 00:24:23,592 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-08-31 00:24:23,592 [ scc.git] DEBUG * branch refs/pull/61/head -> FETCH_HEAD
2024-08-31 00:24:23,601 [ scc.git] DEBUG Calling 'git fetch origin pull/151/head'
2024-08-31 00:24:23,909 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-08-31 00:24:23,909 [ scc.git] DEBUG * branch refs/pull/151/head -> FETCH_HEAD
2024-08-31 00:24:23,916 [ scc.git] DEBUG Calling 'git fetch origin pull/152/head'
2024-08-31 00:24:24,268 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-08-31 00:24:24,269 [ scc.git] DEBUG * branch refs/pull/152/head -> FETCH_HEAD
2024-08-31 00:24:24,275 [ scc.git] DEBUG ## Unique users: []
2024-08-31 00:24:24,275 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:24:24,275 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:24:24,280 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf'
2024-08-31 00:24:24,289 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:24:24,296 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 61 (Pass user executor to rendering tasks) 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf'
2024-08-31 00:24:24,427 [ scc.git] DEBUG CONFLICT (modify/delete): .travis.yml deleted in HEAD and modified in 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf. Version 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf of .travis.yml left in tree.
2024-08-31 00:24:24,427 [ scc.git] DEBUG Auto-merging build.gradle
2024-08-31 00:24:24,427 [ scc.git] DEBUG CONFLICT (content): Merge conflict in build.gradle
2024-08-31 00:24:24,428 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-31 00:24:24,429 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-31 00:24:24,439 [ scc.git] DEBUG Calling 'git reset --hard 8eb311d45642163b79463c38c4b06884a637923d'
2024-08-31 00:24:24,452 [ scc.git] DEBUG HEAD is now at 8eb311d4 revert to snapshot
2024-08-31 00:24:24,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:24:24,599 [ scc.git] DEBUG Calling 'git merge-base 8eb311d45642163b79463c38c4b06884a637923d 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf'
2024-08-31 00:24:24,609 [ scc.git] DEBUG Calling 'git diff --name-only dee098f9c5138f2e746928fb31973abfe33d1718..8eb311d45642163b79463c38c4b06884a637923d'
2024-08-31 00:24:24,618 [ scc.git] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks'
Conflicting PR. Removed from build [OMERO-build-push#167](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/167/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/167/consoleText) for more details.
Possible conflicts:
- Upstream changes
- build.gradle
- .travis.yml
--conflicts
2024-08-31 00:24:24,624 [ scc.config] DEBUG Found github.token
2024-08-31 00:24:24,624 [ scc.git] DEBUG Not adding comment to issue #61, already --conflicts.
2024-08-31 00:24:24,625 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374'
2024-08-31 00:24:24,634 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:24:24,640 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 151 (bump org.openmicroscopy.project 5.6.0) f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374'
2024-08-31 00:24:24,675 [ scc.git] DEBUG Auto-merging build.gradle
2024-08-31 00:24:24,676 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:24:24,679 [ scc.git] DEBUG build.gradle | 2 +-
2024-08-31 00:24:24,680 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-31 00:24:24,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:24:24,989 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e65b9de901fc160c380da602def943206fe9b1d'
2024-08-31 00:24:24,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:24:25,004 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 152 (Set class in doc) 3e65b9de901fc160c380da602def943206fe9b1d'
2024-08-31 00:24:25,034 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-31 00:24:25,037 [ scc.git] DEBUG src/main/java/ome/api/local/LocalSession.java | 2 +-
2024-08-31 00:24:25,037 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-31 00:24:25,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:24:25,416 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-31 00:24:25,468 [ scc.git] DEBUG Get sha1 of %s
2024-08-31 00:24:25,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-31 00:24:25,474 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:24:25,519 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:24:25,531 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fda062e6b80> has no local changes
2024-08-31 00:24:25,532 [ 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 151 jburel 'bump org.openmicroscopy.project 5.6.0'
- 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/167/)'
2024-08-31 00:24:25,544 [ scc.git] DEBUG [detached HEAD a68d68da] merge master -Dorg -Ssuccess-only
2024-08-31 00:24:25,544 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-08-31 00:24:25,545 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-31 00:24:25,616 [ scc.config] DEBUG Found submodule.omero-blitz.url
2024-08-31 00:24:25,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:24:25,825 [ scc.config] DEBUG Found submodule.omero-blitz.branch
2024-08-31 00:24:25,831 [ scc.config] DEBUG Found submodule.omero-common.url
2024-08-31 00:24:26,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:24:26,203 [ scc.config] DEBUG Found submodule.omero-common.branch
2024-08-31 00:24:26,209 [ scc.config] DEBUG Found submodule.omero-gateway-java.url
2024-08-31 00:24:26,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:24:26,584 [ scc.config] DEBUG Found submodule.omero-gateway-java.branch
2024-08-31 00:24:26,589 [ scc.config] DEBUG Found submodule.omero-model.url
2024-08-31 00:24:26,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:24:26,972 [ scc.config] DEBUG Found submodule.omero-model.branch
2024-08-31 00:24:26,977 [ scc.config] DEBUG Found submodule.omero-renderer.url
2024-08-31 00:24:27,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:24:27,355 [ scc.config] DEBUG Found submodule.omero-renderer.branch
2024-08-31 00:24:27,362 [ scc.config] DEBUG Found submodule.omero-romio.url
2024-08-31 00:24:27,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:24:27,753 [ scc.config] DEBUG Found submodule.omero-romio.branch
2024-08-31 00:24:27,759 [ scc.config] DEBUG Found submodule.omero-server.url
2024-08-31 00:24:28,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-31 00:24:28,141 [ scc.config] DEBUG Found submodule.omero-server.branch
2024-08-31 00:24:28,142 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-31 00:24:28,185 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fda073ff760> has local changes
2024-08-31 00:24:28,186 [ 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 131 jburel 'bump org.openmicroscopy.project 5.6.0'
- 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 39 jburel 'bump org.openmicroscopy.project 5.6.0'
- 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 69 jburel 'bump org.openmicroscopy.project 5.6.0'
- PR 90 sbesson 'Fix order of the directory separators when downloading an image'
- PR 91 dominikl 'Prepare for a next 5.9.3 relase'
Repository: ome/omero-model
Already up to date.
Merged PRs:
- PR 90 jburel 'bump org.openmicroscopy.project 5.6.0'
- PR 101 jburel 'Review action'
Repository: ome/omero-renderer
Excluded PRs:
- PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude)
Already up to date.
Merged PRs:
- PR 23 jburel 'bump org.openmicroscopy.project 5.6.0'
Repository: ome/omero-romio
Excluded PRs:
- PR 14 chris-allan 'Bye bye commons-io' (exclude comment)
Already up to date.
Merged PRs:
- PR 41 jburel 'bump org.openmicroscopy.project 5.6.0'
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 151 jburel 'bump org.openmicroscopy.project 5.6.0'
- 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/167/)'
2024-08-31 00:24:28,198 [ scc.git] DEBUG [detached HEAD 9a88e59] merge master -Dorg -Ssuccess-only
2024-08-31 00:24:28,198 [ scc.merge] INFO Repository: ome/omero-build
2024-08-31 00:24:28,198 [ scc.git] DEBUG 8 files changed, 14 insertions(+), 14 deletions(-)
2024-08-31 00:24:28,198 [ scc.merge] INFO Already up to date.
2024-08-31 00:24:28,199 [ scc.merge] INFO
2024-08-31 00:24:28,199 [ scc.merge] INFO
2024-08-31 00:24:28,199 [ scc.merge] INFO Repository: ome/omero-blitz
2024-08-31 00:24:28,199 [ scc.merge] INFO Already up to date.
2024-08-31 00:24:28,199 [ scc.merge] INFO
2024-08-31 00:24:28,199 [ scc.merge] INFO Merged PRs:
2024-08-31 00:24:28,199 [ scc.merge] INFO - PR 119 dominikl 'Take Ice and omero sysenv variables into account'
2024-08-31 00:24:28,199 [ scc.merge] INFO - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-08-31 00:24:28,199 [ scc.merge] INFO - PR 132 jburel 'Fix javadoc warning'
2024-08-31 00:24:28,199 [ scc.merge] INFO
2024-08-31 00:24:28,199 [ scc.merge] INFO Repository: ome/omero-common
2024-08-31 00:24:28,199 [ scc.merge] INFO Excluded PRs:
2024-08-31 00:24:28,199 [ scc.merge] INFO - PR 45 ehrenfeu 'Do not hide "Make Movie" from script menu' (user: ehrenfeu)
2024-08-31 00:24:28,199 [ scc.merge] INFO - PR 40 jburel 'set classifier' (exclude comment)
2024-08-31 00:24:28,199 [ scc.merge] INFO - PR 29 dominikl 'Add method to get pixel min max' (exclude comment)
2024-08-31 00:24:28,199 [ scc.merge] INFO Already up to date.
2024-08-31 00:24:28,200 [ scc.merge] INFO
2024-08-31 00:24:28,200 [ scc.merge] INFO Merged PRs:
2024-08-31 00:24:28,200 [ scc.merge] INFO - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-08-31 00:24:28,200 [ scc.merge] INFO - PR 42 jburel 'include all'
2024-08-31 00:24:28,200 [ scc.merge] INFO
2024-08-31 00:24:28,200 [ scc.merge] INFO Repository: ome/omero-gateway-java
2024-08-31 00:24:28,200 [ scc.merge] INFO Excluded PRs:
2024-08-31 00:24:28,200 [ scc.merge] INFO - PR 30 jburel 'Import image' (exclude comment)
2024-08-31 00:24:28,200 [ scc.merge] INFO Already up to date.
2024-08-31 00:24:28,200 [ scc.merge] INFO
2024-08-31 00:24:28,200 [ scc.merge] INFO Merged PRs:
2024-08-31 00:24:28,200 [ scc.merge] INFO - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-08-31 00:24:28,200 [ scc.merge] INFO - PR 90 sbesson 'Fix order of the directory separators when downloading an image'
2024-08-31 00:24:28,200 [ scc.merge] INFO - PR 91 dominikl 'Prepare for a next 5.9.3 relase'
2024-08-31 00:24:28,200 [ scc.merge] INFO
2024-08-31 00:24:28,200 [ scc.merge] INFO Repository: ome/omero-model
2024-08-31 00:24:28,201 [ scc.merge] INFO Already up to date.
2024-08-31 00:24:28,201 [ scc.merge] INFO
2024-08-31 00:24:28,201 [ scc.merge] INFO Merged PRs:
2024-08-31 00:24:28,201 [ scc.merge] INFO - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-08-31 00:24:28,201 [ scc.merge] INFO - PR 101 jburel 'Review action'
2024-08-31 00:24:28,201 [ scc.merge] INFO
2024-08-31 00:24:28,201 [ scc.merge] INFO Repository: ome/omero-renderer
2024-08-31 00:24:28,201 [ scc.merge] INFO Excluded PRs:
2024-08-31 00:24:28,201 [ scc.merge] INFO - PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude)
2024-08-31 00:24:28,201 [ scc.merge] INFO Already up to date.
2024-08-31 00:24:28,201 [ scc.merge] INFO
2024-08-31 00:24:28,201 [ scc.merge] INFO Merged PRs:
2024-08-31 00:24:28,201 [ scc.merge] INFO - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-08-31 00:24:28,201 [ scc.merge] INFO
2024-08-31 00:24:28,201 [ scc.merge] INFO Repository: ome/omero-romio
2024-08-31 00:24:28,201 [ scc.merge] INFO Excluded PRs:
2024-08-31 00:24:28,201 [ scc.merge] INFO - PR 14 chris-allan 'Bye bye commons-io' (exclude comment)
2024-08-31 00:24:28,202 [ scc.merge] INFO Already up to date.
2024-08-31 00:24:28,202 [ scc.merge] INFO
2024-08-31 00:24:28,202 [ scc.merge] INFO Merged PRs:
2024-08-31 00:24:28,202 [ scc.merge] INFO - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-08-31 00:24:28,202 [ scc.merge] INFO
2024-08-31 00:24:28,202 [ scc.merge] INFO Repository: ome/omero-server
2024-08-31 00:24:28,202 [ scc.merge] INFO Excluded PRs:
2024-08-31 00:24:28,202 [ scc.merge] INFO - PR 166 kkoz 'Experimenter group cache' (stage: draft)
2024-08-31 00:24:28,202 [ scc.merge] INFO - PR 116 dominikl 'Add method to get pixel min max' (exclude comment)
2024-08-31 00:24:28,202 [ scc.merge] INFO Already up to date.
2024-08-31 00:24:28,202 [ scc.merge] INFO
2024-08-31 00:24:28,202 [ scc.merge] INFO Merged PRs:
2024-08-31 00:24:28,202 [ scc.merge] INFO - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-08-31 00:24:28,202 [ scc.merge] INFO - PR 152 jburel 'Set class in doc'
2024-08-31 00:24:28,202 [ scc.merge] INFO
2024-08-31 00:24:28,202 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-31 00:24:28,202 [ scc.merge] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks'
2024-08-31 00:24:28,202 [ scc.merge] INFO
2024-08-31 00:24:28,203 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-31 00:24:28,203 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:24:28,209 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz
2024-08-31 00:24:28,209 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:24:28,217 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-08-31 00:24:28,217 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common
2024-08-31 00:24:28,217 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:24:28,223 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-08-31 00:24:28,224 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java
2024-08-31 00:24:28,224 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:24:28,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-08-31 00:24:28,231 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model
2024-08-31 00:24:28,231 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:24:28,236 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-08-31 00:24:28,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer
2024-08-31 00:24:28,237 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:24:28,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-08-31 00:24:28,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio
2024-08-31 00:24:28,242 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:24:28,247 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-08-31 00:24:28,247 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server
2024-08-31 00:24:28,248 [ scc.git] DEBUG Calling 'git remote'
2024-08-31 00:24:28,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
Update component versions
Updating omero-common-test from 5.6.7 to 5.6.8-SNAPSHOT
Updating omero-server from 5.6.12 to 5.6.13-SNAPSHOT
Updating omero-model from 5.6.15 to 5.6.16-SNAPSHOT
Updating omero-blitz from 5.7.4 to 5.7.5-SNAPSHOT
Updating formats-gpl from 7.3.1 to 8.0.0-SNAPSHOT
Updating omero-romio from 5.7.7 to 5.7.8-SNAPSHOT
Updating omero-common from 5.6.7 to 5.6.8-SNAPSHOT
Updating omero-common-test from 5.6.7 to 5.6.8-SNAPSHOT
Updating omero-renderer from 5.5.17 to 5.5.18-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 7b449ed9] Update component versions
1 file changed, 2 insertions(+), 2 deletions(-)
Entering 'omero-common'
[detached HEAD 4573465] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-gateway-java'
[detached HEAD 5fefc26] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-model'
[detached HEAD afeec1d] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-renderer'
[detached HEAD f4d1e20] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-romio'
[detached HEAD 81fc361] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-server'
[detached HEAD 8de177e3] Update component versions
1 file changed, 2 insertions(+), 2 deletions(-)
[detached HEAD c46068c] Update component versions
7 files changed, 7 insertions(+), 7 deletions(-)
2024-08-31 00:25:00,949 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-build/tree/merge_ci
![[Jenkins]](/jenkins/static/03a0bb70/images/svgs/logo.svg){kind=logo}
