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-17 00:59:01,854 [ scc.config] DEBUG Found github.token
2024-07-17 00:59:01,859 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-17 00:59:02,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:59:02,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:59:02,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-17 00:59:02,892 [ scc.gh] DEBUG 2831 remaining from 5000 (Reset at 01:07
2024-07-17 00:59:02,893 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-17 00:59:02,897 [ scc.git] DEBUG Check current status
2024-07-17 00:59:02,897 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-17 00:59:02,901 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-07-17 00:59:02,901 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-17 00:59:02,946 [ scc.config] DEBUG Found remote.origin.url
2024-07-17 00:59:03,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-07-17 00:59:03,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-17 00:59:04,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-17 00:59:04,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-17 00:59:05,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-17 00:59:05,120 [ scc.git] DEBUG Resetting...
2024-07-17 00:59:05,120 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-17 00:59:05,139 [ scc.git] DEBUG HEAD is now at efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-07-17 00:59:05,140 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-17 00:59:05,180 [ scc.git] DEBUG Check current status
2024-07-17 00:59:05,180 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-17 00:59:05,184 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-07-17 00:59:05,184 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-17 00:59:05,221 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-17 00:59:05,222 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-17 00:59:05,222 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-17 00:59:05,222 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-17 00:59:05,222 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-17 00:59:05,222 [ scc.repo] DEBUG ## PRs found:
2024-07-17 00:59:05,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-07-17 00:59:06,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-07-17 00:59:06,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-07-17 00:59:07,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-07-17 00:59:07,105 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs'
2024-07-17 00:59:07,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-07-17 00:59:08,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-07-17 00:59:08,047 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-07-17 00:59:08,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-07-17 00:59:08,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-07-17 00:59:08,971 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-07-17 00:59:09,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-07-17 00:59:10,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-07-17 00:59:10,040 [ scc.repo] DEBUG ## Branches found:
2024-07-17 00:59:10,040 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:59:10,040 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:59:10,044 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-17 00:59:10,048 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-17 00:59:10,049 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-17 00:59:10,054 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-17 00:59:10,059 [ scc.git] DEBUG Already up to date.
2024-07-17 00:59:10,059 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head'
2024-07-17 00:59:10,541 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-17 00:59:10,541 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD
2024-07-17 00:59:10,547 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-07-17 00:59:11,000 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-17 00:59:11,000 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-07-17 00:59:11,004 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head'
2024-07-17 00:59:11,372 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-17 00:59:11,372 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD
2024-07-17 00:59:11,377 [ scc.git] DEBUG ## Unique users: []
2024-07-17 00:59:11,378 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:59:11,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:59:11,381 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-07-17 00:59:11,386 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:59:11,390 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 333 (drop compatibility to test new Jenkins) b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-07-17 00:59:11,445 [ scc.git] DEBUG Auto-merging build.gradle
2024-07-17 00:59:11,448 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-17 00:59:11,450 [ scc.git] DEBUG build.gradle | 8 ++++----
2024-07-17 00:59:11,450 [ scc.git] DEBUG 1 file changed, 4 insertions(+), 4 deletions(-)
2024-07-17 00:59:11,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:59:11,623 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-07-17 00:59:11,630 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:59:11,634 [ 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-17 00:59:11,731 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-17 00:59:11,734 [ scc.git] DEBUG .../shoola/agents/measurement/view/ServerROITable.java | 13 ++++++++++---
2024-07-17 00:59:11,734 [ scc.git] DEBUG 1 file changed, 10 insertions(+), 3 deletions(-)
2024-07-17 00:59:12,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:59:12,045 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9'
2024-07-17 00:59:12,051 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:59:12,055 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9'
2024-07-17 00:59:12,085 [ scc.git] DEBUG Auto-merging build.gradle
2024-07-17 00:59:12,088 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-17 00:59:12,091 [ scc.git] DEBUG build.gradle | 3 ++-
2024-07-17 00:59:12,091 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 1 deletion(-)
2024-07-17 00:59:12,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:59:12,441 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-17 00:59:12,478 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:59:12,479 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:59:12,483 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-17 00:59:12,538 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f94087a8af0> has no local changes
2024-07-17 00:59:12,539 [ 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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/115/)'
2024-07-17 00:59:12,551 [ scc.git] DEBUG [detached HEAD 6e77a8c82] merge master -Dorg -Snone
2024-07-17 00:59:12,552 [ scc.merge] INFO Repository: ome/omero-insight
2024-07-17 00:59:12,552 [ scc.merge] INFO Excluded PRs:
2024-07-17 00:59:12,552 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-07-17 00:59:12,552 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-07-17 00:59:12,552 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-07-17 00:59:12,552 [ scc.merge] INFO Already up to date.
2024-07-17 00:59:12,552 [ scc.merge] INFO
2024-07-17 00:59:12,552 [ scc.merge] INFO Merged PRs:
2024-07-17 00:59:12,552 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-07-17 00:59:12,552 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-07-17 00:59:12,552 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs'
2024-07-17 00:59:12,552 [ scc.merge] INFO
2024-07-17 00:59:12,553 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-17 00:59:12,553 [ scc.git] DEBUG Calling 'git remote'
Merge all submodules2024-07-17 00:59:13,041 [ scc.config] DEBUG Found github.token
2024-07-17 00:59:13,044 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-17 00:59:13,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:59:13,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:59:14,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-17 00:59:14,072 [ scc.gh] DEBUG 2795 remaining from 5000 (Reset at 01:07
2024-07-17 00:59:14,073 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-17 00:59:14,077 [ scc.git] DEBUG Check current status
2024-07-17 00:59:14,078 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-17 00:59:14,082 [ scc.git] DEBUG 6e77a8c82 merge master -Dorg -Snone
2024-07-17 00:59:14,082 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-17 00:59:14,128 [ scc.config] DEBUG Found remote.origin.url
2024-07-17 00:59:14,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-07-17 00:59:15,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-17 00:59:15,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-17 00:59:15,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-17 00:59:16,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-17 00:59:16,286 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-17 00:59:16,332 [ scc.git] DEBUG Resetting...
2024-07-17 00:59:16,332 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-17 00:59:16,351 [ scc.git] DEBUG HEAD is now at 6e77a8c82 merge master -Dorg -Snone
2024-07-17 00:59:16,352 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-17 00:59:16,391 [ scc.git] DEBUG Check current status
2024-07-17 00:59:16,392 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-17 00:59:16,396 [ scc.git] DEBUG 6e77a8c82 merge master -Dorg -Snone
2024-07-17 00:59:16,396 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-17 00:59:16,434 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-17 00:59:16,434 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-17 00:59:16,434 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-17 00:59:16,435 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-17 00:59:16,435 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-17 00:59:16,435 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-07-17 00:59:16,435 [ scc.repo] DEBUG ## PRs found:
2024-07-17 00:59:16,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-07-17 00:59:17,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-07-17 00:59:17,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-07-17 00:59:18,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-07-17 00:59:18,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-07-17 00:59:19,313 [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-17 00:59:19,762 [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-17 00:59:20,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-07-17 00:59:20,683 [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-17 00:59:21,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-07-17 00:59:21,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9/status HTTP/1.1" 200 None
2024-07-17 00:59:21,567 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs'
2024-07-17 00:59:22,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-07-17 00:59:22,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-07-17 00:59:23,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-07-17 00:59:23,779 [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-17 00:59:24,276 [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-17 00:59:24,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-07-17 00:59:25,224 [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-17 00:59:25,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-07-17 00:59:26,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215/status HTTP/1.1" 200 None
2024-07-17 00:59:26,077 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-07-17 00:59:26,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-07-17 00:59:27,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-07-17 00:59:27,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None
2024-07-17 00:59:27,973 [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-17 00:59:28,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None
2024-07-17 00:59:28,853 [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-17 00:59:28,853 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-07-17 00:59:29,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-07-17 00:59:29,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-07-17 00:59:29,942 [ scc.repo] DEBUG ## Branches found:
2024-07-17 00:59:29,942 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:59:29,942 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:59:29,946 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-17 00:59:29,951 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-17 00:59:29,951 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-17 00:59:29,956 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-17 00:59:29,963 [ scc.git] DEBUG Already up to date.
2024-07-17 00:59:29,964 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head'
2024-07-17 00:59:30,328 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-17 00:59:30,328 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD
2024-07-17 00:59:30,333 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-07-17 00:59:30,756 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-17 00:59:30,757 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-07-17 00:59:30,762 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head'
2024-07-17 00:59:31,167 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-07-17 00:59:31,167 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD
2024-07-17 00:59:31,172 [ scc.git] DEBUG ## Unique users: []
2024-07-17 00:59:31,172 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:59:31,172 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:59:31,178 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-07-17 00:59:31,183 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:59:31,187 [ 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-17 00:59:31,192 [ scc.git] DEBUG Already up to date.
2024-07-17 00:59:31,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:59:31,353 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-07-17 00:59:31,359 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:59:31,362 [ 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-17 00:59:31,368 [ scc.git] DEBUG Already up to date.
2024-07-17 00:59:31,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:59:31,774 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9'
2024-07-17 00:59:31,780 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:59:31,785 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9'
2024-07-17 00:59:31,791 [ scc.git] DEBUG Already up to date.
2024-07-17 00:59:32,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-17 00:59:32,189 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-17 00:59:32,236 [ scc.git] DEBUG Get sha1 of %s
2024-07-17 00:59:32,237 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-17 00:59:32,242 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-17 00:59:32,283 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-17 00:59:32,296 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f343c7baaf0> has no local changes
2024-07-17 00:59:32,296 [ 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#115 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/115/)'
2024-07-17 00:59:32,310 [ scc.git] DEBUG [detached HEAD 17a5a30dd] merge master -Dorg -Ssuccess-only
2024-07-17 00:59:32,310 [ scc.merge] INFO Repository: ome/omero-insight
2024-07-17 00:59:32,310 [ scc.merge] INFO Excluded PRs:
2024-07-17 00:59:32,310 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-07-17 00:59:32,310 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-07-17 00:59:32,310 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-07-17 00:59:32,310 [ scc.merge] INFO Already up to date.
2024-07-17 00:59:32,310 [ scc.merge] INFO
2024-07-17 00:59:32,311 [ scc.merge] INFO Merged PRs:
2024-07-17 00:59:32,311 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-07-17 00:59:32,311 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-07-17 00:59:32,311 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs'
2024-07-17 00:59:32,311 [ scc.merge] INFO
2024-07-17 00:59:32,311 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-17 00:59:32,311 [ 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 4da9bd18f] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
2024-07-17 00:59:39,008 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-insight/tree/merge_ci