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-06-13 01:01:41,172 [ scc.config] DEBUG Found github.token
2024-06-13 01:01:41,175 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-06-13 01:01:41,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-13 01:01:41,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-13 01:01:42,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-06-13 01:01:42,206 [ scc.gh] DEBUG 4630 remaining from 5000 (Reset at 01:06
2024-06-13 01:01:42,207 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-06-13 01:01:42,212 [ scc.git] DEBUG Check current status
2024-06-13 01:01:42,212 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-13 01:01:42,217 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-06-13 01:01:42,217 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-13 01:01:42,257 [ scc.config] DEBUG Found remote.origin.url
2024-06-13 01:01:42,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-06-13 01:01:43,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-06-13 01:01:43,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-06-13 01:01:44,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-06-13 01:01:44,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-06-13 01:01:44,447 [ scc.git] DEBUG Resetting...
2024-06-13 01:01:44,447 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-06-13 01:01:44,465 [ scc.git] DEBUG HEAD is now at efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-06-13 01:01:44,465 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-06-13 01:01:44,510 [ scc.git] DEBUG Check current status
2024-06-13 01:01:44,511 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-13 01:01:44,516 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-06-13 01:01:44,516 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-13 01:01:44,565 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-06-13 01:01:44,565 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-06-13 01:01:44,565 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-06-13 01:01:44,565 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-06-13 01:01:44,565 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-06-13 01:01:44,565 [ scc.repo] DEBUG ## PRs found:
2024-06-13 01:01:45,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-06-13 01:01:45,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-06-13 01:01:46,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-06-13 01:01:46,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-06-13 01:01:46,496 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs'
2024-06-13 01:01:46,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-06-13 01:01:47,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-06-13 01:01:47,433 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-06-13 01:01:47,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-06-13 01:01:48,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-06-13 01:01:48,408 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-06-13 01:01:48,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-06-13 01:01:49,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-06-13 01:01:49,398 [ scc.repo] DEBUG ## Branches found:
2024-06-13 01:01:49,398 [ scc.git] DEBUG Get sha1 of %s
2024-06-13 01:01:49,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-13 01:01:49,406 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-13 01:01:49,415 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-13 01:01:49,415 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-13 01:01:49,422 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-13 01:01:49,429 [ scc.git] DEBUG Already up to date.
2024-06-13 01:01:49,429 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head'
2024-06-13 01:01:49,863 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-06-13 01:01:49,863 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD
2024-06-13 01:01:49,874 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-06-13 01:01:50,294 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-06-13 01:01:50,294 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-06-13 01:01:50,302 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head'
2024-06-13 01:01:50,722 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-06-13 01:01:50,722 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD
2024-06-13 01:01:50,729 [ scc.git] DEBUG ## Unique users: []
2024-06-13 01:01:50,729 [ scc.git] DEBUG Get sha1 of %s
2024-06-13 01:01:50,729 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-13 01:01:50,736 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-06-13 01:01:50,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-13 01:01:50,753 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 333 (drop compatibility to test new Jenkins) b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-06-13 01:01:50,836 [ scc.git] DEBUG Auto-merging build.gradle
2024-06-13 01:01:50,844 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-13 01:01:50,848 [ scc.git] DEBUG build.gradle | 8 ++++----
2024-06-13 01:01:50,849 [ scc.git] DEBUG 1 file changed, 4 insertions(+), 4 deletions(-)
2024-06-13 01:01:51,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-13 01:01:51,012 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-06-13 01:01:51,026 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-13 01:01:51,036 [ 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-06-13 01:01:51,104 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-13 01:01:51,109 [ scc.git] DEBUG .../shoola/agents/measurement/view/ServerROITable.java | 13 ++++++++++---
2024-06-13 01:01:51,109 [ scc.git] DEBUG 1 file changed, 10 insertions(+), 3 deletions(-)
2024-06-13 01:01:51,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-13 01:01:51,432 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9'
2024-06-13 01:01:51,442 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-13 01:01:51,447 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9'
2024-06-13 01:01:51,511 [ scc.git] DEBUG Auto-merging build.gradle
2024-06-13 01:01:51,515 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-13 01:01:51,518 [ scc.git] DEBUG build.gradle | 3 ++-
2024-06-13 01:01:51,518 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 1 deletion(-)
2024-06-13 01:01:51,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-13 01:01:51,851 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-13 01:01:51,901 [ scc.git] DEBUG Get sha1 of %s
2024-06-13 01:01:51,901 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-13 01:01:51,908 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-13 01:01:51,955 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feedf13e2e0> has no local changes
2024-06-13 01:01:51,955 [ 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#86 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/86/)'
2024-06-13 01:01:51,970 [ scc.git] DEBUG [detached HEAD 7b0c81cd8] merge master -Dorg -Snone
2024-06-13 01:01:51,971 [ scc.merge] INFO Repository: ome/omero-insight
2024-06-13 01:01:51,971 [ scc.merge] INFO Excluded PRs:
2024-06-13 01:01:51,971 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-06-13 01:01:51,971 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-06-13 01:01:51,971 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-06-13 01:01:51,971 [ scc.merge] INFO Already up to date.
2024-06-13 01:01:51,971 [ scc.merge] INFO
2024-06-13 01:01:51,971 [ scc.merge] INFO Merged PRs:
2024-06-13 01:01:51,971 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-06-13 01:01:51,971 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-06-13 01:01:51,971 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs'
2024-06-13 01:01:51,972 [ scc.merge] INFO
2024-06-13 01:01:51,972 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-13 01:01:51,972 [ scc.git] DEBUG Calling 'git remote'
Merge all submodules2024-06-13 01:01:52,516 [ scc.config] DEBUG Found github.token
2024-06-13 01:01:52,519 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-06-13 01:01:52,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-13 01:01:53,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-13 01:01:53,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-06-13 01:01:53,541 [ scc.gh] DEBUG 4600 remaining from 5000 (Reset at 01:06
2024-06-13 01:01:53,542 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-06-13 01:01:53,549 [ scc.git] DEBUG Check current status
2024-06-13 01:01:53,549 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-13 01:01:53,554 [ scc.git] DEBUG 7b0c81cd8 merge master -Dorg -Snone
2024-06-13 01:01:53,555 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-13 01:01:53,608 [ scc.config] DEBUG Found remote.origin.url
2024-06-13 01:01:54,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-06-13 01:01:54,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-06-13 01:01:54,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-06-13 01:01:55,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-06-13 01:01:55,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-06-13 01:01:55,821 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-13 01:01:55,869 [ scc.git] DEBUG Resetting...
2024-06-13 01:01:55,869 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-06-13 01:01:55,888 [ scc.git] DEBUG HEAD is now at 7b0c81cd8 merge master -Dorg -Snone
2024-06-13 01:01:55,889 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-06-13 01:01:55,937 [ scc.git] DEBUG Check current status
2024-06-13 01:01:55,937 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-13 01:01:55,942 [ scc.git] DEBUG 7b0c81cd8 merge master -Dorg -Snone
2024-06-13 01:01:55,943 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-13 01:01:55,991 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-06-13 01:01:55,991 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-06-13 01:01:55,991 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-06-13 01:01:55,991 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-06-13 01:01:55,992 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-06-13 01:01:55,992 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-06-13 01:01:55,992 [ scc.repo] DEBUG ## PRs found:
2024-06-13 01:01:56,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-06-13 01:01:56,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-06-13 01:01:57,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-06-13 01:01:57,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-06-13 01:01:58,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-06-13 01:01:58,843 [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-06-13 01:01:59,299 [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-06-13 01:01:59,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-06-13 01:02:00,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/e43ef9b64e4734d327b92745588603a350b420c9?per_page=1 HTTP/1.1" 200 None
2024-06-13 01:02:00,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-06-13 01:02:01,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9/status HTTP/1.1" 200 None
2024-06-13 01:02:01,232 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs'
2024-06-13 01:02:01,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-06-13 01:02:02,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-06-13 01:02:02,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-06-13 01:02:03,103 [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-06-13 01:02:03,610 [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-06-13 01:02:04,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-06-13 01:02:04,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/9466472925265b0b02b7c054c55d62705a9b8215?per_page=1 HTTP/1.1" 200 None
2024-06-13 01:02:04,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-06-13 01:02:05,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215/status HTTP/1.1" 200 None
2024-06-13 01:02:05,432 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-06-13 01:02:05,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-06-13 01:02:06,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-06-13 01:02:06,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None
2024-06-13 01:02:07,404 [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-06-13 01:02:07,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None
2024-06-13 01:02:08,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/b66e93349e2ddb5c1908f922c7c63a46722bd48e?per_page=1 HTTP/1.1" 200 2
2024-06-13 01:02:08,364 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-06-13 01:02:08,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-06-13 01:02:09,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-06-13 01:02:09,402 [ scc.repo] DEBUG ## Branches found:
2024-06-13 01:02:09,403 [ scc.git] DEBUG Get sha1 of %s
2024-06-13 01:02:09,403 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-13 01:02:09,408 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-13 01:02:09,412 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-13 01:02:09,412 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-13 01:02:09,417 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-13 01:02:09,425 [ scc.git] DEBUG Already up to date.
2024-06-13 01:02:09,425 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head'
2024-06-13 01:02:09,805 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-06-13 01:02:09,805 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD
2024-06-13 01:02:09,811 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-06-13 01:02:10,230 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-06-13 01:02:10,231 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-06-13 01:02:10,238 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head'
2024-06-13 01:02:10,643 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-06-13 01:02:10,643 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD
2024-06-13 01:02:10,650 [ scc.git] DEBUG ## Unique users: []
2024-06-13 01:02:10,650 [ scc.git] DEBUG Get sha1 of %s
2024-06-13 01:02:10,650 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-13 01:02:10,657 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-06-13 01:02:10,665 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-13 01:02:10,671 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 333 (drop compatibility to test new Jenkins) b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-06-13 01:02:10,679 [ scc.git] DEBUG Already up to date.
2024-06-13 01:02:10,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-13 01:02:10,874 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-06-13 01:02:10,887 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-13 01:02:10,895 [ 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-06-13 01:02:10,905 [ scc.git] DEBUG Already up to date.
2024-06-13 01:02:11,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-13 01:02:11,296 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9'
2024-06-13 01:02:11,307 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-13 01:02:11,316 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9'
2024-06-13 01:02:11,328 [ scc.git] DEBUG Already up to date.
2024-06-13 01:02:11,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-13 01:02:11,716 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-13 01:02:11,769 [ scc.git] DEBUG Get sha1 of %s
2024-06-13 01:02:11,770 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-13 01:02:11,775 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-13 01:02:11,838 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-13 01:02:11,860 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8101a632e0> has no local changes
2024-06-13 01:02:11,861 [ 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#86 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/86/)'
2024-06-13 01:02:11,884 [ scc.git] DEBUG [detached HEAD 643b55537] merge master -Dorg -Ssuccess-only
2024-06-13 01:02:11,885 [ scc.merge] INFO Repository: ome/omero-insight
2024-06-13 01:02:11,885 [ scc.merge] INFO Excluded PRs:
2024-06-13 01:02:11,885 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-06-13 01:02:11,885 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-06-13 01:02:11,885 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-06-13 01:02:11,885 [ scc.merge] INFO Already up to date.
2024-06-13 01:02:11,886 [ scc.merge] INFO
2024-06-13 01:02:11,886 [ scc.merge] INFO Merged PRs:
2024-06-13 01:02:11,886 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-06-13 01:02:11,886 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-06-13 01:02:11,886 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs'
2024-06-13 01:02:11,886 [ scc.merge] INFO
2024-06-13 01:02:11,886 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-13 01:02:11,886 [ 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 0446e9b0b] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
2024-06-13 01:02:18,445 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-insight/tree/merge_ci