Console Output
+ export BASE_REPO=omero-insight.git
+ BASE_REPO=omero-insight.git
+ export BASE_BRANCH=master
+ BASE_BRANCH=master
+ export VERSION_LOG=/home/omero/workspace/OMERO-insight-push/build/version.tsv
+ VERSION_LOG=/home/omero/workspace/OMERO-insight-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-insight-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-insight-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-07-04 01:01:24,135 [ scc.config] DEBUG Found github.token
2024-07-04 01:01:24,139 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-04 01:01:24,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 01:01:24,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 01:01:25,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-04 01:01:25,231 [ scc.gh] DEBUG 4126 remaining from 5000 (Reset at 01:07
2024-07-04 01:01:25,232 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-04 01:01:25,236 [ scc.git] DEBUG Check current status
2024-07-04 01:01:25,236 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-04 01:01:25,241 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-07-04 01:01:25,241 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-04 01:01:25,290 [ scc.config] DEBUG Found remote.origin.url
2024-07-04 01:01:25,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-07-04 01:01:26,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-04 01:01:26,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-04 01:01:26,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-04 01:01:27,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-04 01:01:27,386 [ scc.git] DEBUG Resetting...
2024-07-04 01:01:27,386 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-04 01:01:27,406 [ scc.git] DEBUG HEAD is now at efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-07-04 01:01:27,406 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-04 01:01:27,459 [ scc.git] DEBUG Check current status
2024-07-04 01:01:27,459 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-04 01:01:27,464 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-07-04 01:01:27,465 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-04 01:01:27,513 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-04 01:01:27,513 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-04 01:01:27,513 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-04 01:01:27,513 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-04 01:01:27,513 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-04 01:01:27,514 [ scc.repo] DEBUG ## PRs found:
2024-07-04 01:01:27,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-07-04 01:01:28,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-07-04 01:01:28,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-07-04 01:01:29,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-07-04 01:01:29,324 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs'
2024-07-04 01:01:29,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-07-04 01:01:30,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-07-04 01:01:30,246 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-07-04 01:01:30,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-07-04 01:01:31,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-07-04 01:01:31,168 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-07-04 01:01:31,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-07-04 01:01:32,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-07-04 01:01:32,165 [ scc.repo] DEBUG ## Branches found:
2024-07-04 01:01:32,165 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 01:01:32,165 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 01:01:32,170 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-04 01:01:32,177 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-04 01:01:32,178 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-04 01:01:32,198 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-04 01:01:32,204 [ scc.git] DEBUG Already up to date.
2024-07-04 01:01:32,204 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head'
2024-07-04 01:01:32,681 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-04 01:01:32,681 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD
2024-07-04 01:01:32,687 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-07-04 01:01:33,403 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-04 01:01:33,404 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-07-04 01:01:33,409 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head'
2024-07-04 01:01:33,775 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-04 01:01:33,776 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD
2024-07-04 01:01:33,781 [ scc.git] DEBUG ## Unique users: []
2024-07-04 01:01:33,781 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 01:01:33,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 01:01:33,789 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-07-04 01:01:33,796 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 01:01:33,802 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 333 (drop compatibility to test new Jenkins) b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-07-04 01:01:33,839 [ scc.git] DEBUG Auto-merging build.gradle
2024-07-04 01:01:33,842 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-04 01:01:33,846 [ scc.git] DEBUG build.gradle | 8 ++++----
2024-07-04 01:01:33,846 [ scc.git] DEBUG 1 file changed, 4 insertions(+), 4 deletions(-)
2024-07-04 01:01:34,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 01:01:34,016 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-07-04 01:01:34,024 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 01:01:34,030 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 385 (handle case where ROI is not longer in table) 9466472925265b0b02b7c054c55d62705a9b8215'
2024-07-04 01:01:34,225 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-04 01:01:34,230 [ scc.git] DEBUG .../shoola/agents/measurement/view/ServerROITable.java | 13 ++++++++++---
2024-07-04 01:01:34,230 [ scc.git] DEBUG 1 file changed, 10 insertions(+), 3 deletions(-)
2024-07-04 01:01:34,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 01:01:34,426 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9'
2024-07-04 01:01:34,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 01:01:34,439 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9'
2024-07-04 01:01:34,510 [ scc.git] DEBUG Auto-merging build.gradle
2024-07-04 01:01:34,513 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-04 01:01:34,517 [ scc.git] DEBUG build.gradle | 3 ++-
2024-07-04 01:01:34,517 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 1 deletion(-)
2024-07-04 01:01:34,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 01:01:34,850 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-04 01:01:34,897 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 01:01:34,897 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 01:01:34,901 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-04 01:01:34,929 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7e960f8160> has no local changes
2024-07-04 01:01:34,930 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone
Repository: ome/omero-insight
Excluded PRs:
- PR 437 dominikl 'Remove apache commons io' (stage: draft)
- PR 377 sukunis 'Fix ontology loads' (exclude comment)
- PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
Already up to date.
Merged PRs:
- PR 333 jburel 'drop compatibility to test new Jenkins'
- PR 385 jburel 'handle case where ROI is not longer in table'
- PR 436 dominikl 'Update apache common libs'
Generated by OMERO-insight-push#106 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/106/)'
2024-07-04 01:01:34,944 [ scc.git] DEBUG [detached HEAD 73d0f79a0] merge master -Dorg -Snone
2024-07-04 01:01:34,944 [ scc.merge] INFO Repository: ome/omero-insight
2024-07-04 01:01:34,945 [ scc.merge] INFO Excluded PRs:
2024-07-04 01:01:34,945 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-07-04 01:01:34,945 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-07-04 01:01:34,945 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-07-04 01:01:34,945 [ scc.merge] INFO Already up to date.
2024-07-04 01:01:34,945 [ scc.merge] INFO
2024-07-04 01:01:34,945 [ scc.merge] INFO Merged PRs:
2024-07-04 01:01:34,945 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-07-04 01:01:34,945 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-07-04 01:01:34,945 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs'
2024-07-04 01:01:34,945 [ scc.merge] INFO
2024-07-04 01:01:34,945 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-04 01:01:34,945 [ scc.git] DEBUG Calling 'git remote'
Merge all submodules2024-07-04 01:01:35,520 [ scc.config] DEBUG Found github.token
2024-07-04 01:01:35,523 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-04 01:01:35,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 01:01:36,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 01:01:36,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-04 01:01:36,550 [ scc.gh] DEBUG 4101 remaining from 5000 (Reset at 01:07
2024-07-04 01:01:36,551 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-04 01:01:36,557 [ scc.git] DEBUG Check current status
2024-07-04 01:01:36,557 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-04 01:01:36,561 [ scc.git] DEBUG 73d0f79a0 merge master -Dorg -Snone
2024-07-04 01:01:36,562 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-04 01:01:36,611 [ scc.config] DEBUG Found remote.origin.url
2024-07-04 01:01:37,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-07-04 01:01:37,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-04 01:01:37,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-04 01:01:38,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-04 01:01:38,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-04 01:01:38,771 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-04 01:01:38,826 [ scc.git] DEBUG Resetting...
2024-07-04 01:01:38,826 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-04 01:01:38,850 [ scc.git] DEBUG HEAD is now at 73d0f79a0 merge master -Dorg -Snone
2024-07-04 01:01:38,851 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-04 01:01:38,901 [ scc.git] DEBUG Check current status
2024-07-04 01:01:38,902 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-04 01:01:38,908 [ scc.git] DEBUG 73d0f79a0 merge master -Dorg -Snone
2024-07-04 01:01:38,908 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-04 01:01:38,954 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-04 01:01:38,955 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-04 01:01:38,955 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-04 01:01:38,955 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-04 01:01:38,955 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-04 01:01:38,955 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-07-04 01:01:38,955 [ scc.repo] DEBUG ## PRs found:
2024-07-04 01:01:39,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-07-04 01:01:39,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-07-04 01:01:40,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-07-04 01:01:40,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-07-04 01:01:41,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-07-04 01:01:41,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-04 01:01:42,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-04 01:01:42,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-07-04 01:01:43,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/e43ef9b64e4734d327b92745588603a350b420c9?per_page=1 HTTP/1.1" 200 None
2024-07-04 01:01:43,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-07-04 01:01:44,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9/status HTTP/1.1" 200 None
2024-07-04 01:01:44,064 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs'
2024-07-04 01:01:44,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-07-04 01:01:44,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-07-04 01:01:45,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-07-04 01:01:46,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-04 01:01:46,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-04 01:01:47,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-07-04 01:01:47,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/9466472925265b0b02b7c054c55d62705a9b8215?per_page=1 HTTP/1.1" 200 None
2024-07-04 01:01:47,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-07-04 01:01:48,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215/status HTTP/1.1" 200 None
2024-07-04 01:01:48,290 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-07-04 01:01:48,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-07-04 01:01:49,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-07-04 01:01:49,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None
2024-07-04 01:01:50,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-04 01:01:50,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None
2024-07-04 01:01:51,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/b66e93349e2ddb5c1908f922c7c63a46722bd48e?per_page=1 HTTP/1.1" 200 2
2024-07-04 01:01:51,181 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-07-04 01:01:51,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-07-04 01:01:52,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-07-04 01:01:52,141 [ scc.repo] DEBUG ## Branches found:
2024-07-04 01:01:52,141 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 01:01:52,141 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 01:01:52,146 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-04 01:01:52,151 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-04 01:01:52,151 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-04 01:01:52,156 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-04 01:01:52,163 [ scc.git] DEBUG Already up to date.
2024-07-04 01:01:52,164 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head'
2024-07-04 01:01:52,533 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-04 01:01:52,534 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD
2024-07-04 01:01:52,540 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-07-04 01:01:52,945 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-04 01:01:52,945 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-07-04 01:01:52,951 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head'
2024-07-04 01:01:53,558 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-04 01:01:53,559 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD
2024-07-04 01:01:53,564 [ scc.git] DEBUG ## Unique users: []
2024-07-04 01:01:53,564 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 01:01:53,564 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 01:01:53,569 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-07-04 01:01:53,576 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 01:01:53,589 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 333 (drop compatibility to test new Jenkins) b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-07-04 01:01:53,597 [ scc.git] DEBUG Already up to date.
2024-07-04 01:01:53,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 01:01:53,765 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-07-04 01:01:53,774 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 01:01:53,779 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 385 (handle case where ROI is not longer in table) 9466472925265b0b02b7c054c55d62705a9b8215'
2024-07-04 01:01:53,786 [ scc.git] DEBUG Already up to date.
2024-07-04 01:01:54,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 01:01:54,186 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9'
2024-07-04 01:01:54,196 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 01:01:54,202 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9'
2024-07-04 01:01:54,208 [ scc.git] DEBUG Already up to date.
2024-07-04 01:01:54,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-04 01:01:54,600 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-04 01:01:54,672 [ scc.git] DEBUG Get sha1 of %s
2024-07-04 01:01:54,672 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-04 01:01:54,679 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-04 01:01:54,739 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-04 01:01:54,754 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa242779160> has no local changes
2024-07-04 01:01:54,755 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-insight
Excluded PRs:
- PR 437 dominikl 'Remove apache commons io' (stage: draft)
- PR 377 sukunis 'Fix ontology loads' (exclude comment)
- PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
Already up to date.
Merged PRs:
- PR 333 jburel 'drop compatibility to test new Jenkins'
- PR 385 jburel 'handle case where ROI is not longer in table'
- PR 436 dominikl 'Update apache common libs'
Generated by OMERO-insight-push#106 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/106/)'
2024-07-04 01:01:54,773 [ scc.git] DEBUG [detached HEAD 8471a69c5] merge master -Dorg -Ssuccess-only
2024-07-04 01:01:54,774 [ scc.merge] INFO Repository: ome/omero-insight
2024-07-04 01:01:54,774 [ scc.merge] INFO Excluded PRs:
2024-07-04 01:01:54,774 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-07-04 01:01:54,774 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-07-04 01:01:54,774 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-07-04 01:01:54,774 [ scc.merge] INFO Already up to date.
2024-07-04 01:01:54,774 [ scc.merge] INFO
2024-07-04 01:01:54,774 [ scc.merge] INFO Merged PRs:
2024-07-04 01:01:54,774 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-07-04 01:01:54,774 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-07-04 01:01:54,774 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs'
2024-07-04 01:01:54,774 [ scc.merge] INFO
2024-07-04 01:01:54,774 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-04 01:01:54,775 [ scc.git] DEBUG Calling 'git remote'
Update component versions
Updating omero-gateway from 5.9.1 to 5.9.2-SNAPSHOT
Commit all component version changes
[detached HEAD 8f399b02c] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
2024-07-04 01:02:01,721 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-insight/tree/merge_ci