Skipping 183 KB..
Full Log2025-03-01 00:47:07,162 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-01 00:47:07,204 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:47:07,204 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:07,210 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-01 00:47:07,252 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-01 00:47:07,260 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28d2967940> has no local changes
2025-03-01 00:47:07,261 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Generated by OMERO-plugins-push#348 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/)'
2025-03-01 00:47:07,270 [ scc.git] DEBUG [detached HEAD c090cc3] merge master -Dorg -Ssuccess-only
2025-03-01 00:47:07,270 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:47:07,271 [ scc.repo] DEBUG ## PRs found:
2025-03-01 00:47:07,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:07,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-03-01 00:47:08,018 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:08,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/503 HTTP/1.1" 200 None
2025-03-01 00:47:08,535 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:08,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/503/comments HTTP/1.1" 200 None
2025-03-01 00:47:09,005 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:09,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502 HTTP/1.1" 200 None
2025-03-01 00:47:09,507 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:09,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502/comments HTTP/1.1" 200 None
2025-03-01 00:47:09,745 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-01 00:47:09,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:10,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-03-01 00:47:10,657 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:10,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-01 00:47:11,198 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:11,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-01 00:47:11,759 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:11,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-03-01 00:47:12,231 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:12,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/45d08b7e29871ecff0386975c975dacd0865bcc4?per_page=1 HTTP/1.1" 200 2
2025-03-01 00:47:12,399 [ scc.repo] DEBUG - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-01 00:47:12,651 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:12,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-03-01 00:47:12,890 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-01 00:47:13,141 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:13,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-01 00:47:13,887 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:14,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-01 00:47:14,426 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:14,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-01 00:47:14,963 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:15,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-01 00:47:15,412 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:15,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2025-03-01 00:47:15,653 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-01 00:47:15,905 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:16,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-03-01 00:47:16,416 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:16,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-03-01 00:47:16,895 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:17,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-03-01 00:47:17,373 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:17,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-03-01 00:47:17,876 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:18,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-01 00:47:18,403 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:18,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-01 00:47:18,895 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:19,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-01 00:47:19,366 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:19,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-01 00:47:19,900 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:20,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2025-03-01 00:47:20,072 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-01 00:47:20,324 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:20,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-03-01 00:47:20,832 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:21,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-03-01 00:47:21,334 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:21,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-01 00:47:21,858 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:22,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-01 00:47:22,373 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:22,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-01 00:47:22,898 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:23,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-01 00:47:23,337 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:23,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2025-03-01 00:47:23,522 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-03-01 00:47:23,774 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:24,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-03-01 00:47:24,259 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:24,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-03-01 00:47:24,756 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:25,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-01 00:47:25,285 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:25,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-01 00:47:25,764 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:26,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-01 00:47:26,284 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:26,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2025-03-01 00:47:26,454 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-03-01 00:47:26,454 [ scc.repo] DEBUG ## Branches found:
2025-03-01 00:47:26,454 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-01 00:47:26,455 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:47:26,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:26,461 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-01 00:47:26,467 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-01 00:47:26,467 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-01 00:47:26,474 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-01 00:47:26,481 [ scc.git] DEBUG Already up to date.
2025-03-01 00:47:26,481 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-03-01 00:47:28,869 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-01 00:47:28,869 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-03-01 00:47:28,874 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-03-01 00:47:30,244 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-01 00:47:30,244 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-03-01 00:47:30,249 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-03-01 00:47:30,598 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-01 00:47:30,598 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-03-01 00:47:30,603 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-03-01 00:47:30,895 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-01 00:47:30,895 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-03-01 00:47:30,900 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-03-01 00:47:31,178 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-01 00:47:31,178 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-03-01 00:47:31,183 [ scc.git] DEBUG ## Unique users: []
2025-03-01 00:47:31,183 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:47:31,183 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:31,190 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-01 00:47:31,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:31,203 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-01 00:47:31,350 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-03-01 00:47:31,351 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-03-01 00:47:31,351 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-01 00:47:31,356 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-03-01 00:47:31,356 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-03-01 00:47:31,356 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-03-01 00:47:31,359 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:31,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:47:31,526 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-01 00:47:31,536 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:31,542 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-01 00:47:31,849 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-03-01 00:47:31,849 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-03-01 00:47:31,849 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-03-01 00:47:31,850 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-03-01 00:47:31,850 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-01 00:47:31,854 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-03-01 00:47:31,854 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-03-01 00:47:31,854 [ scc.git] DEBUG src/app/header.html | 5 +
2025-03-01 00:47:31,854 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-03-01 00:47:31,854 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-03-01 00:47:31,854 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-03-01 00:47:31,854 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-03-01 00:47:31,855 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-03-01 00:47:31,858 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:32,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:47:32,018 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-01 00:47:32,027 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:32,032 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-01 00:47:32,316 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-03-01 00:47:32,317 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-01 00:47:32,320 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-03-01 00:47:32,320 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-03-01 00:47:32,320 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-03-01 00:47:32,323 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:32,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:47:32,489 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-01 00:47:32,792 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:32,798 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-01 00:47:33,014 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-01 00:47:33,024 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-03-01 00:47:33,024 [ scc.git] DEBUG package.json | 2 +-
2025-03-01 00:47:33,024 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-03-01 00:47:33,027 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:33,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:47:33,184 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-01 00:47:33,197 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:33,202 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-01 00:47:33,395 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-01 00:47:33,396 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-03-01 00:47:33,396 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-01 00:47:33,396 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-01 00:47:33,402 [ scc.git] DEBUG Calling 'git reset --hard f0c84e259c69ff791df29cb906e61e66a45cb1ab'
2025-03-01 00:47:33,414 [ scc.git] DEBUG HEAD is now at f0c84e2 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-03-01 00:47:33,436 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:33,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:47:33,615 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-01 00:47:33,622 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-03-01 00:47:33,627 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#348](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-03-01 00:47:33,632 [ scc.config] DEBUG Found github.token
2025-03-01 00:47:33,632 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-03-01 00:47:33,632 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-01 00:47:33,674 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:47:33,675 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:33,680 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-01 00:47:33,721 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-01 00:47:33,732 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28d00f0520> has no local changes
2025-03-01 00:47:33,732 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#348 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/)'
2025-03-01 00:47:33,745 [ scc.git] DEBUG [detached HEAD 150698e] merge master -Dorg -Ssuccess-only
2025-03-01 00:47:33,745 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:47:33,745 [ scc.repo] DEBUG ## PRs found:
2025-03-01 00:47:33,868 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:34,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-03-01 00:47:34,379 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:34,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-03-01 00:47:34,853 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:35,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-03-01 00:47:35,382 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:35,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-01 00:47:35,926 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:36,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-01 00:47:36,417 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:36,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-01 00:47:37,052 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:37,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-03-01 00:47:37,220 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-03-01 00:47:37,220 [ scc.repo] DEBUG ## Branches found:
2025-03-01 00:47:37,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-01 00:47:37,220 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:47:37,220 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:37,227 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-01 00:47:37,233 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-01 00:47:37,233 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-01 00:47:37,241 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-01 00:47:37,248 [ scc.git] DEBUG Already up to date.
2025-03-01 00:47:37,248 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-03-01 00:47:38,209 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-03-01 00:47:38,209 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-03-01 00:47:38,214 [ scc.git] DEBUG ## Unique users: []
2025-03-01 00:47:38,214 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:47:38,214 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:38,220 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-01 00:47:38,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:38,232 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-01 00:47:38,244 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-01 00:47:38,247 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-03-01 00:47:38,247 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-03-01 00:47:38,247 [ scc.git] DEBUG requirements.txt | 2 +-
2025-03-01 00:47:38,247 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-03-01 00:47:38,247 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-03-01 00:47:38,247 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-03-01 00:47:38,250 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:38,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:47:38,409 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-01 00:47:38,459 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:47:38,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:38,466 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-01 00:47:38,507 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-01 00:47:38,515 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28d297eaf0> has no local changes
2025-03-01 00:47:38,515 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Generated by OMERO-plugins-push#348 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/)'
2025-03-01 00:47:38,525 [ scc.git] DEBUG [detached HEAD 738bd75] merge master -Dorg -Ssuccess-only
2025-03-01 00:47:38,525 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:47:38,525 [ scc.repo] DEBUG ## PRs found:
2025-03-01 00:47:38,661 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:38,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-03-01 00:47:39,219 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:39,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-03-01 00:47:39,750 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:40,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-03-01 00:47:40,289 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:40,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-01 00:47:40,820 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:41,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-01 00:47:41,299 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:41,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-01 00:47:41,770 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:41,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-03-01 00:47:41,946 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-01 00:47:42,198 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:42,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-03-01 00:47:42,683 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:42,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-03-01 00:47:43,147 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:43,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-01 00:47:43,719 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:43,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-01 00:47:44,233 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:44,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-01 00:47:44,772 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:44,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-03-01 00:47:44,947 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-01 00:47:44,947 [ scc.repo] DEBUG ## Branches found:
2025-03-01 00:47:44,947 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-01 00:47:44,947 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:47:44,947 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:44,953 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-01 00:47:44,959 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-01 00:47:44,959 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-01 00:47:44,965 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-01 00:47:44,971 [ scc.git] DEBUG Already up to date.
2025-03-01 00:47:44,972 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-03-01 00:47:45,819 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-01 00:47:45,819 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-03-01 00:47:45,824 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-03-01 00:47:46,463 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-01 00:47:46,463 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-03-01 00:47:46,469 [ scc.git] DEBUG ## Unique users: []
2025-03-01 00:47:46,469 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:47:46,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:46,475 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-01 00:47:46,483 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:46,488 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-01 00:47:46,734 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-03-01 00:47:46,734 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-03-01 00:47:46,735 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-01 00:47:46,735 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-01 00:47:46,735 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-01 00:47:46,735 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-01 00:47:46,743 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-01 00:47:46,752 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-01 00:47:46,756 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:46,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:47:46,919 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-01 00:47:46,928 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-01 00:47:46,981 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#348](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-03-01 00:47:46,987 [ scc.config] DEBUG Found github.token
2025-03-01 00:47:46,988 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-03-01 00:47:46,988 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-01 00:47:46,995 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:47,002 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-01 00:47:47,069 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-01 00:47:47,069 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-01 00:47:47,070 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-03-01 00:47:47,070 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-01 00:47:47,070 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-01 00:47:47,077 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-01 00:47:47,087 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-01 00:47:47,171 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:47,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:47:47,369 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-01 00:47:47,377 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-01 00:47:47,384 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#348](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2025-03-01 00:47:47,389 [ scc.config] DEBUG Found github.token
2025-03-01 00:47:47,390 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-03-01 00:47:47,390 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-01 00:47:47,433 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:47:47,433 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:47,441 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-01 00:47:47,507 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-01 00:47:47,516 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28d1918fd0> has no local changes
2025-03-01 00:47:47,516 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Generated by OMERO-plugins-push#348 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/)'
2025-03-01 00:47:47,528 [ scc.git] DEBUG [detached HEAD 4f4c679] merge master -Dorg -Ssuccess-only
2025-03-01 00:47:47,528 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:47:47,529 [ scc.repo] DEBUG ## PRs found:
2025-03-01 00:47:47,621 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:47,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-03-01 00:47:48,178 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:48,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-03-01 00:47:48,400 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-01 00:47:48,651 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:49,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-01 00:47:49,296 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:49,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-01 00:47:49,890 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:50,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-01 00:47:50,412 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:50,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-01 00:47:50,979 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:51,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-03-01 00:47:51,157 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-01 00:47:51,408 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:51,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-03-01 00:47:51,901 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:52,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-03-01 00:47:52,369 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:52,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-03-01 00:47:52,853 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:53,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-03-01 00:47:53,352 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:53,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-03-01 00:47:53,862 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:54,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-03-01 00:47:54,341 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:54,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-03-01 00:47:54,631 [ scc.repo] DEBUG ## Branches found:
2025-03-01 00:47:54,632 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-01 00:47:54,632 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:47:54,632 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:54,638 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-01 00:47:54,642 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-01 00:47:54,643 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-01 00:47:54,648 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-01 00:47:54,653 [ scc.git] DEBUG Already up to date.
2025-03-01 00:47:54,653 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-03-01 00:47:54,966 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-01 00:47:54,966 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-03-01 00:47:54,971 [ scc.git] DEBUG ## Unique users: []
2025-03-01 00:47:54,971 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:47:54,971 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:54,978 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-01 00:47:54,984 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:54,990 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 140 (Bump vite from 4.2.3 to 4.5.9) 6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-01 00:47:55,106 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-01 00:47:55,110 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-03-01 00:47:55,110 [ scc.git] DEBUG package.json | 2 +-
2025-03-01 00:47:55,110 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-03-01 00:47:55,113 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:55,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:47:55,332 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-01 00:47:55,372 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:47:55,373 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:55,379 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-01 00:47:55,418 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-01 00:47:55,441 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28d1947880> has no local changes
2025-03-01 00:47:55,442 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
Generated by OMERO-plugins-push#348 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/)'
2025-03-01 00:47:55,451 [ scc.git] DEBUG [detached HEAD 9cbd91f] merge master -Dorg -Ssuccess-only
2025-03-01 00:47:55,452 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:47:55,452 [ scc.repo] DEBUG ## PRs found:
2025-03-01 00:47:55,585 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:55,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-03-01 00:47:55,772 [ scc.repo] DEBUG ## Branches found:
2025-03-01 00:47:55,772 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-01 00:47:55,772 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:47:55,772 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:55,778 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-01 00:47:55,784 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-01 00:47:55,784 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-01 00:47:55,790 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-01 00:47:55,796 [ scc.git] DEBUG Already up to date.
2025-03-01 00:47:55,796 [ scc.git] DEBUG ## Unique users: []
2025-03-01 00:47:55,796 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:47:55,796 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:55,801 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-01 00:47:55,843 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:47:55,844 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:55,850 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-01 00:47:55,892 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-01 00:47:55,899 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28d190f220> has no local changes
2025-03-01 00:47:55,899 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-prometheus-tools
Already up to date.
Generated by OMERO-plugins-push#348 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/)'
2025-03-01 00:47:55,908 [ scc.git] DEBUG [detached HEAD ad8d0f3] merge master -Dorg -Ssuccess-only
2025-03-01 00:47:55,908 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:47:55,908 [ scc.repo] DEBUG ## PRs found:
2025-03-01 00:47:56,024 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:56,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-03-01 00:47:56,555 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:56,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-03-01 00:47:56,856 [ scc.repo] DEBUG ## Branches found:
2025-03-01 00:47:56,856 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-01 00:47:56,856 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:47:56,856 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:56,863 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-01 00:47:56,868 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-01 00:47:56,868 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-01 00:47:56,874 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-01 00:47:56,880 [ scc.git] DEBUG Already up to date.
2025-03-01 00:47:56,881 [ scc.git] DEBUG ## Unique users: []
2025-03-01 00:47:56,881 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:47:56,881 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:56,887 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-01 00:47:56,927 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:47:56,927 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:47:56,933 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-01 00:47:56,974 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-01 00:47:56,981 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28d1918c70> has no local changes
2025-03-01 00:47:56,982 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Generated by OMERO-plugins-push#348 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/)'
2025-03-01 00:47:56,991 [ scc.git] DEBUG [detached HEAD 960d446] merge master -Dorg -Ssuccess-only
2025-03-01 00:47:56,992 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:47:56,992 [ scc.repo] DEBUG ## PRs found:
2025-03-01 00:47:57,108 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:57,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-03-01 00:47:57,658 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:57,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-03-01 00:47:58,174 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:58,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-03-01 00:47:58,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:58,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-01 00:47:59,210 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:59,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-01 00:47:59,730 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:47:59,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-01 00:48:00,169 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:00,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-03-01 00:48:00,348 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-01 00:48:00,348 [ scc.repo] DEBUG ## Branches found:
2025-03-01 00:48:00,348 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-01 00:48:00,348 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:00,348 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:00,359 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-01 00:48:00,366 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-01 00:48:00,367 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-01 00:48:00,380 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-01 00:48:00,386 [ scc.git] DEBUG Already up to date.
2025-03-01 00:48:00,386 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-03-01 00:48:00,808 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-03-01 00:48:00,808 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-03-01 00:48:00,816 [ scc.git] DEBUG ## Unique users: []
2025-03-01 00:48:00,816 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:00,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:00,824 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-01 00:48:00,831 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:00,837 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-01 00:48:01,044 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-03-01 00:48:01,044 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-03-01 00:48:01,044 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-03-01 00:48:01,044 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-03-01 00:48:01,044 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-03-01 00:48:01,044 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-03-01 00:48:01,044 [ scc.git] DEBUG Auto-merging setup.py
2025-03-01 00:48:01,044 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-03-01 00:48:01,044 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-01 00:48:01,045 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-01 00:48:01,052 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-01 00:48:01,060 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-03-01 00:48:01,062 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:01,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:01,230 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-01 00:48:01,238 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-01 00:48:01,336 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#348](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- setup.py
- omero_signup/views.py
--conflicts
2025-03-01 00:48:01,343 [ scc.config] DEBUG Found github.token
2025-03-01 00:48:01,344 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-03-01 00:48:01,344 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-01 00:48:01,390 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:01,391 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:01,397 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-01 00:48:01,455 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-01 00:48:01,463 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28d00d1fd0> has no local changes
2025-03-01 00:48:01,463 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Generated by OMERO-plugins-push#348 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/)'
2025-03-01 00:48:01,474 [ scc.git] DEBUG [detached HEAD 6552549] merge master -Dorg -Ssuccess-only
2025-03-01 00:48:01,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:01,474 [ scc.repo] DEBUG ## PRs found:
2025-03-01 00:48:01,481 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:01,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-03-01 00:48:02,091 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:02,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-03-01 00:48:02,594 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:02,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-03-01 00:48:03,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:03,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-03-01 00:48:03,633 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:03,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-01 00:48:04,162 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:04,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-01 00:48:04,708 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:04,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-03-01 00:48:05,230 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:05,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-03-01 00:48:05,691 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:05,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-03-01 00:48:06,171 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:06,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-03-01 00:48:06,646 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:06,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-01 00:48:07,212 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:07,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-01 00:48:07,712 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:07,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-01 00:48:08,249 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:08,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-03-01 00:48:08,416 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-01 00:48:08,416 [ scc.repo] DEBUG ## Branches found:
2025-03-01 00:48:08,416 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-01 00:48:08,416 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:08,416 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:08,422 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-01 00:48:08,427 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-01 00:48:08,427 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-01 00:48:08,432 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-01 00:48:08,438 [ scc.git] DEBUG Already up to date.
2025-03-01 00:48:08,439 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-03-01 00:48:08,853 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-03-01 00:48:08,854 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-03-01 00:48:08,858 [ scc.git] DEBUG ## Unique users: []
2025-03-01 00:48:08,858 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:08,859 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:08,865 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-03-01 00:48:08,873 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:08,878 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2025-03-01 00:48:08,895 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-01 00:48:08,898 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-03-01 00:48:08,898 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-03-01 00:48:08,898 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-03-01 00:48:08,898 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-03-01 00:48:08,898 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-03-01 00:48:08,898 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-03-01 00:48:08,898 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-03-01 00:48:08,898 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-03-01 00:48:08,899 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-03-01 00:48:08,899 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-03-01 00:48:08,899 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-03-01 00:48:08,899 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-03-01 00:48:08,899 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-03-01 00:48:08,900 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-03-01 00:48:08,900 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-03-01 00:48:08,900 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-03-01 00:48:08,902 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:08,902 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-03-01 00:48:08,902 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-03-01 00:48:08,902 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-03-01 00:48:08,902 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-03-01 00:48:08,902 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-03-01 00:48:08,902 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-03-01 00:48:08,902 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-03-01 00:48:08,902 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-03-01 00:48:08,902 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-03-01 00:48:08,902 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-03-01 00:48:08,902 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-03-01 00:48:08,902 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-03-01 00:48:08,902 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-03-01 00:48:08,902 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-03-01 00:48:08,902 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-03-01 00:48:08,902 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-03-01 00:48:08,902 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-03-01 00:48:08,902 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-03-01 00:48:08,902 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-03-01 00:48:08,902 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-03-01 00:48:08,902 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-03-01 00:48:08,902 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-03-01 00:48:08,903 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-03-01 00:48:08,903 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-03-01 00:48:08,903 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-03-01 00:48:08,903 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-03-01 00:48:08,903 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-03-01 00:48:08,903 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-03-01 00:48:08,903 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-03-01 00:48:09,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:09,071 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-01 00:48:09,115 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:09,115 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:09,121 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-01 00:48:09,162 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-01 00:48:09,170 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28d1918a60> has no local changes
2025-03-01 00:48:09,170 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#348 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/)'
2025-03-01 00:48:09,179 [ scc.git] DEBUG [detached HEAD a952ba7] merge master -Dorg -Ssuccess-only
2025-03-01 00:48:09,180 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:09,180 [ scc.repo] DEBUG ## PRs found:
2025-03-01 00:48:09,323 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:09,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-03-01 00:48:09,516 [ scc.repo] DEBUG ## Branches found:
2025-03-01 00:48:09,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-01 00:48:09,517 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:09,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:09,523 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-01 00:48:09,529 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-01 00:48:09,529 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-01 00:48:09,535 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-01 00:48:09,542 [ scc.git] DEBUG Already up to date.
2025-03-01 00:48:09,542 [ scc.git] DEBUG ## Unique users: []
2025-03-01 00:48:09,542 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:09,542 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:09,548 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-01 00:48:09,594 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:09,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:09,601 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-01 00:48:09,642 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-01 00:48:09,649 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28d00d8250> has no local changes
2025-03-01 00:48:09,649 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-upload
Already up to date.
Generated by OMERO-plugins-push#348 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/)'
2025-03-01 00:48:09,658 [ scc.git] DEBUG [detached HEAD 278c26c] merge master -Dorg -Ssuccess-only
2025-03-01 00:48:09,659 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:09,659 [ scc.repo] DEBUG ## PRs found:
2025-03-01 00:48:09,769 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:10,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-03-01 00:48:10,313 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:10,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-03-01 00:48:10,884 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:11,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-03-01 00:48:11,342 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:11,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-01 00:48:11,881 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:12,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-01 00:48:12,418 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:12,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-01 00:48:12,931 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:13,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-01 00:48:13,470 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:13,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-03-01 00:48:13,658 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-03-01 00:48:13,659 [ scc.repo] DEBUG ## Branches found:
2025-03-01 00:48:13,659 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-01 00:48:13,659 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:13,659 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:13,665 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-01 00:48:13,670 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-01 00:48:13,670 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-01 00:48:13,675 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-01 00:48:13,681 [ scc.git] DEBUG Already up to date.
2025-03-01 00:48:13,681 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-03-01 00:48:14,316 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-03-01 00:48:14,316 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-03-01 00:48:14,321 [ scc.git] DEBUG ## Unique users: []
2025-03-01 00:48:14,321 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:14,321 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:14,327 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-03-01 00:48:14,333 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:14,339 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-03-01 00:48:14,482 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-01 00:48:14,485 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-03-01 00:48:14,485 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-03-01 00:48:14,485 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-03-01 00:48:14,485 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-03-01 00:48:14,485 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-03-01 00:48:14,488 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:14,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:14,649 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-01 00:48:14,691 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:14,691 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:14,697 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-01 00:48:14,736 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-01 00:48:14,743 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28d1918a30> has no local changes
2025-03-01 00:48:14,743 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Generated by OMERO-plugins-push#348 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/)'
2025-03-01 00:48:14,751 [ scc.git] DEBUG [detached HEAD 215630d] merge master -Dorg -Ssuccess-only
2025-03-01 00:48:14,752 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:14,752 [ scc.git] INFO Overriding base-branch from master to main
2025-03-01 00:48:14,752 [ scc.repo] DEBUG ## PRs found:
2025-03-01 00:48:14,902 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:15,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-03-01 00:48:15,474 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:15,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-03-01 00:48:15,981 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:16,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-03-01 00:48:16,477 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:16,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-03-01 00:48:17,024 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:17,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-01 00:48:17,553 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:17,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-01 00:48:18,136 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:18,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-03-01 00:48:18,632 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:18,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-03-01 00:48:19,124 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:19,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-03-01 00:48:19,598 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:19,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-01 00:48:20,121 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:20,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-01 00:48:20,624 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:20,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-01 00:48:21,186 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:21,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-03-01 00:48:21,379 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-01 00:48:21,379 [ scc.repo] DEBUG ## Branches found:
2025-03-01 00:48:21,379 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-01 00:48:21,380 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:21,380 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:21,386 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-03-01 00:48:21,392 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-01 00:48:21,392 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-03-01 00:48:21,397 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-03-01 00:48:21,403 [ scc.git] DEBUG Already up to date.
2025-03-01 00:48:21,404 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-03-01 00:48:22,057 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-03-01 00:48:22,057 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-03-01 00:48:22,062 [ scc.git] DEBUG ## Unique users: []
2025-03-01 00:48:22,062 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:22,062 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:22,068 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-01 00:48:22,074 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:22,080 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-01 00:48:22,142 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-03-01 00:48:22,142 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-03-01 00:48:22,142 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-01 00:48:22,143 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-01 00:48:22,149 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-01 00:48:22,156 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-03-01 00:48:22,158 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:22,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:22,313 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-01 00:48:22,320 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-01 00:48:22,326 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#348](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-03-01 00:48:22,332 [ scc.config] DEBUG Found github.token
2025-03-01 00:48:22,333 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-03-01 00:48:22,333 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-01 00:48:22,374 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:22,374 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:22,380 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-01 00:48:22,422 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-01 00:48:22,430 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28d0091100> has no local changes
2025-03-01 00:48:22,430 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Generated by OMERO-plugins-push#348 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/)'
2025-03-01 00:48:22,439 [ scc.git] DEBUG [detached HEAD 0cd586c] merge master -Dorg -Ssuccess-only
2025-03-01 00:48:22,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:22,440 [ scc.repo] DEBUG ## PRs found:
2025-03-01 00:48:22,565 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:22,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-03-01 00:48:22,761 [ scc.repo] DEBUG ## Branches found:
2025-03-01 00:48:22,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-01 00:48:22,761 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:22,761 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:22,768 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-01 00:48:22,773 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-01 00:48:22,773 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-01 00:48:22,778 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-01 00:48:22,784 [ scc.git] DEBUG Already up to date.
2025-03-01 00:48:22,784 [ scc.git] DEBUG ## Unique users: []
2025-03-01 00:48:22,784 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:22,784 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:22,789 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-01 00:48:22,826 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:22,826 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:22,832 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-01 00:48:22,869 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-01 00:48:22,875 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28b07c45b0> has no local changes
2025-03-01 00:48:22,876 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-weberror
Already up to date.
Generated by OMERO-plugins-push#348 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/)'
2025-03-01 00:48:22,884 [ scc.git] DEBUG [detached HEAD 904f7df] merge master -Dorg -Ssuccess-only
2025-03-01 00:48:22,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:22,884 [ scc.repo] DEBUG ## PRs found:
2025-03-01 00:48:23,014 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:23,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-03-01 00:48:23,207 [ scc.repo] DEBUG ## Branches found:
2025-03-01 00:48:23,207 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-01 00:48:23,207 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:23,207 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:23,213 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-01 00:48:23,218 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-01 00:48:23,218 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-01 00:48:23,225 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-01 00:48:23,231 [ scc.git] DEBUG Already up to date.
2025-03-01 00:48:23,231 [ scc.git] DEBUG ## Unique users: []
2025-03-01 00:48:23,232 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:23,232 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:23,237 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-01 00:48:23,280 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:23,281 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:23,287 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-01 00:48:23,328 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-01 00:48:23,336 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28d008f520> has no local changes
2025-03-01 00:48:23,336 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-webtest
Already up to date.
Generated by OMERO-plugins-push#348 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/)'
2025-03-01 00:48:23,345 [ scc.git] DEBUG [detached HEAD 26f3aa8] merge master -Dorg -Ssuccess-only
2025-03-01 00:48:23,345 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:23,345 [ scc.repo] DEBUG ## PRs found:
2025-03-01 00:48:23,459 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:23,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-03-01 00:48:24,002 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:24,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-03-01 00:48:24,497 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:24,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-03-01 00:48:24,952 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:25,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-01 00:48:25,475 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:25,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-01 00:48:25,954 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:26,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-01 00:48:26,508 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:26,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-03-01 00:48:26,693 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-03-01 00:48:26,693 [ scc.repo] DEBUG ## Branches found:
2025-03-01 00:48:26,693 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-01 00:48:26,694 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:26,694 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:26,700 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-01 00:48:26,706 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-01 00:48:26,706 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-01 00:48:26,711 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-01 00:48:26,717 [ scc.git] DEBUG Already up to date.
2025-03-01 00:48:26,717 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-03-01 00:48:27,136 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-03-01 00:48:27,136 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-03-01 00:48:27,141 [ scc.git] DEBUG ## Unique users: []
2025-03-01 00:48:27,142 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:27,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:27,148 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-01 00:48:27,155 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:27,160 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-01 00:48:27,311 [ scc.git] DEBUG Auto-merging Dockerfile
2025-03-01 00:48:27,311 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-03-01 00:48:27,311 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-01 00:48:27,312 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-01 00:48:27,318 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-01 00:48:27,326 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-03-01 00:48:27,329 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:27,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:27,516 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-01 00:48:27,523 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-01 00:48:27,528 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#348](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-03-01 00:48:27,533 [ scc.config] DEBUG Found github.token
2025-03-01 00:48:27,533 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-03-01 00:48:27,534 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-01 00:48:27,575 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:27,575 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:27,582 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-01 00:48:27,630 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-01 00:48:27,638 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28b07c4610> has no local changes
2025-03-01 00:48:27,638 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Generated by OMERO-plugins-push#348 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/)'
2025-03-01 00:48:27,648 [ scc.git] DEBUG [detached HEAD 147a738] merge master -Dorg -Ssuccess-only
2025-03-01 00:48:27,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:27,648 [ scc.git] INFO Overriding base-branch from master to develop
2025-03-01 00:48:27,648 [ scc.repo] DEBUG ## PRs found:
2025-03-01 00:48:27,768 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:28,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-03-01 00:48:28,301 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:28,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-03-01 00:48:28,783 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:28,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-03-01 00:48:29,245 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:29,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-01 00:48:29,772 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:29,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-01 00:48:30,251 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:30,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-01 00:48:30,721 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:30,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-01 00:48:31,173 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:31,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-03-01 00:48:31,354 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-01 00:48:31,606 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:31,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-03-01 00:48:32,094 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:32,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-03-01 00:48:32,561 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:32,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-01 00:48:33,090 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:33,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-01 00:48:33,558 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:33,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-01 00:48:34,008 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:34,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-03-01 00:48:34,192 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-01 00:48:34,443 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:34,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-03-01 00:48:34,943 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:35,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-03-01 00:48:35,503 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:35,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-03-01 00:48:36,004 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:36,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-03-01 00:48:36,245 [ scc.repo] DEBUG ## Branches found:
2025-03-01 00:48:36,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-01 00:48:36,245 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:36,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:36,252 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-03-01 00:48:36,257 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-01 00:48:36,257 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-03-01 00:48:36,263 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-03-01 00:48:36,269 [ scc.git] DEBUG Already up to date.
2025-03-01 00:48:36,269 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-03-01 00:48:37,301 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-01 00:48:37,301 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-03-01 00:48:37,306 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-03-01 00:48:37,841 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-01 00:48:37,841 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-03-01 00:48:37,846 [ scc.git] DEBUG ## Unique users: []
2025-03-01 00:48:37,846 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:37,846 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:37,852 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-01 00:48:37,860 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:37,866 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-01 00:48:37,961 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-03-01 00:48:37,961 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-01 00:48:37,961 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-01 00:48:37,968 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-01 00:48:37,974 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-03-01 00:48:37,977 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:38,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:38,136 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-01 00:48:38,145 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-01 00:48:38,153 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#348](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-03-01 00:48:38,159 [ scc.config] DEBUG Found github.token
2025-03-01 00:48:38,159 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-03-01 00:48:38,159 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-01 00:48:38,168 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:38,174 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-01 00:48:38,197 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-01 00:48:38,200 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-03-01 00:48:38,200 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-03-01 00:48:38,388 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:38,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:38,558 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-01 00:48:38,602 [ scc.git] DEBUG Get sha1 of %s
2025-03-01 00:48:38,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-01 00:48:38,608 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-01 00:48:38,652 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-01 00:48:38,661 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28d000f640> has no local changes
2025-03-01 00:48:38,661 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#348 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/)'
2025-03-01 00:48:38,672 [ scc.git] DEBUG [detached HEAD 32880b9] merge master -Dorg -Ssuccess-only
2025-03-01 00:48:38,672 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:38,673 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-01 00:48:38,756 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-03-01 00:48:38,811 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:38,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:38,999 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-03-01 00:48:39,004 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-03-01 00:48:39,238 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:39,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:39,415 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-03-01 00:48:39,420 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-03-01 00:48:39,655 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:39,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:39,827 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-03-01 00:48:39,832 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-03-01 00:48:40,068 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:40,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:40,279 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-03-01 00:48:40,513 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:40,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:40,688 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-03-01 00:48:40,694 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-03-01 00:48:40,929 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:41,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:41,110 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-03-01 00:48:41,115 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-03-01 00:48:41,348 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:41,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:41,533 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-03-01 00:48:41,539 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-03-01 00:48:41,773 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:41,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:41,963 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-03-01 00:48:41,969 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-03-01 00:48:42,203 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:42,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:42,379 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-03-01 00:48:42,385 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-03-01 00:48:42,620 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:42,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:42,808 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-03-01 00:48:42,815 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-03-01 00:48:43,048 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:43,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:43,221 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-03-01 00:48:43,227 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-03-01 00:48:43,462 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:43,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:43,640 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-03-01 00:48:43,645 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-03-01 00:48:43,881 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:44,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:44,058 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-03-01 00:48:44,294 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:44,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:44,486 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-03-01 00:48:44,719 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:44,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:44,895 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-03-01 00:48:44,900 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-03-01 00:48:45,136 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:45,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:45,309 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-03-01 00:48:45,547 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:45,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:45,728 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-03-01 00:48:45,963 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:46,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:46,135 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-03-01 00:48:46,140 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-03-01 00:48:46,376 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:46,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:46,548 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-03-01 00:48:46,554 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-03-01 00:48:46,789 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:46,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:46,969 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-03-01 00:48:46,975 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-03-01 00:48:47,209 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:47,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:47,386 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-03-01 00:48:47,390 [ scc.config] DEBUG Found submodule.scripts.url
2025-03-01 00:48:47,625 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-01 00:48:47,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-01 00:48:47,800 [ scc.config] DEBUG Found submodule.scripts.branch
2025-03-01 00:48:47,801 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-01 00:48:47,893 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28d3d04ca0> has local changes
2025-03-01 00:48:47,893 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 167 dominikl 'Add extinfo command' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 600 Rdornier 'Label on rois' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#348 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/348/)'
2025-03-01 00:48:47,908 [ scc.git] DEBUG [detached HEAD 13289a3] merge master -Dorg -Ssuccess-only
2025-03-01 00:48:47,908 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-03-01 00:48:47,908 [ scc.merge] INFO Repository: ome/omero-plugins
2025-03-01 00:48:47,908 [ scc.merge] INFO Already up to date.
2025-03-01 00:48:47,908 [ scc.merge] INFO
2025-03-01 00:48:47,908 [ scc.merge] INFO Merged PRs:
2025-03-01 00:48:47,908 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-03-01 00:48:47,908 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-03-01 00:48:47,908 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-03-01 00:48:47,908 [ scc.merge] INFO
2025-03-01 00:48:47,908 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-03-01 00:48:47,908 [ scc.merge] INFO Already up to date.
2025-03-01 00:48:47,908 [ scc.merge] INFO
2025-03-01 00:48:47,908 [ scc.merge] INFO
2025-03-01 00:48:47,908 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-03-01 00:48:47,909 [ scc.merge] INFO Excluded PRs:
2025-03-01 00:48:47,909 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-03-01 00:48:47,909 [ scc.merge] INFO Already up to date.
2025-03-01 00:48:47,909 [ scc.merge] INFO
2025-03-01 00:48:47,909 [ scc.merge] INFO
2025-03-01 00:48:47,909 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-03-01 00:48:47,909 [ scc.merge] INFO Excluded PRs:
2025-03-01 00:48:47,909 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-03-01 00:48:47,909 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-03-01 00:48:47,909 [ scc.merge] INFO Already up to date.
2025-03-01 00:48:47,909 [ scc.merge] INFO
2025-03-01 00:48:47,909 [ scc.merge] INFO Merged PRs:
2025-03-01 00:48:47,909 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-03-01 00:48:47,909 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-03-01 00:48:47,909 [ scc.merge] INFO
2025-03-01 00:48:47,909 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-03-01 00:48:47,909 [ scc.merge] INFO Excluded PRs:
2025-03-01 00:48:47,909 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-03-01 00:48:47,909 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-03-01 00:48:47,909 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-01 00:48:47,909 [ scc.merge] INFO Already up to date.
2025-03-01 00:48:47,909 [ scc.merge] INFO
2025-03-01 00:48:47,909 [ scc.merge] INFO Merged PRs:
2025-03-01 00:48:47,909 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-03-01 00:48:47,909 [ scc.merge] INFO
2025-03-01 00:48:47,909 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-01 00:48:47,909 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-03-01 00:48:47,909 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-03-01 00:48:47,909 [ scc.merge] INFO
2025-03-01 00:48:47,909 [ scc.merge] INFO Repository: ome/omero-figure
2025-03-01 00:48:47,909 [ scc.merge] INFO Excluded PRs:
2025-03-01 00:48:47,909 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-03-01 00:48:47,909 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (stage: draft)
2025-03-01 00:48:47,909 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-03-01 00:48:47,909 [ scc.merge] INFO Already up to date.
2025-03-01 00:48:47,909 [ scc.merge] INFO
2025-03-01 00:48:47,909 [ scc.merge] INFO Merged PRs:
2025-03-01 00:48:47,910 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-03-01 00:48:47,910 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-03-01 00:48:47,910 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-03-01 00:48:47,910 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-03-01 00:48:47,910 [ scc.merge] INFO
2025-03-01 00:48:47,910 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-01 00:48:47,910 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-03-01 00:48:47,910 [ scc.merge] INFO
2025-03-01 00:48:47,910 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-03-01 00:48:47,910 [ scc.merge] INFO Already up to date.
2025-03-01 00:48:47,910 [ scc.merge] INFO
2025-03-01 00:48:47,910 [ scc.merge] INFO Merged PRs:
2025-03-01 00:48:47,910 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-03-01 00:48:47,910 [ scc.merge] INFO
2025-03-01 00:48:47,910 [ scc.merge] INFO Repository: ome/omero-gallery
2025-03-01 00:48:47,910 [ scc.merge] INFO Already up to date.
2025-03-01 00:48:47,910 [ scc.merge] INFO
2025-03-01 00:48:47,910 [ scc.merge] INFO Merged PRs:
2025-03-01 00:48:47,910 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-03-01 00:48:47,910 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-03-01 00:48:47,910 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-03-01 00:48:47,910 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-03-01 00:48:47,910 [ scc.merge] INFO
2025-03-01 00:48:47,910 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-01 00:48:47,910 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-03-01 00:48:47,910 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-03-01 00:48:47,910 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-03-01 00:48:47,910 [ scc.merge] INFO
2025-03-01 00:48:47,910 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-03-01 00:48:47,910 [ scc.merge] INFO Excluded PRs:
2025-03-01 00:48:47,910 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-03-01 00:48:47,910 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-03-01 00:48:47,910 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-03-01 00:48:47,910 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-03-01 00:48:47,910 [ scc.merge] INFO Already up to date.
2025-03-01 00:48:47,910 [ scc.merge] INFO
2025-03-01 00:48:47,910 [ scc.merge] INFO Merged PRs:
2025-03-01 00:48:47,910 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-03-01 00:48:47,911 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-03-01 00:48:47,911 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-01 00:48:47,911 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-01 00:48:47,911 [ scc.merge] INFO
2025-03-01 00:48:47,911 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-01 00:48:47,911 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-01 00:48:47,911 [ scc.merge] INFO
2025-03-01 00:48:47,911 [ scc.merge] INFO Repository: ome/omero-mapr
2025-03-01 00:48:47,911 [ scc.merge] INFO Excluded PRs:
2025-03-01 00:48:47,911 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-03-01 00:48:47,911 [ scc.merge] INFO Already up to date.
2025-03-01 00:48:47,911 [ scc.merge] INFO
2025-03-01 00:48:47,911 [ scc.merge] INFO Merged PRs:
2025-03-01 00:48:47,911 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-03-01 00:48:47,911 [ scc.merge] INFO
2025-03-01 00:48:47,911 [ scc.merge] INFO Repository: ome/omero-metadata
2025-03-01 00:48:47,911 [ scc.merge] INFO Already up to date.
2025-03-01 00:48:47,911 [ scc.merge] INFO
2025-03-01 00:48:47,911 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-01 00:48:47,911 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-01 00:48:47,911 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-01 00:48:47,911 [ scc.merge] INFO
2025-03-01 00:48:47,911 [ scc.merge] INFO Repository: ome/omero-parade
2025-03-01 00:48:47,911 [ scc.merge] INFO Excluded PRs:
2025-03-01 00:48:47,911 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-03-01 00:48:47,911 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-03-01 00:48:47,911 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-03-01 00:48:47,911 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-03-01 00:48:47,911 [ scc.merge] INFO Already up to date.
2025-03-01 00:48:47,911 [ scc.merge] INFO
2025-03-01 00:48:47,911 [ scc.merge] INFO Merged PRs:
2025-03-01 00:48:47,911 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-01 00:48:47,911 [ scc.merge] INFO
2025-03-01 00:48:47,911 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-03-01 00:48:47,911 [ scc.merge] INFO Already up to date.
2025-03-01 00:48:47,911 [ scc.merge] INFO
2025-03-01 00:48:47,911 [ scc.merge] INFO
2025-03-01 00:48:47,912 [ scc.merge] INFO Repository: ome/omero-rois
2025-03-01 00:48:47,912 [ scc.merge] INFO Excluded PRs:
2025-03-01 00:48:47,912 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-01 00:48:47,912 [ scc.merge] INFO Already up to date.
2025-03-01 00:48:47,912 [ scc.merge] INFO
2025-03-01 00:48:47,912 [ scc.merge] INFO
2025-03-01 00:48:47,912 [ scc.merge] INFO Repository: ome/omero-signup
2025-03-01 00:48:47,912 [ scc.merge] INFO Already up to date.
2025-03-01 00:48:47,912 [ scc.merge] INFO
2025-03-01 00:48:47,912 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-01 00:48:47,912 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-01 00:48:47,912 [ scc.merge] INFO
2025-03-01 00:48:47,912 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-03-01 00:48:47,912 [ scc.merge] INFO Excluded PRs:
2025-03-01 00:48:47,912 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-03-01 00:48:47,912 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-03-01 00:48:47,912 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-03-01 00:48:47,912 [ scc.merge] INFO Already up to date.
2025-03-01 00:48:47,912 [ scc.merge] INFO
2025-03-01 00:48:47,912 [ scc.merge] INFO Merged PRs:
2025-03-01 00:48:47,912 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-01 00:48:47,912 [ scc.merge] INFO
2025-03-01 00:48:47,912 [ scc.merge] INFO Repository: ome/omero-upload
2025-03-01 00:48:47,912 [ scc.merge] INFO Already up to date.
2025-03-01 00:48:47,912 [ scc.merge] INFO
2025-03-01 00:48:47,912 [ scc.merge] INFO
2025-03-01 00:48:47,912 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-03-01 00:48:47,912 [ scc.merge] INFO Already up to date.
2025-03-01 00:48:47,912 [ scc.merge] INFO
2025-03-01 00:48:47,912 [ scc.merge] INFO Merged PRs:
2025-03-01 00:48:47,912 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-03-01 00:48:47,912 [ scc.merge] INFO
2025-03-01 00:48:47,912 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-03-01 00:48:47,912 [ scc.merge] INFO Excluded PRs:
2025-03-01 00:48:47,912 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-03-01 00:48:47,912 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-03-01 00:48:47,912 [ scc.merge] INFO Already up to date.
2025-03-01 00:48:47,912 [ scc.merge] INFO
2025-03-01 00:48:47,913 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-01 00:48:47,913 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-01 00:48:47,913 [ scc.merge] INFO
2025-03-01 00:48:47,913 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-03-01 00:48:47,913 [ scc.merge] INFO Already up to date.
2025-03-01 00:48:47,913 [ scc.merge] INFO
2025-03-01 00:48:47,913 [ scc.merge] INFO
2025-03-01 00:48:47,913 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-03-01 00:48:47,913 [ scc.merge] INFO Already up to date.
2025-03-01 00:48:47,913 [ scc.merge] INFO
2025-03-01 00:48:47,913 [ scc.merge] INFO
2025-03-01 00:48:47,913 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-03-01 00:48:47,913 [ scc.merge] INFO Already up to date.
2025-03-01 00:48:47,913 [ scc.merge] INFO
2025-03-01 00:48:47,913 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-01 00:48:47,913 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-03-01 00:48:47,913 [ scc.merge] INFO
2025-03-01 00:48:47,913 [ scc.merge] INFO Repository: ome/scripts
2025-03-01 00:48:47,913 [ scc.merge] INFO Excluded PRs:
2025-03-01 00:48:47,913 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-03-01 00:48:47,913 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-03-01 00:48:47,913 [ scc.merge] INFO Already up to date.
2025-03-01 00:48:47,913 [ scc.merge] INFO
2025-03-01 00:48:47,913 [ scc.merge] INFO Merged PRs:
2025-03-01 00:48:47,913 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-01 00:48:47,913 [ scc.merge] INFO
2025-03-01 00:48:47,913 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-01 00:48:47,913 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-01 00:48:47,913 [ scc.merge] INFO
2025-03-01 00:48:47,913 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-03-01 00:48:47,913 [ scc.git] DEBUG Calling 'git remote'
2025-03-01 00:48:47,919 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-03-01 00:48:47,919 [ scc.git] DEBUG Calling 'git remote'
2025-03-01 00:48:47,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:47,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-03-01 00:48:47,924 [ scc.git] DEBUG Calling 'git remote'
2025-03-01 00:48:47,928 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:47,928 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-03-01 00:48:47,929 [ scc.git] DEBUG Calling 'git remote'
2025-03-01 00:48:47,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:47,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-03-01 00:48:47,933 [ scc.git] DEBUG Calling 'git remote'
2025-03-01 00:48:47,938 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:47,938 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-03-01 00:48:47,938 [ scc.git] DEBUG Calling 'git remote'
2025-03-01 00:48:47,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:47,943 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-03-01 00:48:47,943 [ scc.git] DEBUG Calling 'git remote'
2025-03-01 00:48:47,947 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:47,947 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-03-01 00:48:47,947 [ scc.git] DEBUG Calling 'git remote'
2025-03-01 00:48:47,952 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:47,952 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-01 00:48:47,952 [ scc.git] DEBUG Calling 'git remote'
2025-03-01 00:48:47,956 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:47,957 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-01 00:48:47,957 [ scc.git] DEBUG Calling 'git remote'
2025-03-01 00:48:47,961 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:47,961 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-01 00:48:47,961 [ scc.git] DEBUG Calling 'git remote'
2025-03-01 00:48:47,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:47,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-01 00:48:47,966 [ scc.git] DEBUG Calling 'git remote'
2025-03-01 00:48:47,971 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:47,971 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-01 00:48:47,971 [ scc.git] DEBUG Calling 'git remote'
2025-03-01 00:48:47,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:47,976 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-01 00:48:47,976 [ scc.git] DEBUG Calling 'git remote'
2025-03-01 00:48:47,981 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:47,981 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-01 00:48:47,981 [ scc.git] DEBUG Calling 'git remote'
2025-03-01 00:48:47,985 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:47,985 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-01 00:48:47,986 [ scc.git] DEBUG Calling 'git remote'
2025-03-01 00:48:47,990 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:47,990 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-01 00:48:47,990 [ scc.git] DEBUG Calling 'git remote'
2025-03-01 00:48:47,995 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:47,995 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-01 00:48:47,995 [ scc.git] DEBUG Calling 'git remote'
2025-03-01 00:48:48,000 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:48,000 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-01 00:48:48,000 [ scc.git] DEBUG Calling 'git remote'
2025-03-01 00:48:48,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:48,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-01 00:48:48,005 [ scc.git] DEBUG Calling 'git remote'
2025-03-01 00:48:48,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:48,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-01 00:48:48,010 [ scc.git] DEBUG Calling 'git remote'
2025-03-01 00:48:48,014 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:48,014 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-01 00:48:48,014 [ scc.git] DEBUG Calling 'git remote'
2025-03-01 00:48:48,019 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-01 00:48:48,019 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-01 00:48:48,019 [ scc.git] DEBUG Calling 'git remote'
2025-03-01 00:48:48,024 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.10.0 to 5.10.1-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD 2593db5] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 4777ef8
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from ce6e13c
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 11d3587
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from 9cc36cde
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from 3b6c05a
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 2a621da
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 7a798ce
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 0a557da
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from 3cd120c
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from fb5ae86
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from eb47378
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from bdfeb5e
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from be76813
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from 100f6ae
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 8f3c313
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from 70b01ed
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 5bfef29
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 4b4c755
nothing to commit, working tree clean
[detached HEAD ffb7607] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-03-01 00:49:36,826 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2025-03-01 00:49:46,580 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2025-03-01 00:49:49,090 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-01 00:49:53,914 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-01 00:50:34,551 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts (hide)
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/316c2b55/images/svgs/logo.svg){kind=logo}
