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-05-29 00:58:05,649 [ scc.config] DEBUG Found github.token
2024-05-29 00:58:05,654 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-29 00:58:05,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:58:06,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:58:06,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-29 00:58:06,701 [ scc.gh] DEBUG 3325 remaining from 5000 (Reset at 01:05
2024-05-29 00:58:06,702 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-29 00:58:06,707 [ scc.git] DEBUG Check current status
2024-05-29 00:58:06,707 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-29 00:58:06,711 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-05-29 00:58:06,711 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-29 00:58:06,752 [ scc.config] DEBUG Found remote.origin.url
2024-05-29 00:58:07,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-05-29 00:58:07,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-29 00:58:08,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-29 00:58:08,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-29 00:58:09,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-29 00:58:09,015 [ scc.git] DEBUG Resetting...
2024-05-29 00:58:09,015 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-29 00:58:09,032 [ scc.git] DEBUG HEAD is now at efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-05-29 00:58:09,032 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-29 00:58:09,072 [ scc.git] DEBUG Check current status
2024-05-29 00:58:09,073 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-29 00:58:09,077 [ scc.git] DEBUG efbf7e35c Bump version: 5.8.4 → 5.8.5-SNAPSHOT
2024-05-29 00:58:09,077 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-29 00:58:09,116 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-29 00:58:09,116 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-29 00:58:09,116 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-29 00:58:09,116 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-29 00:58:09,116 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-29 00:58:09,116 [ scc.repo] DEBUG ## PRs found:
2024-05-29 00:58:09,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-05-29 00:58:10,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-05-29 00:58:10,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-05-29 00:58:11,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-05-29 00:58:11,043 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs'
2024-05-29 00:58:11,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-05-29 00:58:11,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-05-29 00:58:11,982 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-05-29 00:58:12,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-05-29 00:58:12,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-05-29 00:58:12,895 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-05-29 00:58:13,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-05-29 00:58:13,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-05-29 00:58:13,906 [ scc.repo] DEBUG ## Branches found:
2024-05-29 00:58:13,907 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:58:13,907 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:58:13,913 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-29 00:58:13,917 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-29 00:58:13,917 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-29 00:58:13,920 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-29 00:58:13,925 [ scc.git] DEBUG Already up to date.
2024-05-29 00:58:13,925 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head'
2024-05-29 00:58:14,314 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-29 00:58:14,315 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD
2024-05-29 00:58:14,321 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-05-29 00:58:14,773 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-29 00:58:14,773 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-05-29 00:58:14,778 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head'
2024-05-29 00:58:15,156 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-29 00:58:15,157 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD
2024-05-29 00:58:15,162 [ scc.git] DEBUG ## Unique users: []
2024-05-29 00:58:15,162 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:58:15,162 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:58:15,167 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-05-29 00:58:15,174 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:58:15,178 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 333 (drop compatibility to test new Jenkins) b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-05-29 00:58:15,237 [ scc.git] DEBUG Auto-merging build.gradle
2024-05-29 00:58:15,240 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-29 00:58:15,243 [ scc.git] DEBUG build.gradle | 8 ++++----
2024-05-29 00:58:15,243 [ scc.git] DEBUG 1 file changed, 4 insertions(+), 4 deletions(-)
2024-05-29 00:58:15,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:58:15,406 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-05-29 00:58:15,416 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:58:15,421 [ 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-05-29 00:58:15,600 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-29 00:58:15,604 [ scc.git] DEBUG .../shoola/agents/measurement/view/ServerROITable.java | 13 ++++++++++---
2024-05-29 00:58:15,604 [ scc.git] DEBUG 1 file changed, 10 insertions(+), 3 deletions(-)
2024-05-29 00:58:15,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:58:15,819 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9'
2024-05-29 00:58:15,826 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:58:15,831 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9'
2024-05-29 00:58:15,868 [ scc.git] DEBUG Auto-merging build.gradle
2024-05-29 00:58:15,870 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-29 00:58:15,873 [ scc.git] DEBUG build.gradle | 3 ++-
2024-05-29 00:58:15,873 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 1 deletion(-)
2024-05-29 00:58:16,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:58:16,232 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-29 00:58:16,284 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:58:16,285 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:58:16,289 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-29 00:58:16,314 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc2f6ff52e0> has no local changes
2024-05-29 00:58:16,315 [ 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#74 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/74/)'
2024-05-29 00:58:16,327 [ scc.git] DEBUG [detached HEAD 7b62d6f77] merge master -Dorg -Snone
2024-05-29 00:58:16,327 [ scc.merge] INFO Repository: ome/omero-insight
2024-05-29 00:58:16,327 [ scc.merge] INFO Excluded PRs:
2024-05-29 00:58:16,327 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-05-29 00:58:16,327 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-05-29 00:58:16,327 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-05-29 00:58:16,327 [ scc.merge] INFO Already up to date.
2024-05-29 00:58:16,327 [ scc.merge] INFO
2024-05-29 00:58:16,327 [ scc.merge] INFO Merged PRs:
2024-05-29 00:58:16,327 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-05-29 00:58:16,327 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-05-29 00:58:16,327 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs'
2024-05-29 00:58:16,327 [ scc.merge] INFO
2024-05-29 00:58:16,327 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-29 00:58:16,327 [ scc.git] DEBUG Calling 'git remote'
Merge all submodules2024-05-29 00:58:16,801 [ scc.config] DEBUG Found github.token
2024-05-29 00:58:16,804 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-29 00:58:16,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:58:17,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:58:17,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-29 00:58:17,814 [ scc.gh] DEBUG 3282 remaining from 5000 (Reset at 01:05
2024-05-29 00:58:17,814 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-29 00:58:17,819 [ scc.git] DEBUG Check current status
2024-05-29 00:58:17,819 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-29 00:58:17,822 [ scc.git] DEBUG 7b62d6f77 merge master -Dorg -Snone
2024-05-29 00:58:17,823 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-29 00:58:17,863 [ scc.config] DEBUG Found remote.origin.url
2024-05-29 00:58:18,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight HTTP/1.1" 200 None
2024-05-29 00:58:18,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-29 00:58:19,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-29 00:58:19,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-29 00:58:20,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-29 00:58:20,021 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-29 00:58:20,065 [ scc.git] DEBUG Resetting...
2024-05-29 00:58:20,065 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-29 00:58:20,082 [ scc.git] DEBUG HEAD is now at 7b62d6f77 merge master -Dorg -Snone
2024-05-29 00:58:20,083 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-29 00:58:20,122 [ scc.git] DEBUG Check current status
2024-05-29 00:58:20,123 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-29 00:58:20,126 [ scc.git] DEBUG 7b62d6f77 merge master -Dorg -Snone
2024-05-29 00:58:20,127 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-29 00:58:20,168 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-29 00:58:20,168 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-29 00:58:20,168 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-29 00:58:20,168 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-29 00:58:20,168 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-29 00:58:20,168 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-05-29 00:58:20,169 [ scc.repo] DEBUG ## PRs found:
2024-05-29 00:58:20,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/pulls HTTP/1.1" 200 None
2024-05-29 00:58:21,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/437 HTTP/1.1" 200 None
2024-05-29 00:58:21,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436 HTTP/1.1" 200 None
2024-05-29 00:58:21,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/436/comments HTTP/1.1" 200 None
2024-05-29 00:58:22,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-05-29 00:58:22,933 [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-05-29 00:58:23,422 [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-05-29 00:58:23,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-05-29 00:58:24,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/e43ef9b64e4734d327b92745588603a350b420c9?per_page=1 HTTP/1.1" 200 None
2024-05-29 00:58:24,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9 HTTP/1.1" 200 None
2024-05-29 00:58:25,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/e43ef9b64e4734d327b92745588603a350b420c9/status HTTP/1.1" 200 None
2024-05-29 00:58:25,334 [ scc.repo] DEBUG - PR 436 dominikl 'Update apache common libs'
2024-05-29 00:58:25,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385 HTTP/1.1" 200 None
2024-05-29 00:58:26,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/385/comments HTTP/1.1" 200 None
2024-05-29 00:58:26,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-05-29 00:58:27,297 [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-05-29 00:58:27,802 [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-05-29 00:58:28,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-05-29 00:58:28,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/9466472925265b0b02b7c054c55d62705a9b8215?per_page=1 HTTP/1.1" 200 None
2024-05-29 00:58:29,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215 HTTP/1.1" 200 None
2024-05-29 00:58:29,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/9466472925265b0b02b7c054c55d62705a9b8215/status HTTP/1.1" 200 None
2024-05-29 00:58:29,598 [ scc.repo] DEBUG - PR 385 jburel 'handle case where ROI is not longer in table'
2024-05-29 00:58:30,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333 HTTP/1.1" 200 None
2024-05-29 00:58:30,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/333/comments HTTP/1.1" 200 None
2024-05-29 00:58:31,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None
2024-05-29 00:58:31,502 [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-05-29 00:58:32,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/commits/b66e93349e2ddb5c1908f922c7c63a46722bd48e HTTP/1.1" 200 None
2024-05-29 00:58:32,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/statuses/b66e93349e2ddb5c1908f922c7c63a46722bd48e?per_page=1 HTTP/1.1" 200 2
2024-05-29 00:58:32,429 [ scc.repo] DEBUG - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-05-29 00:58:32,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310 HTTP/1.1" 200 None
2024-05-29 00:58:33,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-insight/issues/310/comments HTTP/1.1" 200 None
2024-05-29 00:58:33,477 [ scc.repo] DEBUG ## Branches found:
2024-05-29 00:58:33,478 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:58:33,478 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:58:33,488 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-29 00:58:33,494 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-29 00:58:33,494 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-29 00:58:33,500 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-29 00:58:33,508 [ scc.git] DEBUG Already up to date.
2024-05-29 00:58:33,509 [ scc.git] DEBUG Calling 'git fetch origin pull/333/head'
2024-05-29 00:58:33,875 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-29 00:58:33,876 [ scc.git] DEBUG * branch refs/pull/333/head -> FETCH_HEAD
2024-05-29 00:58:33,882 [ scc.git] DEBUG Calling 'git fetch origin pull/385/head'
2024-05-29 00:58:34,263 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-29 00:58:34,264 [ scc.git] DEBUG * branch refs/pull/385/head -> FETCH_HEAD
2024-05-29 00:58:34,269 [ scc.git] DEBUG Calling 'git fetch origin pull/436/head'
2024-05-29 00:58:34,641 [ scc.git] DEBUG From https://github.com/ome/omero-insight
2024-05-29 00:58:34,642 [ scc.git] DEBUG * branch refs/pull/436/head -> FETCH_HEAD
2024-05-29 00:58:34,647 [ scc.git] DEBUG ## Unique users: []
2024-05-29 00:58:34,647 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:58:34,647 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:58:34,651 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-05-29 00:58:34,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:58:34,662 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 333 (drop compatibility to test new Jenkins) b66e93349e2ddb5c1908f922c7c63a46722bd48e'
2024-05-29 00:58:34,668 [ scc.git] DEBUG Already up to date.
2024-05-29 00:58:34,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:58:34,822 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9466472925265b0b02b7c054c55d62705a9b8215'
2024-05-29 00:58:34,829 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:58:34,834 [ 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-05-29 00:58:34,840 [ scc.git] DEBUG Already up to date.
2024-05-29 00:58:35,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:58:35,240 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e43ef9b64e4734d327b92745588603a350b420c9'
2024-05-29 00:58:35,247 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:58:35,251 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 436 (Update apache common libs) e43ef9b64e4734d327b92745588603a350b420c9'
2024-05-29 00:58:35,257 [ scc.git] DEBUG Already up to date.
2024-05-29 00:58:35,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-29 00:58:35,664 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-29 00:58:35,707 [ scc.git] DEBUG Get sha1 of %s
2024-05-29 00:58:35,707 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-29 00:58:35,712 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-29 00:58:35,753 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-29 00:58:35,765 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1081caf2e0> has no local changes
2024-05-29 00:58:35,765 [ 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#74 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-insight-push/74/)'
2024-05-29 00:58:35,779 [ scc.git] DEBUG [detached HEAD 22e02b5f1] merge master -Dorg -Ssuccess-only
2024-05-29 00:58:35,779 [ scc.merge] INFO Repository: ome/omero-insight
2024-05-29 00:58:35,780 [ scc.merge] INFO Excluded PRs:
2024-05-29 00:58:35,780 [ scc.merge] INFO - PR 437 dominikl 'Remove apache commons io' (stage: draft)
2024-05-29 00:58:35,780 [ scc.merge] INFO - PR 377 sukunis 'Fix ontology loads' (exclude comment)
2024-05-29 00:58:35,780 [ scc.merge] INFO - PR 310 dominikl 'Add depth option to importer and include ZarrReader' (exclude comment)
2024-05-29 00:58:35,780 [ scc.merge] INFO Already up to date.
2024-05-29 00:58:35,780 [ scc.merge] INFO
2024-05-29 00:58:35,780 [ scc.merge] INFO Merged PRs:
2024-05-29 00:58:35,780 [ scc.merge] INFO - PR 333 jburel 'drop compatibility to test new Jenkins'
2024-05-29 00:58:35,780 [ scc.merge] INFO - PR 385 jburel 'handle case where ROI is not longer in table'
2024-05-29 00:58:35,780 [ scc.merge] INFO - PR 436 dominikl 'Update apache common libs'
2024-05-29 00:58:35,780 [ scc.merge] INFO
2024-05-29 00:58:35,780 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-29 00:58:35,780 [ 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 01d44c2cc] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
2024-05-29 00:58:42,284 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-insight/tree/merge_ci