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-07 00:57:40,835 [ scc.config] DEBUG Found github.token
2024-06-07 00:57:40,840 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-06-07 00:57:41,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-07 00:57:41,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-07 00:57:41,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-06-07 00:57:41,882 [ scc.gh] DEBUG 4362 remaining from 5000 (Reset at 01:06
2024-06-07 00:57:41,883 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-06-07 00:57:41,888 [ scc.git] DEBUG Check current status
2024-06-07 00:57:41,888 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-07 00:57:41,893 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-06-07 00:57:41,893 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-07 00:57:41,952 [ scc.config] DEBUG Found remote.origin.url
2024-06-07 00:57:42,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-06-07 00:57:42,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-06-07 00:57:43,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-06-07 00:57:43,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-06-07 00:57:44,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-06-07 00:57:44,064 [ scc.git] DEBUG Resetting...
2024-06-07 00:57:44,064 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-06-07 00:57:44,093 [ scc.git] DEBUG HEAD is now at efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-06-07 00:57:44,095 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-06-07 00:57:44,240 [ scc.git] DEBUG Check current status
2024-06-07 00:57:44,241 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-07 00:57:44,249 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-06-07 00:57:44,250 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-07 00:57:44,337 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-06-07 00:57:44,337 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-06-07 00:57:44,338 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-06-07 00:57:44,338 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-06-07 00:57:44,338 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-06-07 00:57:44,338 [ scc.repo] DEBUG ## PRs found:
2024-06-07 00:57:44,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-06-07 00:57:45,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-06-07 00:57:45,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-06-07 00:57:46,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-06-07 00:57:46,103 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs'
2024-06-07 00:57:46,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-06-07 00:57:47,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-06-07 00:57:47,026 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-06-07 00:57:47,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-06-07 00:57:47,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-06-07 00:57:47,929 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-06-07 00:57:48,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-06-07 00:57:48,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-06-07 00:57:49,004 [ scc.repo] DEBUG ## Branches found:
2024-06-07 00:57:49,004 [ scc.git] DEBUG Get sha1 of %s
2024-06-07 00:57:49,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-07 00:57:49,010 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-07 00:57:49,014 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-07 00:57:49,015 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-07 00:57:49,019 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-07 00:57:49,024 [ scc.git] DEBUG Already up to date.
2024-06-07 00:57:49,024 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head'
2024-06-07 00:57:49,413 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-06-07 00:57:49,413 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD
2024-06-07 00:57:49,421 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-06-07 00:57:50,745 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-06-07 00:57:50,746 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-06-07 00:57:50,755 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head'
2024-06-07 00:57:51,258 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-06-07 00:57:51,258 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD
2024-06-07 00:57:51,265 [ scc.git] DEBUG ## Unique users: []
2024-06-07 00:57:51,265 [ scc.git] DEBUG Get sha1 of %s
2024-06-07 00:57:51,265 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-07 00:57:51,270 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-06-07 00:57:51,275 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-07 00:57:51,279 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 333 (drop compatibility to test new Jenkins) b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-06-07 00:57:51,322 [ scc.git] DEBUG Auto-merging build.gradle
2024-06-07 00:57:51,327 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-07 00:57:51,330 [ scc.git] DEBUG build.gradle | 8 ++++----
2024-06-07 00:57:51,330 [ scc.git] DEBUG 1 file changed, 4 insertions(+), 4 deletions(-)
2024-06-07 00:57:51,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-07 00:57:51,482 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-06-07 00:57:51,490 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-07 00:57:51,494 [ 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-07 00:57:51,604 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-07 00:57:51,610 [ scc.git] DEBUG .../shoola/agents/measurement/view/ServerROITable.java | 13 ++++++++++---
2024-06-07 00:57:51,610 [ scc.git] DEBUG 1 file changed, 10 insertions(+), 3 deletions(-)
2024-06-07 00:57:51,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-07 00:57:51,901 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9'
2024-06-07 00:57:51,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-07 00:57:51,918 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9'
2024-06-07 00:57:52,003 [ scc.git] DEBUG Auto-merging build.gradle
2024-06-07 00:57:52,006 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-07 00:57:52,009 [ scc.git] DEBUG build.gradle | 3 ++-
2024-06-07 00:57:52,009 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 1 deletion(-)
2024-06-07 00:57:52,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-07 00:57:52,317 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-07 00:57:52,397 [ scc.git] DEBUG Get sha1 of %s
2024-06-07 00:57:52,397 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-07 00:57:52,407 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-07 00:57:52,439 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f164a0a3850> has no local changes
2024-06-07 00:57:52,440 [ 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#80 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/80/)'
2024-06-07 00:57:52,463 [ scc.git] DEBUG [detached HEAD b7f858593] merge master -Dorg -Snone
2024-06-07 00:57:52,463 [ scc.merge] INFO Repository: ome/omero-insight
2024-06-07 00:57:52,464 [ scc.merge] INFO Excluded PRs:
2024-06-07 00:57:52,464 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-06-07 00:57:52,464 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-06-07 00:57:52,464 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-06-07 00:57:52,464 [ scc.merge] INFO Already up to date.
2024-06-07 00:57:52,464 [ scc.merge] INFO
2024-06-07 00:57:52,464 [ scc.merge] INFO Merged PRs:
2024-06-07 00:57:52,464 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-06-07 00:57:52,464 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-06-07 00:57:52,464 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs'
2024-06-07 00:57:52,464 [ scc.merge] INFO
2024-06-07 00:57:52,464 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-07 00:57:52,465 [ scc.git] DEBUG Calling 'git remote'
Merge all submodules2024-06-07 00:57:53,324 [ scc.config] DEBUG Found github.token
2024-06-07 00:57:53,329 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-06-07 00:57:53,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-07 00:57:54,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-07 00:57:54,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-06-07 00:57:54,420 [ scc.gh] DEBUG 4316 remaining from 5000 (Reset at 01:06
2024-06-07 00:57:54,421 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-06-07 00:57:54,425 [ scc.git] DEBUG Check current status
2024-06-07 00:57:54,425 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-07 00:57:54,428 [ scc.git] DEBUG b7f858593 merge master -Dorg -Snone
2024-06-07 00:57:54,428 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-07 00:57:54,468 [ scc.config] DEBUG Found remote.origin.url
2024-06-07 00:57:54,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-06-07 00:57:55,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-06-07 00:57:55,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-06-07 00:57:56,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-06-07 00:57:56,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-06-07 00:57:56,666 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-07 00:57:56,721 [ scc.git] DEBUG Resetting...
2024-06-07 00:57:56,721 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-06-07 00:57:56,750 [ scc.git] DEBUG HEAD is now at b7f858593 merge master -Dorg -Snone
2024-06-07 00:57:56,754 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-06-07 00:57:56,804 [ scc.git] DEBUG Check current status
2024-06-07 00:57:56,805 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-07 00:57:56,810 [ scc.git] DEBUG b7f858593 merge master -Dorg -Snone
2024-06-07 00:57:56,811 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-07 00:57:56,851 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-06-07 00:57:56,852 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-06-07 00:57:56,852 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-06-07 00:57:56,852 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-06-07 00:57:56,852 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-06-07 00:57:56,852 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-06-07 00:57:56,852 [ scc.repo] DEBUG ## PRs found:
2024-06-07 00:57:57,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-06-07 00:57:57,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-06-07 00:57:58,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-06-07 00:57:58,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-06-07 00:57:59,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-06-07 00:57:59,603 [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-07 00:58:00,074 [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-07 00:58:00,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-06-07 00:58:00,984 [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-07 00:58:01,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-06-07 00:58:01,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9/status HTTP/1.1" 200 None
2024-06-07 00:58:01,941 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs'
2024-06-07 00:58:02,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-06-07 00:58:02,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-06-07 00:58:03,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-06-07 00:58:03,889 [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-07 00:58:04,342 [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-07 00:58:04,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-06-07 00:58:05,235 [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-07 00:58:05,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-06-07 00:58:06,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215/status HTTP/1.1" 200 None
2024-06-07 00:58:06,185 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-06-07 00:58:06,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-06-07 00:58:07,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-06-07 00:58:07,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None
2024-06-07 00:58:08,116 [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-07 00:58:08,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None
2024-06-07 00:58:08,956 [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-07 00:58:08,958 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-06-07 00:58:09,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-06-07 00:58:09,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-06-07 00:58:09,964 [ scc.repo] DEBUG ## Branches found:
2024-06-07 00:58:09,964 [ scc.git] DEBUG Get sha1 of %s
2024-06-07 00:58:09,964 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-07 00:58:09,972 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-07 00:58:09,979 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-07 00:58:09,979 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-07 00:58:09,984 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-07 00:58:09,992 [ scc.git] DEBUG Already up to date.
2024-06-07 00:58:09,993 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head'
2024-06-07 00:58:10,382 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-06-07 00:58:10,382 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD
2024-06-07 00:58:10,388 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-06-07 00:58:10,780 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-06-07 00:58:10,781 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-06-07 00:58:10,786 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head'
2024-06-07 00:58:11,191 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-06-07 00:58:11,192 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD
2024-06-07 00:58:11,198 [ scc.git] DEBUG ## Unique users: []
2024-06-07 00:58:11,199 [ scc.git] DEBUG Get sha1 of %s
2024-06-07 00:58:11,199 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-07 00:58:11,203 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-06-07 00:58:11,209 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-07 00:58:11,214 [ 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-07 00:58:11,220 [ scc.git] DEBUG Already up to date.
2024-06-07 00:58:11,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-07 00:58:11,394 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-06-07 00:58:11,402 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-07 00:58:11,408 [ 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-07 00:58:11,417 [ scc.git] DEBUG Already up to date.
2024-06-07 00:58:11,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-07 00:58:11,811 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9'
2024-06-07 00:58:11,820 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-07 00:58:11,824 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9'
2024-06-07 00:58:11,831 [ scc.git] DEBUG Already up to date.
2024-06-07 00:58:12,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-07 00:58:12,214 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-07 00:58:12,261 [ scc.git] DEBUG Get sha1 of %s
2024-06-07 00:58:12,262 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-07 00:58:12,266 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-07 00:58:12,305 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-07 00:58:12,318 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb6d6829850> has no local changes
2024-06-07 00:58:12,318 [ 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#80 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/80/)'
2024-06-07 00:58:12,332 [ scc.git] DEBUG [detached HEAD 4921b3177] merge master -Dorg -Ssuccess-only
2024-06-07 00:58:12,332 [ scc.merge] INFO Repository: ome/omero-insight
2024-06-07 00:58:12,332 [ scc.merge] INFO Excluded PRs:
2024-06-07 00:58:12,332 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-06-07 00:58:12,332 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-06-07 00:58:12,332 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-06-07 00:58:12,332 [ scc.merge] INFO Already up to date.
2024-06-07 00:58:12,333 [ scc.merge] INFO
2024-06-07 00:58:12,333 [ scc.merge] INFO Merged PRs:
2024-06-07 00:58:12,333 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-06-07 00:58:12,333 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-06-07 00:58:12,333 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs'
2024-06-07 00:58:12,333 [ scc.merge] INFO
2024-06-07 00:58:12,333 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-07 00:58:12,333 [ 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 df5e8cf6d] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
2024-06-07 00:58:19,229 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-insight/tree/merge_ci