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-09-08 00:55:20,420 [ scc.config] DEBUG Found github.token
2024-09-08 00:55:20,424 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-09-08 00:55:20,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:55:20,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:55:21,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-09-08 00:55:21,358 [ scc.gh] DEBUG 3062 remaining from 5000 (Reset at 01:09
2024-09-08 00:55:21,359 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-08 00:55:21,363 [ scc.git] DEBUG Check current status
2024-09-08 00:55:21,363 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-08 00:55:21,367 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-09-08 00:55:21,368 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-08 00:55:21,415 [ scc.config] DEBUG Found remote.origin.url
2024-09-08 00:55:21,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-09-08 00:55:22,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-08 00:55:22,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-08 00:55:23,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-08 00:55:23,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-08 00:55:23,460 [ scc.git] DEBUG Resetting...
2024-09-08 00:55:23,460 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-09-08 00:55:23,480 [ scc.git] DEBUG HEAD is now at efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-09-08 00:55:23,481 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-09-08 00:55:23,524 [ scc.git] DEBUG Check current status
2024-09-08 00:55:23,525 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-08 00:55:23,531 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-09-08 00:55:23,532 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-08 00:55:23,574 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-09-08 00:55:23,574 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-09-08 00:55:23,575 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-09-08 00:55:23,575 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-09-08 00:55:23,575 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-09-08 00:55:23,575 [ scc.repo] DEBUG ## PRs found:
2024-09-08 00:55:24,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-09-08 00:55:24,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/446 HTTP/1.1" 200 None
2024-09-08 00:55:24,577 [ scc.repo] DEBUG - PR 446 dominikl 'Add changelog for upcoming 5.8.5 release'
2024-09-08 00:55:25,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/445 HTTP/1.1" 200 None
2024-09-08 00:55:25,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/445/comments HTTP/1.1" 200 None
2024-09-08 00:55:25,505 [ scc.repo] DEBUG - PR 445 dominikl 'Bump gateway'
2024-09-08 00:55:25,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/444 HTTP/1.1" 200 None
2024-09-08 00:55:26,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/444/comments HTTP/1.1" 200 None
2024-09-08 00:55:26,372 [ scc.repo] DEBUG - PR 444 jburel 'fix endpoint'
2024-09-08 00:55:26,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/443 HTTP/1.1" 200 None
2024-09-08 00:55:27,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/442 HTTP/1.1" 200 None
2024-09-08 00:55:27,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/442/comments HTTP/1.1" 200 None
2024-09-08 00:55:27,698 [ scc.repo] DEBUG - PR 442 dominikl 'Remove duplicate app_name parameter'
2024-09-08 00:55:28,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-09-08 00:55:28,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-09-08 00:55:29,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-09-08 00:55:29,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-09-08 00:55:29,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-09-08 00:55:29,890 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-09-08 00:55:30,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-09-08 00:55:30,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-09-08 00:55:31,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-09-08 00:55:31,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-09-08 00:55:31,733 [ scc.repo] DEBUG ## Branches found:
2024-09-08 00:55:31,734 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:55:31,734 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:55:31,741 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-08 00:55:31,748 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-08 00:55:31,749 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-08 00:55:31,756 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-08 00:55:31,764 [ scc.git] DEBUG Already up to date.
2024-09-08 00:55:31,765 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-09-08 00:55:32,208 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-09-08 00:55:32,209 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-09-08 00:55:32,218 [ scc.git] DEBUG Calling 'git fetch origin pull/442/head'
2024-09-08 00:55:32,683 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-09-08 00:55:32,683 [ scc.git] DEBUG * branch refs/pull/442/head -> FETCH_HEAD
2024-09-08 00:55:32,689 [ scc.git] DEBUG Calling 'git fetch origin pull/444/head'
2024-09-08 00:55:33,136 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-09-08 00:55:33,137 [ scc.git] DEBUG * branch refs/pull/444/head -> FETCH_HEAD
2024-09-08 00:55:33,143 [ scc.git] DEBUG Calling 'git fetch origin pull/445/head'
2024-09-08 00:55:33,486 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-09-08 00:55:33,487 [ scc.git] DEBUG * branch refs/pull/445/head -> FETCH_HEAD
2024-09-08 00:55:33,493 [ scc.git] DEBUG Calling 'git fetch origin pull/446/head'
2024-09-08 00:55:33,835 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-09-08 00:55:33,835 [ scc.git] DEBUG * branch refs/pull/446/head -> FETCH_HEAD
2024-09-08 00:55:33,843 [ scc.git] DEBUG ## Unique users: []
2024-09-08 00:55:33,843 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:55:33,843 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:55:33,849 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-09-08 00:55:33,855 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:55:33,859 [ 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-09-08 00:55:34,068 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-08 00:55:34,072 [ scc.git] DEBUG .../shoola/agents/measurement/view/ServerROITable.java | 13 ++++++++++---
2024-09-08 00:55:34,072 [ scc.git] DEBUG 1 file changed, 10 insertions(+), 3 deletions(-)
2024-09-08 00:55:34,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:55:34,207 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9f3d273acb87527eed99aedd868bf0a4ec1b5861'
2024-09-08 00:55:34,215 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:55:34,220 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 442 (Remove duplicate app_name parameter) 9f3d273acb87527eed99aedd868bf0a4ec1b5861'
2024-09-08 00:55:34,515 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-08 00:55:34,518 [ scc.git] DEBUG .../java/org/openmicroscopy/shoola/svc/proxy/MessengerRequest.java | 4 +---
2024-09-08 00:55:34,518 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 3 deletions(-)
2024-09-08 00:55:34,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:55:34,658 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2c097b44fcac5cd272b1c0a05a7336d988b5c65b'
2024-09-08 00:55:34,665 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:55:34,670 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 444 (fix endpoint) 2c097b44fcac5cd272b1c0a05a7336d988b5c65b'
2024-09-08 00:55:34,842 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-08 00:55:34,846 [ scc.git] DEBUG .../java/org/openmicroscopy/shoola/env/data/DataServicesFactory.java | 2 +-
2024-09-08 00:55:34,846 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-09-08 00:55:35,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:55:35,037 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f9d5c87518fbe8273e949ab3206a1e23fa4aec8b'
2024-09-08 00:55:35,045 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:55:35,049 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 445 (Bump gateway) f9d5c87518fbe8273e949ab3206a1e23fa4aec8b'
2024-09-08 00:55:35,114 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-08 00:55:35,117 [ scc.git] DEBUG build.gradle | 2 +-
2024-09-08 00:55:35,117 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-09-08 00:55:35,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:55:35,424 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dff7f109472118e0a3ef88bf89467402d9cbfa93'
2024-09-08 00:55:35,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:55:35,435 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 446 (Add changelog for upcoming 5.8.5 release) dff7f109472118e0a3ef88bf89467402d9cbfa93'
2024-09-08 00:55:35,479 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-08 00:55:35,483 [ scc.git] DEBUG CHANGELOG.md | 10 +++++++++-
2024-09-08 00:55:35,483 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 1 deletion(-)
2024-09-08 00:55:35,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:55:35,802 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-08 00:55:35,844 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:55:35,845 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:55:35,849 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-08 00:55:35,886 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5544517e50> has no local changes
2024-09-08 00:55:35,887 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone
Repository: ome/omero-insight
Excluded PRs:
- PR 443 Tom-TBT 'Perceptibly uniform luts for OMERO.insight' (user: Tom-TBT)
- PR 437 dominikl 'Remove apache commons io' (stage: draft)
- PR 436 dominikl 'Update apache common libs' (exclude comment)
- PR 377 sukunis 'Fix ontology loads' (exclude comment)
- PR 333 jburel 'drop compatibility to test new Jenkins' (exclude comment)
- PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
Already up to date.
Merged PRs:
- PR 385 jburel 'handle case where ROI is not longer in table'
- PR 442 dominikl 'Remove duplicate app_name parameter'
- PR 444 jburel 'fix endpoint'
- PR 445 dominikl 'Bump gateway'
- PR 446 dominikl 'Add changelog for upcoming 5.8.5 release'
Generated by OMERO-insight-push#166 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/166/)'
2024-09-08 00:55:35,900 [ scc.git] DEBUG [detached HEAD 1395ea564] merge master -Dorg -Snone
2024-09-08 00:55:35,900 [ scc.merge] INFO Repository: ome/omero-insight
2024-09-08 00:55:35,900 [ scc.merge] INFO Excluded PRs:
2024-09-08 00:55:35,900 [ scc.merge] INFO - PR 443 Tom-TBT 'Perceptibly uniform luts for OMERO.insight' (user: Tom-TBT)
2024-09-08 00:55:35,900 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-09-08 00:55:35,900 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs' (exclude comment)
2024-09-08 00:55:35,900 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-09-08 00:55:35,900 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins' (exclude comment)
2024-09-08 00:55:35,900 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-09-08 00:55:35,900 [ scc.merge] INFO Already up to date.
2024-09-08 00:55:35,900 [ scc.merge] INFO
2024-09-08 00:55:35,900 [ scc.merge] INFO Merged PRs:
2024-09-08 00:55:35,900 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-09-08 00:55:35,900 [ scc.merge] INFO - PR 442 dominikl 'Remove duplicate app_name parameter'
2024-09-08 00:55:35,900 [ scc.merge] INFO - PR 444 jburel 'fix endpoint'
2024-09-08 00:55:35,901 [ scc.merge] INFO - PR 445 dominikl 'Bump gateway'
2024-09-08 00:55:35,901 [ scc.merge] INFO - PR 446 dominikl 'Add changelog for upcoming 5.8.5 release'
2024-09-08 00:55:35,901 [ scc.merge] INFO
2024-09-08 00:55:35,901 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-08 00:55:35,901 [ scc.git] DEBUG Calling 'git remote'
Merge all submodules2024-09-08 00:55:36,500 [ scc.config] DEBUG Found github.token
2024-09-08 00:55:36,503 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-09-08 00:55:36,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:55:37,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:55:37,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-09-08 00:55:37,431 [ scc.gh] DEBUG 2996 remaining from 5000 (Reset at 01:09
2024-09-08 00:55:37,433 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-08 00:55:37,437 [ scc.git] DEBUG Check current status
2024-09-08 00:55:37,438 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-08 00:55:37,442 [ scc.git] DEBUG 1395ea564 merge master -Dorg -Snone
2024-09-08 00:55:37,442 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-08 00:55:37,492 [ scc.config] DEBUG Found remote.origin.url
2024-09-08 00:55:37,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-09-08 00:55:38,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-08 00:55:38,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-08 00:55:39,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-08 00:55:39,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-08 00:55:39,512 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-08 00:55:39,553 [ scc.git] DEBUG Resetting...
2024-09-08 00:55:39,554 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-09-08 00:55:39,573 [ scc.git] DEBUG HEAD is now at 1395ea564 merge master -Dorg -Snone
2024-09-08 00:55:39,574 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-09-08 00:55:39,618 [ scc.git] DEBUG Check current status
2024-09-08 00:55:39,619 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-08 00:55:39,624 [ scc.git] DEBUG 1395ea564 merge master -Dorg -Snone
2024-09-08 00:55:39,624 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-08 00:55:39,678 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-09-08 00:55:39,678 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-09-08 00:55:39,678 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-09-08 00:55:39,678 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-09-08 00:55:39,678 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-09-08 00:55:39,678 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-09-08 00:55:39,678 [ scc.repo] DEBUG ## PRs found:
2024-09-08 00:55:40,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-09-08 00:55:40,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/446 HTTP/1.1" 200 None
2024-09-08 00:55:40,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/dff7f109472118e0a3ef88bf89467402d9cbfa93 HTTP/1.1" 200 None
2024-09-08 00:55:41,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/dff7f109472118e0a3ef88bf89467402d9cbfa93/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-08 00:55:41,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/dff7f109472118e0a3ef88bf89467402d9cbfa93/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-08 00:55:42,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/dff7f109472118e0a3ef88bf89467402d9cbfa93 HTTP/1.1" 200 None
2024-09-08 00:55:42,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/dff7f109472118e0a3ef88bf89467402d9cbfa93?per_page=1 HTTP/1.1" 200 None
2024-09-08 00:55:43,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/dff7f109472118e0a3ef88bf89467402d9cbfa93 HTTP/1.1" 200 None
2024-09-08 00:55:43,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/dff7f109472118e0a3ef88bf89467402d9cbfa93/status HTTP/1.1" 200 None
2024-09-08 00:55:43,594 [ scc.repo] DEBUG - PR 446 dominikl 'Add changelog for upcoming 5.8.5 release'
2024-09-08 00:55:44,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/445 HTTP/1.1" 200 None
2024-09-08 00:55:44,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/445/comments HTTP/1.1" 200 None
2024-09-08 00:55:44,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/f9d5c87518fbe8273e949ab3206a1e23fa4aec8b HTTP/1.1" 200 None
2024-09-08 00:55:45,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/f9d5c87518fbe8273e949ab3206a1e23fa4aec8b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-08 00:55:45,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/f9d5c87518fbe8273e949ab3206a1e23fa4aec8b/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-08 00:55:46,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/444 HTTP/1.1" 200 None
2024-09-08 00:55:46,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/444/comments HTTP/1.1" 200 None
2024-09-08 00:55:47,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/2c097b44fcac5cd272b1c0a05a7336d988b5c65b HTTP/1.1" 200 None
2024-09-08 00:55:47,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/2c097b44fcac5cd272b1c0a05a7336d988b5c65b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-08 00:55:48,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/2c097b44fcac5cd272b1c0a05a7336d988b5c65b/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-08 00:55:48,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/2c097b44fcac5cd272b1c0a05a7336d988b5c65b HTTP/1.1" 200 None
2024-09-08 00:55:49,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/2c097b44fcac5cd272b1c0a05a7336d988b5c65b?per_page=1 HTTP/1.1" 200 None
2024-09-08 00:55:49,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/2c097b44fcac5cd272b1c0a05a7336d988b5c65b HTTP/1.1" 200 None
2024-09-08 00:55:49,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/2c097b44fcac5cd272b1c0a05a7336d988b5c65b/status HTTP/1.1" 200 None
2024-09-08 00:55:49,910 [ scc.repo] DEBUG - PR 444 jburel 'fix endpoint'
2024-09-08 00:55:50,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/443 HTTP/1.1" 200 None
2024-09-08 00:55:50,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/442 HTTP/1.1" 200 None
2024-09-08 00:55:51,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/442/comments HTTP/1.1" 200 None
2024-09-08 00:55:51,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9f3d273acb87527eed99aedd868bf0a4ec1b5861 HTTP/1.1" 200 None
2024-09-08 00:55:52,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9f3d273acb87527eed99aedd868bf0a4ec1b5861/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-08 00:55:52,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9f3d273acb87527eed99aedd868bf0a4ec1b5861/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-08 00:55:53,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9f3d273acb87527eed99aedd868bf0a4ec1b5861 HTTP/1.1" 200 None
2024-09-08 00:55:53,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/9f3d273acb87527eed99aedd868bf0a4ec1b5861?per_page=1 HTTP/1.1" 200 None
2024-09-08 00:55:54,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9f3d273acb87527eed99aedd868bf0a4ec1b5861 HTTP/1.1" 200 None
2024-09-08 00:55:54,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9f3d273acb87527eed99aedd868bf0a4ec1b5861/status HTTP/1.1" 200 None
2024-09-08 00:55:54,540 [ scc.repo] DEBUG - PR 442 dominikl 'Remove duplicate app_name parameter'
2024-09-08 00:55:54,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-09-08 00:55:55,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-09-08 00:55:55,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-09-08 00:55:56,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-09-08 00:55:56,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-09-08 00:55:57,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-09-08 00:55:57,780 [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-09-08 00:55:58,263 [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-09-08 00:55:58,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-09-08 00:55:59,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/9466472925265b0b02b7c054c55d62705a9b8215?per_page=1 HTTP/1.1" 200 None
2024-09-08 00:55:59,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-09-08 00:55:59,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215/status HTTP/1.1" 200 None
2024-09-08 00:55:59,924 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-09-08 00:56:00,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-09-08 00:56:00,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-09-08 00:56:01,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-09-08 00:56:01,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-09-08 00:56:01,750 [ scc.repo] DEBUG ## Branches found:
2024-09-08 00:56:01,750 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:56:01,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:56:01,757 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-08 00:56:01,761 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-08 00:56:01,762 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-08 00:56:01,767 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-08 00:56:01,774 [ scc.git] DEBUG Already up to date.
2024-09-08 00:56:01,774 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-09-08 00:56:02,100 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-09-08 00:56:02,101 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-09-08 00:56:02,126 [ scc.git] DEBUG Calling 'git fetch origin pull/442/head'
2024-09-08 00:56:02,407 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-09-08 00:56:02,407 [ scc.git] DEBUG * branch refs/pull/442/head -> FETCH_HEAD
2024-09-08 00:56:02,412 [ scc.git] DEBUG Calling 'git fetch origin pull/444/head'
2024-09-08 00:56:02,717 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-09-08 00:56:02,718 [ scc.git] DEBUG * branch refs/pull/444/head -> FETCH_HEAD
2024-09-08 00:56:02,725 [ scc.git] DEBUG Calling 'git fetch origin pull/446/head'
2024-09-08 00:56:03,009 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-09-08 00:56:03,009 [ scc.git] DEBUG * branch refs/pull/446/head -> FETCH_HEAD
2024-09-08 00:56:03,016 [ scc.git] DEBUG ## Unique users: []
2024-09-08 00:56:03,016 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:56:03,017 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:56:03,023 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-09-08 00:56:03,031 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:56:03,036 [ 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-09-08 00:56:03,043 [ scc.git] DEBUG Already up to date.
2024-09-08 00:56:03,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:56:03,178 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9f3d273acb87527eed99aedd868bf0a4ec1b5861'
2024-09-08 00:56:03,185 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:56:03,190 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 442 (Remove duplicate app_name parameter) 9f3d273acb87527eed99aedd868bf0a4ec1b5861'
2024-09-08 00:56:03,196 [ scc.git] DEBUG Already up to date.
2024-09-08 00:56:03,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:56:03,556 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2c097b44fcac5cd272b1c0a05a7336d988b5c65b'
2024-09-08 00:56:03,563 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:56:03,568 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 444 (fix endpoint) 2c097b44fcac5cd272b1c0a05a7336d988b5c65b'
2024-09-08 00:56:03,574 [ scc.git] DEBUG Already up to date.
2024-09-08 00:56:03,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:56:03,942 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dff7f109472118e0a3ef88bf89467402d9cbfa93'
2024-09-08 00:56:03,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:56:03,955 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 446 (Add changelog for upcoming 5.8.5 release) dff7f109472118e0a3ef88bf89467402d9cbfa93'
2024-09-08 00:56:03,963 [ scc.git] DEBUG Already up to date.
2024-09-08 00:56:04,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:56:04,331 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-08 00:56:04,376 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:56:04,376 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:56:04,381 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-08 00:56:04,425 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-08 00:56:04,436 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f60759c4e50> has no local changes
2024-09-08 00:56:04,437 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-insight
Excluded PRs:
- PR 445 dominikl 'Bump gateway' (status: cancelled)
- PR 443 Tom-TBT 'Perceptibly uniform luts for OMERO.insight' (user: Tom-TBT)
- PR 437 dominikl 'Remove apache commons io' (stage: draft)
- PR 436 dominikl 'Update apache common libs' (exclude comment)
- PR 377 sukunis 'Fix ontology loads' (exclude comment)
- PR 333 jburel 'drop compatibility to test new Jenkins' (exclude comment)
- PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
Already up to date.
Merged PRs:
- PR 385 jburel 'handle case where ROI is not longer in table'
- PR 442 dominikl 'Remove duplicate app_name parameter'
- PR 444 jburel 'fix endpoint'
- PR 446 dominikl 'Add changelog for upcoming 5.8.5 release'
Generated by OMERO-insight-push#166 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/166/)'
2024-09-08 00:56:04,462 [ scc.git] DEBUG [detached HEAD 7bdd155a8] merge master -Dorg -Ssuccess-only
2024-09-08 00:56:04,462 [ scc.merge] INFO Repository: ome/omero-insight
2024-09-08 00:56:04,462 [ scc.merge] INFO Excluded PRs:
2024-09-08 00:56:04,462 [ scc.merge] INFO - PR 445 dominikl 'Bump gateway' (status: cancelled)
2024-09-08 00:56:04,462 [ scc.merge] INFO - PR 443 Tom-TBT 'Perceptibly uniform luts for OMERO.insight' (user: Tom-TBT)
2024-09-08 00:56:04,462 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-09-08 00:56:04,462 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs' (exclude comment)
2024-09-08 00:56:04,462 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-09-08 00:56:04,462 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins' (exclude comment)
2024-09-08 00:56:04,462 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-09-08 00:56:04,462 [ scc.merge] INFO Already up to date.
2024-09-08 00:56:04,462 [ scc.merge] INFO
2024-09-08 00:56:04,462 [ scc.merge] INFO Merged PRs:
2024-09-08 00:56:04,462 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-09-08 00:56:04,462 [ scc.merge] INFO - PR 442 dominikl 'Remove duplicate app_name parameter'
2024-09-08 00:56:04,462 [ scc.merge] INFO - PR 444 jburel 'fix endpoint'
2024-09-08 00:56:04,462 [ scc.merge] INFO - PR 446 dominikl 'Add changelog for upcoming 5.8.5 release'
2024-09-08 00:56:04,462 [ scc.merge] INFO
2024-09-08 00:56:04,463 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-08 00:56:04,463 [ scc.git] DEBUG Calling 'git remote'
Update component versions
Updating omero-gateway from 5.9.3 to 5.9.4-SNAPSHOT
Commit all component version changes
[detached HEAD 7304f8a7a] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
2024-09-08 00:56:10,743 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-insight/tree/merge_ci
![[Jenkins]](/jenkins/static/03a0bb70/images/svgs/logo.svg){kind=logo}
