Skipping 184 KB..
Full Log - 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#355 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/)'
2025-03-08 00:40:51,987 [ scc.git] DEBUG [detached HEAD 21141ea] merge master -Dorg -Ssuccess-only
2025-03-08 00:40:51,987 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:40:51,987 [ scc.repo] DEBUG ## PRs found:
2025-03-08 00:40:52,131 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:40:52,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-03-08 00:40:52,765 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:40:53,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/503 HTTP/1.1" 200 None
2025-03-08 00:40:53,270 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:40:53,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/503/comments HTTP/1.1" 200 None
2025-03-08 00:40:53,754 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:40:53,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502 HTTP/1.1" 200 None
2025-03-08 00:40:54,250 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:40:54,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502/comments HTTP/1.1" 200 None
2025-03-08 00:40:54,514 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-08 00:40:54,765 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:40:55,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-03-08 00:40:55,318 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:40:55,635 [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-08 00:40:55,888 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:40:56,207 [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-08 00:40:56,459 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:40:56,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-03-08 00:40:57,013 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:40:57,179 [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-08 00:40:57,180 [ scc.repo] DEBUG - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-08 00:40:57,431 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:40:57,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-03-08 00:40:57,670 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-08 00:40:57,921 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:40:58,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-08 00:40:58,521 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:40:58,771 [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-08 00:40:59,023 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:40:59,269 [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-08 00:40:59,522 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:40:59,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-08 00:41:00,123 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:00,319 [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-08 00:41:00,319 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-08 00:41:00,571 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:00,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-03-08 00:41:01,072 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:01,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-03-08 00:41:01,548 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:01,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-03-08 00:41:02,015 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:02,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-03-08 00:41:02,514 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:02,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-08 00:41:03,065 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:03,313 [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-08 00:41:03,565 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:03,776 [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-08 00:41:04,029 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:04,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-08 00:41:04,490 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:04,682 [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-08 00:41:04,683 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-08 00:41:04,934 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:05,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-03-08 00:41:05,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:05,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-03-08 00:41:05,985 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:06,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-08 00:41:06,572 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:06,812 [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-08 00:41:07,064 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:07,304 [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-08 00:41:07,556 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:07,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-08 00:41:08,073 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:08,249 [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-08 00:41:08,250 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-03-08 00:41:08,501 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:08,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-03-08 00:41:08,972 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:09,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-03-08 00:41:09,471 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:09,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-08 00:41:10,004 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:10,241 [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-08 00:41:10,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:10,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-08 00:41:11,025 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:11,193 [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-08 00:41:11,193 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-03-08 00:41:11,194 [ scc.repo] DEBUG ## Branches found:
2025-03-08 00:41:11,194 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-08 00:41:11,194 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:11,194 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:11,200 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-08 00:41:11,205 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-08 00:41:11,205 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-08 00:41:11,211 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-08 00:41:11,216 [ scc.git] DEBUG Already up to date.
2025-03-08 00:41:11,216 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-03-08 00:41:11,544 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-08 00:41:11,544 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-03-08 00:41:11,549 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-03-08 00:41:11,850 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-08 00:41:11,850 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-03-08 00:41:11,855 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-03-08 00:41:12,140 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-08 00:41:12,140 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-03-08 00:41:12,145 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-03-08 00:41:12,437 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-08 00:41:12,437 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-03-08 00:41:12,442 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-03-08 00:41:12,752 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-08 00:41:12,752 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-03-08 00:41:12,757 [ scc.git] DEBUG ## Unique users: []
2025-03-08 00:41:12,757 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:12,757 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:12,762 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-08 00:41:12,771 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:12,776 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-08 00:41:12,792 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-03-08 00:41:12,793 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-03-08 00:41:12,793 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-08 00:41:12,797 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-03-08 00:41:12,797 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-03-08 00:41:12,797 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-03-08 00:41:12,799 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:12,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:41:12,965 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-08 00:41:12,975 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:12,980 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-08 00:41:13,003 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-03-08 00:41:13,003 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-03-08 00:41:13,003 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-03-08 00:41:13,003 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-03-08 00:41:13,004 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-08 00:41:13,008 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-03-08 00:41:13,008 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-03-08 00:41:13,008 [ scc.git] DEBUG src/app/header.html | 5 +
2025-03-08 00:41:13,009 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-03-08 00:41:13,009 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-03-08 00:41:13,009 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-03-08 00:41:13,009 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-03-08 00:41:13,009 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-03-08 00:41:13,218 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:13,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:41:13,393 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-08 00:41:13,403 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:13,409 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-08 00:41:13,425 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-03-08 00:41:13,426 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-08 00:41:13,429 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-03-08 00:41:13,429 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-03-08 00:41:13,429 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-03-08 00:41:13,646 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:13,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:41:13,809 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-08 00:41:13,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:13,824 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-08 00:41:13,844 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-08 00:41:13,854 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-03-08 00:41:13,854 [ scc.git] DEBUG package.json | 2 +-
2025-03-08 00:41:13,854 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-03-08 00:41:14,061 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:14,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:41:14,250 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-08 00:41:14,261 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:14,265 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-08 00:41:14,305 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-08 00:41:14,305 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-03-08 00:41:14,305 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-08 00:41:14,306 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-08 00:41:14,312 [ scc.git] DEBUG Calling 'git reset --hard d47bc291d92f516b595bd2a2cbee7551af0990b1'
2025-03-08 00:41:14,323 [ scc.git] DEBUG HEAD is now at d47bc29 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-03-08 00:41:14,502 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:14,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:41:14,666 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-08 00:41:14,673 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-03-08 00:41:14,678 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#355](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-03-08 00:41:14,683 [ scc.config] DEBUG Found github.token
2025-03-08 00:41:14,683 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-03-08 00:41:14,684 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-08 00:41:14,726 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:14,726 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:14,731 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-08 00:41:14,773 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-08 00:41:14,783 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc10c534520> has no local changes
2025-03-08 00:41:14,783 [ 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#355 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/)'
2025-03-08 00:41:14,795 [ scc.git] DEBUG [detached HEAD 0af1855] merge master -Dorg -Ssuccess-only
2025-03-08 00:41:14,796 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:41:14,796 [ scc.repo] DEBUG ## PRs found:
2025-03-08 00:41:14,918 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:15,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-03-08 00:41:15,474 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:15,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-03-08 00:41:15,957 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:16,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-03-08 00:41:16,516 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:16,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-08 00:41:17,097 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:17,387 [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-08 00:41:17,639 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:17,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-08 00:41:18,199 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:18,388 [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-08 00:41:18,389 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-03-08 00:41:18,389 [ scc.repo] DEBUG ## Branches found:
2025-03-08 00:41:18,389 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-08 00:41:18,389 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:18,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:18,395 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-08 00:41:18,400 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-08 00:41:18,401 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-08 00:41:18,406 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-08 00:41:18,412 [ scc.git] DEBUG Already up to date.
2025-03-08 00:41:18,412 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-03-08 00:41:18,730 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-03-08 00:41:18,730 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-03-08 00:41:18,734 [ scc.git] DEBUG ## Unique users: []
2025-03-08 00:41:18,734 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:18,734 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:18,740 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-08 00:41:18,747 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:18,752 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-08 00:41:18,763 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-08 00:41:18,767 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-03-08 00:41:18,767 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-03-08 00:41:18,767 [ scc.git] DEBUG requirements.txt | 2 +-
2025-03-08 00:41:18,767 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-03-08 00:41:18,767 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-03-08 00:41:18,767 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-03-08 00:41:18,770 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:18,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:41:18,926 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-08 00:41:18,969 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:18,969 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:18,974 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-08 00:41:19,014 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-08 00:41:19,021 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc10c5aae20> has no local changes
2025-03-08 00:41:19,021 [ 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#355 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/)'
2025-03-08 00:41:19,031 [ scc.git] DEBUG [detached HEAD cd53cc1] merge master -Dorg -Ssuccess-only
2025-03-08 00:41:19,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:41:19,032 [ scc.repo] DEBUG ## PRs found:
2025-03-08 00:41:19,178 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:19,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-03-08 00:41:19,781 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:20,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-03-08 00:41:20,319 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:20,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-03-08 00:41:20,829 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:21,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-08 00:41:21,349 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:21,563 [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-08 00:41:21,816 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:22,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-08 00:41:22,403 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:22,571 [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-08 00:41:22,571 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-08 00:41:22,823 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:23,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-03-08 00:41:23,294 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:23,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-03-08 00:41:23,776 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:24,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-08 00:41:24,312 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:24,590 [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-08 00:41:24,842 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:25,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-08 00:41:25,297 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:25,470 [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-08 00:41:25,470 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-08 00:41:25,471 [ scc.repo] DEBUG ## Branches found:
2025-03-08 00:41:25,471 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-08 00:41:25,471 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:25,471 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:25,477 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-08 00:41:25,482 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-08 00:41:25,482 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-08 00:41:25,488 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-08 00:41:25,494 [ scc.git] DEBUG Already up to date.
2025-03-08 00:41:25,494 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-03-08 00:41:25,815 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-08 00:41:25,815 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-03-08 00:41:25,820 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-03-08 00:41:26,139 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-08 00:41:26,139 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-03-08 00:41:26,143 [ scc.git] DEBUG ## Unique users: []
2025-03-08 00:41:26,143 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:26,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:26,149 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-08 00:41:26,156 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:26,161 [ 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-08 00:41:26,177 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-03-08 00:41:26,177 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-03-08 00:41:26,177 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-08 00:41:26,177 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-08 00:41:26,177 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-08 00:41:26,178 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-08 00:41:26,183 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-08 00:41:26,190 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-08 00:41:26,193 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:26,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:41:26,356 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-08 00:41:26,364 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-08 00:41:26,371 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#355](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-03-08 00:41:26,376 [ scc.config] DEBUG Found github.token
2025-03-08 00:41:26,376 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-03-08 00:41:26,376 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-08 00:41:26,383 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:26,388 [ 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-08 00:41:26,407 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-08 00:41:26,407 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-08 00:41:26,407 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-03-08 00:41:26,407 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-08 00:41:26,408 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-08 00:41:26,414 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-08 00:41:26,421 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-08 00:41:26,608 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:26,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:41:26,802 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-08 00:41:26,810 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-08 00:41:26,816 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#355](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/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-08 00:41:26,821 [ scc.config] DEBUG Found github.token
2025-03-08 00:41:26,821 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-03-08 00:41:26,821 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-08 00:41:26,863 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:26,863 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:26,868 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-08 00:41:26,909 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-08 00:41:26,916 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc10c521250> has no local changes
2025-03-08 00:41:26,916 [ 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#355 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/)'
2025-03-08 00:41:26,926 [ scc.git] DEBUG [detached HEAD 9f5af5e] merge master -Dorg -Ssuccess-only
2025-03-08 00:41:26,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:41:26,926 [ scc.repo] DEBUG ## PRs found:
2025-03-08 00:41:27,054 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:27,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-03-08 00:41:27,609 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:27,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-03-08 00:41:27,843 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-08 00:41:28,094 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:28,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-08 00:41:28,681 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:28,922 [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-08 00:41:29,174 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:29,411 [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-08 00:41:29,664 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:29,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-08 00:41:30,237 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:30,478 [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-08 00:41:30,478 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-08 00:41:30,730 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:30,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-03-08 00:41:31,241 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:31,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-03-08 00:41:31,742 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:31,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-03-08 00:41:32,251 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:32,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-03-08 00:41:32,733 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:32,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-03-08 00:41:33,238 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:33,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-03-08 00:41:33,727 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:34,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-03-08 00:41:34,046 [ scc.repo] DEBUG ## Branches found:
2025-03-08 00:41:34,047 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-08 00:41:34,047 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:34,047 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:34,053 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-08 00:41:34,058 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-08 00:41:34,058 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-08 00:41:34,064 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-08 00:41:34,070 [ scc.git] DEBUG Already up to date.
2025-03-08 00:41:34,070 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-03-08 00:41:34,367 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-08 00:41:34,368 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-03-08 00:41:34,372 [ scc.git] DEBUG ## Unique users: []
2025-03-08 00:41:34,372 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:34,372 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:34,377 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-08 00:41:34,383 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:34,388 [ 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-08 00:41:34,399 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-08 00:41:34,403 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-03-08 00:41:34,403 [ scc.git] DEBUG package.json | 2 +-
2025-03-08 00:41:34,403 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-03-08 00:41:34,406 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:34,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:41:34,570 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-08 00:41:34,613 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:34,613 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:34,618 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-08 00:41:34,658 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-08 00:41:34,665 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc10c556f10> has no local changes
2025-03-08 00:41:34,665 [ 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#355 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/)'
2025-03-08 00:41:34,674 [ scc.git] DEBUG [detached HEAD 0758d84] merge master -Dorg -Ssuccess-only
2025-03-08 00:41:34,675 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:41:34,675 [ scc.repo] DEBUG ## PRs found:
2025-03-08 00:41:34,822 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:35,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-03-08 00:41:35,011 [ scc.repo] DEBUG ## Branches found:
2025-03-08 00:41:35,011 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-08 00:41:35,011 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:35,011 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:35,017 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-08 00:41:35,022 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-08 00:41:35,022 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-08 00:41:35,027 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-08 00:41:35,033 [ scc.git] DEBUG Already up to date.
2025-03-08 00:41:35,033 [ scc.git] DEBUG ## Unique users: []
2025-03-08 00:41:35,033 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:35,033 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:35,038 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-08 00:41:35,079 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:35,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:35,084 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-08 00:41:35,125 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-08 00:41:35,131 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc10c5868e0> has no local changes
2025-03-08 00:41:35,131 [ 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#355 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/)'
2025-03-08 00:41:35,140 [ scc.git] DEBUG [detached HEAD 01e105d] merge master -Dorg -Ssuccess-only
2025-03-08 00:41:35,140 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:41:35,141 [ scc.repo] DEBUG ## PRs found:
2025-03-08 00:41:35,263 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:35,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-03-08 00:41:35,791 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:36,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-03-08 00:41:36,273 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:36,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-03-08 00:41:36,742 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:36,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-03-08 00:41:36,990 [ scc.repo] DEBUG ## Branches found:
2025-03-08 00:41:36,990 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-08 00:41:36,990 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:36,991 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:36,997 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-08 00:41:37,002 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-08 00:41:37,002 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-08 00:41:37,007 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-08 00:41:37,013 [ scc.git] DEBUG Already up to date.
2025-03-08 00:41:37,013 [ scc.git] DEBUG ## Unique users: []
2025-03-08 00:41:37,013 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:37,013 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:37,018 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-08 00:41:37,060 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:37,060 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:37,065 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-08 00:41:37,106 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-08 00:41:37,112 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc10c53a040> has no local changes
2025-03-08 00:41:37,112 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- 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#355 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/)'
2025-03-08 00:41:37,121 [ scc.git] DEBUG [detached HEAD 97c50b8] merge master -Dorg -Ssuccess-only
2025-03-08 00:41:37,122 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:41:37,122 [ scc.repo] DEBUG ## PRs found:
2025-03-08 00:41:37,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:37,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-03-08 00:41:37,774 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:37,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-03-08 00:41:38,251 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:38,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-03-08 00:41:38,708 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:39,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-08 00:41:39,266 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:39,474 [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-08 00:41:39,726 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:40,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-08 00:41:40,295 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:40,503 [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-08 00:41:40,504 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-08 00:41:40,504 [ scc.repo] DEBUG ## Branches found:
2025-03-08 00:41:40,504 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-08 00:41:40,504 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:40,504 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:40,510 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-08 00:41:40,515 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-08 00:41:40,516 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-08 00:41:40,521 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-08 00:41:40,527 [ scc.git] DEBUG Already up to date.
2025-03-08 00:41:40,527 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-03-08 00:41:40,848 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-03-08 00:41:40,848 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-03-08 00:41:40,852 [ scc.git] DEBUG ## Unique users: []
2025-03-08 00:41:40,852 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:40,852 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:40,859 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-08 00:41:40,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:40,871 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-08 00:41:40,882 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-03-08 00:41:40,883 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-03-08 00:41:40,883 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-03-08 00:41:40,883 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-03-08 00:41:40,883 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-03-08 00:41:40,883 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-03-08 00:41:40,883 [ scc.git] DEBUG Auto-merging setup.py
2025-03-08 00:41:40,883 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-03-08 00:41:40,883 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-08 00:41:40,883 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-08 00:41:40,888 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-08 00:41:40,896 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-03-08 00:41:40,898 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:41,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:41:41,068 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-08 00:41:41,075 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-08 00:41:41,081 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#355](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
--conflicts
2025-03-08 00:41:41,086 [ scc.config] DEBUG Found github.token
2025-03-08 00:41:41,086 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-03-08 00:41:41,086 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-08 00:41:41,128 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:41,128 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:41,133 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-08 00:41:41,174 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-08 00:41:41,181 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc10c516e80> has no local changes
2025-03-08 00:41:41,181 [ 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#355 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/)'
2025-03-08 00:41:41,190 [ scc.git] DEBUG [detached HEAD fbcb5c5] merge master -Dorg -Ssuccess-only
2025-03-08 00:41:41,190 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:41:41,190 [ scc.repo] DEBUG ## PRs found:
2025-03-08 00:41:41,320 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:41,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-03-08 00:41:41,897 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:42,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-03-08 00:41:42,397 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:42,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-03-08 00:41:42,890 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:43,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-03-08 00:41:43,465 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:43,747 [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-08 00:41:44,000 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:44,256 [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-08 00:41:44,508 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:44,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-03-08 00:41:45,009 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:45,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-03-08 00:41:45,505 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:45,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-03-08 00:41:45,976 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:46,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-03-08 00:41:46,437 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:46,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-08 00:41:46,958 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:47,157 [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-08 00:41:47,409 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:47,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-08 00:41:47,937 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:48,116 [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-08 00:41:48,117 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-08 00:41:48,117 [ scc.repo] DEBUG ## Branches found:
2025-03-08 00:41:48,117 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-08 00:41:48,117 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:48,117 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:48,123 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-08 00:41:48,128 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-08 00:41:48,128 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-08 00:41:48,134 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-08 00:41:48,140 [ scc.git] DEBUG Already up to date.
2025-03-08 00:41:48,140 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-03-08 00:41:48,469 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-03-08 00:41:48,469 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-03-08 00:41:48,474 [ scc.git] DEBUG ## Unique users: []
2025-03-08 00:41:48,474 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:48,474 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:48,480 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-03-08 00:41:48,487 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:48,491 [ 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-08 00:41:48,506 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-08 00:41:48,510 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-03-08 00:41:48,510 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-03-08 00:41:48,510 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-03-08 00:41:48,511 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-03-08 00:41:48,511 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-03-08 00:41:48,511 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-03-08 00:41:48,511 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-03-08 00:41:48,512 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-03-08 00:41:48,513 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:48,513 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-03-08 00:41:48,513 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-03-08 00:41:48,513 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-03-08 00:41:48,513 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-03-08 00:41:48,514 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-03-08 00:41:48,514 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-03-08 00:41:48,514 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-03-08 00:41:48,514 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-03-08 00:41:48,514 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-03-08 00:41:48,514 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-03-08 00:41:48,514 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-03-08 00:41:48,514 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-03-08 00:41:48,514 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-03-08 00:41:48,514 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-03-08 00:41:48,514 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-03-08 00:41:48,514 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-03-08 00:41:48,514 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-03-08 00:41:48,514 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-03-08 00:41:48,514 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-03-08 00:41:48,514 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-03-08 00:41:48,514 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-03-08 00:41:48,514 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-03-08 00:41:48,514 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-03-08 00:41:48,514 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-03-08 00:41:48,514 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-03-08 00:41:48,514 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-03-08 00:41:48,514 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-03-08 00:41:48,514 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-03-08 00:41:48,514 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-03-08 00:41:48,515 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-03-08 00:41:48,515 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-03-08 00:41:48,515 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-03-08 00:41:48,515 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-03-08 00:41:48,515 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-03-08 00:41:48,515 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-03-08 00:41:48,515 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-03-08 00:41:48,515 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-03-08 00:41:48,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:41:48,674 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-08 00:41:48,716 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:48,716 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:48,721 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-08 00:41:48,763 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-08 00:41:48,770 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc10c512ac0> has no local changes
2025-03-08 00:41:48,770 [ 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#355 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/)'
2025-03-08 00:41:48,780 [ scc.git] DEBUG [detached HEAD 645549f] merge master -Dorg -Ssuccess-only
2025-03-08 00:41:48,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:41:48,780 [ scc.repo] DEBUG ## PRs found:
2025-03-08 00:41:48,926 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:49,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-03-08 00:41:49,134 [ scc.repo] DEBUG ## Branches found:
2025-03-08 00:41:49,134 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-08 00:41:49,134 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:49,134 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:49,140 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-08 00:41:49,145 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-08 00:41:49,145 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-08 00:41:49,151 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-08 00:41:49,156 [ scc.git] DEBUG Already up to date.
2025-03-08 00:41:49,156 [ scc.git] DEBUG ## Unique users: []
2025-03-08 00:41:49,156 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:49,156 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:49,161 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-08 00:41:49,202 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:49,202 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:49,208 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-08 00:41:49,248 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-08 00:41:49,254 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc10c52c160> has no local changes
2025-03-08 00:41:49,254 [ 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#355 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/)'
2025-03-08 00:41:49,263 [ scc.git] DEBUG [detached HEAD b9d7962] merge master -Dorg -Ssuccess-only
2025-03-08 00:41:49,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:41:49,264 [ scc.repo] DEBUG ## PRs found:
2025-03-08 00:41:49,386 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:49,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-03-08 00:41:49,911 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:50,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-03-08 00:41:50,397 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:50,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-03-08 00:41:50,864 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:51,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-08 00:41:51,449 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:51,668 [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-08 00:41:51,920 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:52,208 [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-08 00:41:52,460 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:52,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-08 00:41:52,998 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:53,197 [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-08 00:41:53,198 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-03-08 00:41:53,198 [ scc.repo] DEBUG ## Branches found:
2025-03-08 00:41:53,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-08 00:41:53,198 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:53,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:53,204 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-08 00:41:53,209 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-08 00:41:53,209 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-08 00:41:53,215 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-08 00:41:53,221 [ scc.git] DEBUG Already up to date.
2025-03-08 00:41:53,221 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-03-08 00:41:53,514 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-03-08 00:41:53,514 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-03-08 00:41:53,518 [ scc.git] DEBUG ## Unique users: []
2025-03-08 00:41:53,518 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:53,518 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:53,524 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-03-08 00:41:53,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:53,534 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-03-08 00:41:53,544 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-08 00:41:53,547 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-03-08 00:41:53,548 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-03-08 00:41:53,548 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-03-08 00:41:53,548 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-03-08 00:41:53,548 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-03-08 00:41:53,550 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:53,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:41:53,728 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-08 00:41:53,771 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:41:53,771 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:41:53,776 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-08 00:41:53,817 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-08 00:41:53,824 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc10c512fa0> has no local changes
2025-03-08 00:41:53,824 [ 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#355 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/)'
2025-03-08 00:41:53,833 [ scc.git] DEBUG [detached HEAD 17ea210] merge master -Dorg -Ssuccess-only
2025-03-08 00:41:53,833 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:41:53,833 [ scc.git] INFO Overriding base-branch from master to main
2025-03-08 00:41:53,833 [ scc.repo] DEBUG ## PRs found:
2025-03-08 00:41:53,981 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:54,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-03-08 00:41:54,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:54,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-03-08 00:41:55,022 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:55,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-03-08 00:41:55,526 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:55,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-03-08 00:41:56,082 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:56,318 [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-08 00:41:56,570 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:56,807 [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-08 00:41:57,059 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:57,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-03-08 00:41:57,533 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:57,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-03-08 00:41:58,013 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:58,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-03-08 00:41:58,502 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:59,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-08 00:41:59,478 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:41:59,713 [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-08 00:41:59,965 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:00,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-08 00:42:00,497 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:00,810 [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-08 00:42:00,810 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-08 00:42:00,811 [ scc.repo] DEBUG ## Branches found:
2025-03-08 00:42:00,811 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-08 00:42:00,811 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:42:00,811 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:42:00,817 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-03-08 00:42:00,822 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-08 00:42:00,822 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-03-08 00:42:00,828 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-03-08 00:42:00,834 [ scc.git] DEBUG Already up to date.
2025-03-08 00:42:00,834 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-03-08 00:42:01,164 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-03-08 00:42:01,164 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-03-08 00:42:01,168 [ scc.git] DEBUG ## Unique users: []
2025-03-08 00:42:01,168 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:42:01,168 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:42:01,174 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-08 00:42:01,180 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:42:01,185 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-08 00:42:01,195 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-03-08 00:42:01,195 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-03-08 00:42:01,196 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-08 00:42:01,196 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-08 00:42:01,202 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-08 00:42:01,209 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-03-08 00:42:01,212 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:01,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:01,395 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-08 00:42:01,402 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-08 00:42:01,407 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#355](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-03-08 00:42:01,412 [ scc.config] DEBUG Found github.token
2025-03-08 00:42:01,412 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-03-08 00:42:01,412 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-08 00:42:01,454 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:42:01,454 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:42:01,460 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-08 00:42:01,501 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-08 00:42:01,507 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc10c4dea90> has no local changes
2025-03-08 00:42:01,507 [ 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#355 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/)'
2025-03-08 00:42:01,517 [ scc.git] DEBUG [detached HEAD 2d565a6] merge master -Dorg -Ssuccess-only
2025-03-08 00:42:01,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:01,517 [ scc.repo] DEBUG ## PRs found:
2025-03-08 00:42:01,647 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:01,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-03-08 00:42:01,848 [ scc.repo] DEBUG ## Branches found:
2025-03-08 00:42:01,848 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-08 00:42:01,848 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:42:01,848 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:42:01,854 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-08 00:42:01,859 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-08 00:42:01,859 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-08 00:42:01,865 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-08 00:42:01,871 [ scc.git] DEBUG Already up to date.
2025-03-08 00:42:01,871 [ scc.git] DEBUG ## Unique users: []
2025-03-08 00:42:01,871 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:42:01,871 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:42:01,875 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-08 00:42:01,917 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:42:01,917 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:42:01,923 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-08 00:42:01,964 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-08 00:42:01,970 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc10c4185b0> has no local changes
2025-03-08 00:42:01,970 [ 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#355 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/)'
2025-03-08 00:42:01,979 [ scc.git] DEBUG [detached HEAD c9304ae] merge master -Dorg -Ssuccess-only
2025-03-08 00:42:01,979 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:01,979 [ scc.repo] DEBUG ## PRs found:
2025-03-08 00:42:02,100 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:02,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-03-08 00:42:02,284 [ scc.repo] DEBUG ## Branches found:
2025-03-08 00:42:02,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-08 00:42:02,284 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:42:02,285 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:42:02,290 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-08 00:42:02,295 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-08 00:42:02,295 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-08 00:42:02,301 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-08 00:42:02,307 [ scc.git] DEBUG Already up to date.
2025-03-08 00:42:02,307 [ scc.git] DEBUG ## Unique users: []
2025-03-08 00:42:02,307 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:42:02,307 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:42:02,312 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-08 00:42:02,354 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:42:02,354 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:42:02,359 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-08 00:42:02,400 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-08 00:42:02,407 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc10c4de880> has no local changes
2025-03-08 00:42:02,407 [ 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#355 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/)'
2025-03-08 00:42:02,416 [ scc.git] DEBUG [detached HEAD 88f4409] merge master -Dorg -Ssuccess-only
2025-03-08 00:42:02,416 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:02,417 [ scc.repo] DEBUG ## PRs found:
2025-03-08 00:42:02,536 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:02,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-03-08 00:42:03,078 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:03,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-03-08 00:42:03,546 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:03,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-03-08 00:42:04,019 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:04,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-08 00:42:04,542 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:04,777 [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-08 00:42:05,029 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:05,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-08 00:42:05,542 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:05,711 [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-08 00:42:05,712 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-03-08 00:42:05,712 [ scc.repo] DEBUG ## Branches found:
2025-03-08 00:42:05,712 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-08 00:42:05,712 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:42:05,712 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:42:05,718 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-08 00:42:05,723 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-08 00:42:05,723 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-08 00:42:05,729 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-08 00:42:05,734 [ scc.git] DEBUG Already up to date.
2025-03-08 00:42:05,735 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-03-08 00:42:06,043 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-03-08 00:42:06,043 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-03-08 00:42:06,047 [ scc.git] DEBUG ## Unique users: []
2025-03-08 00:42:06,048 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:42:06,048 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:42:06,053 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-08 00:42:06,059 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:42:06,064 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-08 00:42:06,075 [ scc.git] DEBUG Auto-merging Dockerfile
2025-03-08 00:42:06,075 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-03-08 00:42:06,075 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-08 00:42:06,076 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-08 00:42:06,081 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-08 00:42:06,089 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-03-08 00:42:06,092 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:06,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:06,284 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-08 00:42:06,290 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-08 00:42:06,295 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#355](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-03-08 00:42:06,300 [ scc.config] DEBUG Found github.token
2025-03-08 00:42:06,301 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-03-08 00:42:06,301 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-08 00:42:06,342 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:42:06,342 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:42:06,347 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-08 00:42:06,389 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-08 00:42:06,395 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc10c418610> has no local changes
2025-03-08 00:42:06,396 [ 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#355 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/)'
2025-03-08 00:42:06,405 [ scc.git] DEBUG [detached HEAD 1939d80] merge master -Dorg -Ssuccess-only
2025-03-08 00:42:06,406 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:06,406 [ scc.git] INFO Overriding base-branch from master to develop
2025-03-08 00:42:06,406 [ scc.repo] DEBUG ## PRs found:
2025-03-08 00:42:06,536 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:06,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-03-08 00:42:07,085 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:07,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-03-08 00:42:07,563 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:07,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-03-08 00:42:08,038 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:08,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-08 00:42:08,477 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:08,712 [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-08 00:42:08,964 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:09,167 [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-08 00:42:09,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:09,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-08 00:42:09,932 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:10,125 [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-08 00:42:10,125 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-08 00:42:10,377 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:10,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-03-08 00:42:10,881 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:11,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-03-08 00:42:11,372 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:11,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-08 00:42:11,829 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:12,060 [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-08 00:42:12,312 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:12,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-08 00:42:12,793 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:12,979 [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-08 00:42:12,980 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-08 00:42:13,231 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:13,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-03-08 00:42:13,723 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:14,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-03-08 00:42:14,278 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:14,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-03-08 00:42:14,763 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:15,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-03-08 00:42:15,102 [ scc.repo] DEBUG ## Branches found:
2025-03-08 00:42:15,102 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-08 00:42:15,103 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:42:15,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:42:15,109 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-03-08 00:42:15,114 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-08 00:42:15,114 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-03-08 00:42:15,119 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-03-08 00:42:15,125 [ scc.git] DEBUG Already up to date.
2025-03-08 00:42:15,125 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-03-08 00:42:15,448 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-08 00:42:15,449 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-03-08 00:42:15,453 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-03-08 00:42:15,744 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-08 00:42:15,744 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-03-08 00:42:15,748 [ scc.git] DEBUG ## Unique users: []
2025-03-08 00:42:15,749 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:42:15,749 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:42:15,754 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-08 00:42:15,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:42:15,768 [ 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-08 00:42:15,782 [ 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-08 00:42:15,782 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-08 00:42:15,782 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-08 00:42:15,787 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-08 00:42:15,794 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-03-08 00:42:15,796 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:16,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:16,046 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-08 00:42:16,054 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-08 00:42:16,061 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#355](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-03-08 00:42:16,066 [ scc.config] DEBUG Found github.token
2025-03-08 00:42:16,066 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-03-08 00:42:16,067 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-08 00:42:16,074 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:42:16,078 [ 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-08 00:42:16,090 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-08 00:42:16,094 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-03-08 00:42:16,094 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-03-08 00:42:16,298 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:16,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:16,459 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-08 00:42:16,501 [ scc.git] DEBUG Get sha1 of %s
2025-03-08 00:42:16,502 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-08 00:42:16,507 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-08 00:42:16,548 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-08 00:42:16,555 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc10c45eac0> has no local changes
2025-03-08 00:42:16,555 [ 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#355 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/)'
2025-03-08 00:42:16,565 [ scc.git] DEBUG [detached HEAD 95c7ca4] merge master -Dorg -Ssuccess-only
2025-03-08 00:42:16,565 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:16,566 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-08 00:42:16,649 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-03-08 00:42:16,711 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:16,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:16,891 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-03-08 00:42:16,896 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-03-08 00:42:17,132 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:17,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:17,337 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-03-08 00:42:17,342 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-03-08 00:42:17,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:17,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:17,748 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-03-08 00:42:17,753 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-03-08 00:42:17,990 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:18,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:18,165 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-03-08 00:42:18,402 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:18,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:18,588 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-03-08 00:42:18,593 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-03-08 00:42:18,830 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:19,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:19,016 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-03-08 00:42:19,021 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-03-08 00:42:19,258 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:19,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:19,441 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-03-08 00:42:19,446 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-03-08 00:42:19,683 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:19,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:19,848 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-03-08 00:42:19,853 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-03-08 00:42:20,089 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:20,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:20,268 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-03-08 00:42:20,272 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-03-08 00:42:20,509 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:20,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:20,681 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-03-08 00:42:20,686 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-03-08 00:42:20,923 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:21,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:21,104 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-03-08 00:42:21,109 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-03-08 00:42:21,345 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:21,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:21,516 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-03-08 00:42:21,521 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-03-08 00:42:21,757 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:21,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:21,948 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-03-08 00:42:22,185 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:22,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:22,368 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-03-08 00:42:22,605 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:22,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:22,773 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-03-08 00:42:22,778 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-03-08 00:42:23,015 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:23,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:23,205 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-03-08 00:42:23,441 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:23,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:23,628 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-03-08 00:42:23,865 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:24,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:24,062 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-03-08 00:42:24,067 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-03-08 00:42:24,303 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:24,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:24,491 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-03-08 00:42:24,496 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-03-08 00:42:24,732 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:24,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:24,909 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-03-08 00:42:24,914 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-03-08 00:42:25,150 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:25,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:25,323 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-03-08 00:42:25,328 [ scc.config] DEBUG Found submodule.scripts.url
2025-03-08 00:42:25,565 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-08 00:42:25,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-08 00:42:25,745 [ scc.config] DEBUG Found submodule.scripts.branch
2025-03-08 00:42:25,746 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-08 00:42:25,842 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc10fb2cf10> has local changes
2025-03-08 00:42:25,842 [ 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 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- 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#355 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/355/)'
2025-03-08 00:42:25,859 [ scc.git] DEBUG [detached HEAD 463a439] merge master -Dorg -Ssuccess-only
2025-03-08 00:42:25,859 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-03-08 00:42:25,860 [ scc.merge] INFO Repository: ome/omero-plugins
2025-03-08 00:42:25,860 [ scc.merge] INFO Already up to date.
2025-03-08 00:42:25,860 [ scc.merge] INFO
2025-03-08 00:42:25,860 [ scc.merge] INFO Merged PRs:
2025-03-08 00:42:25,860 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-03-08 00:42:25,860 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-03-08 00:42:25,860 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-03-08 00:42:25,860 [ scc.merge] INFO
2025-03-08 00:42:25,860 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-03-08 00:42:25,860 [ scc.merge] INFO Already up to date.
2025-03-08 00:42:25,860 [ scc.merge] INFO
2025-03-08 00:42:25,860 [ scc.merge] INFO
2025-03-08 00:42:25,860 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-03-08 00:42:25,860 [ scc.merge] INFO Excluded PRs:
2025-03-08 00:42:25,860 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-03-08 00:42:25,860 [ scc.merge] INFO Already up to date.
2025-03-08 00:42:25,860 [ scc.merge] INFO
2025-03-08 00:42:25,860 [ scc.merge] INFO
2025-03-08 00:42:25,860 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-03-08 00:42:25,860 [ scc.merge] INFO Excluded PRs:
2025-03-08 00:42:25,860 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-03-08 00:42:25,860 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-03-08 00:42:25,860 [ scc.merge] INFO Already up to date.
2025-03-08 00:42:25,861 [ scc.merge] INFO
2025-03-08 00:42:25,861 [ scc.merge] INFO Merged PRs:
2025-03-08 00:42:25,861 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-03-08 00:42:25,861 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-03-08 00:42:25,861 [ scc.merge] INFO
2025-03-08 00:42:25,861 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-03-08 00:42:25,861 [ scc.merge] INFO Excluded PRs:
2025-03-08 00:42:25,861 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-03-08 00:42:25,861 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-03-08 00:42:25,861 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-08 00:42:25,861 [ scc.merge] INFO Already up to date.
2025-03-08 00:42:25,861 [ scc.merge] INFO
2025-03-08 00:42:25,861 [ scc.merge] INFO Merged PRs:
2025-03-08 00:42:25,861 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-03-08 00:42:25,861 [ scc.merge] INFO
2025-03-08 00:42:25,861 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-08 00:42:25,861 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-03-08 00:42:25,861 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-03-08 00:42:25,861 [ scc.merge] INFO
2025-03-08 00:42:25,861 [ scc.merge] INFO Repository: ome/omero-figure
2025-03-08 00:42:25,861 [ scc.merge] INFO Excluded PRs:
2025-03-08 00:42:25,861 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-03-08 00:42:25,861 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (stage: draft)
2025-03-08 00:42:25,861 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-03-08 00:42:25,861 [ scc.merge] INFO Already up to date.
2025-03-08 00:42:25,861 [ scc.merge] INFO
2025-03-08 00:42:25,861 [ scc.merge] INFO Merged PRs:
2025-03-08 00:42:25,861 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-03-08 00:42:25,861 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-03-08 00:42:25,861 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-03-08 00:42:25,862 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-03-08 00:42:25,862 [ scc.merge] INFO
2025-03-08 00:42:25,862 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-08 00:42:25,862 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-03-08 00:42:25,862 [ scc.merge] INFO
2025-03-08 00:42:25,862 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-03-08 00:42:25,862 [ scc.merge] INFO Already up to date.
2025-03-08 00:42:25,862 [ scc.merge] INFO
2025-03-08 00:42:25,862 [ scc.merge] INFO Merged PRs:
2025-03-08 00:42:25,862 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-03-08 00:42:25,862 [ scc.merge] INFO
2025-03-08 00:42:25,862 [ scc.merge] INFO Repository: ome/omero-gallery
2025-03-08 00:42:25,862 [ scc.merge] INFO Already up to date.
2025-03-08 00:42:25,862 [ scc.merge] INFO
2025-03-08 00:42:25,862 [ scc.merge] INFO Merged PRs:
2025-03-08 00:42:25,862 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-03-08 00:42:25,862 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-03-08 00:42:25,862 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-03-08 00:42:25,862 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-03-08 00:42:25,862 [ scc.merge] INFO
2025-03-08 00:42:25,862 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-08 00:42:25,862 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-03-08 00:42:25,862 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-03-08 00:42:25,862 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-03-08 00:42:25,862 [ scc.merge] INFO
2025-03-08 00:42:25,862 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-03-08 00:42:25,862 [ scc.merge] INFO Excluded PRs:
2025-03-08 00:42:25,862 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-03-08 00:42:25,862 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-03-08 00:42:25,862 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-03-08 00:42:25,863 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-03-08 00:42:25,863 [ scc.merge] INFO Already up to date.
2025-03-08 00:42:25,863 [ scc.merge] INFO
2025-03-08 00:42:25,863 [ scc.merge] INFO Merged PRs:
2025-03-08 00:42:25,863 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-03-08 00:42:25,863 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-03-08 00:42:25,863 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-08 00:42:25,863 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-08 00:42:25,863 [ scc.merge] INFO
2025-03-08 00:42:25,863 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-08 00:42:25,863 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-08 00:42:25,863 [ scc.merge] INFO
2025-03-08 00:42:25,863 [ scc.merge] INFO Repository: ome/omero-mapr
2025-03-08 00:42:25,863 [ scc.merge] INFO Excluded PRs:
2025-03-08 00:42:25,863 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-03-08 00:42:25,863 [ scc.merge] INFO Already up to date.
2025-03-08 00:42:25,863 [ scc.merge] INFO
2025-03-08 00:42:25,863 [ scc.merge] INFO Merged PRs:
2025-03-08 00:42:25,863 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-03-08 00:42:25,863 [ scc.merge] INFO
2025-03-08 00:42:25,863 [ scc.merge] INFO Repository: ome/omero-metadata
2025-03-08 00:42:25,863 [ scc.merge] INFO Already up to date.
2025-03-08 00:42:25,863 [ scc.merge] INFO
2025-03-08 00:42:25,863 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-08 00:42:25,863 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-08 00:42:25,863 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-08 00:42:25,863 [ scc.merge] INFO
2025-03-08 00:42:25,863 [ scc.merge] INFO Repository: ome/omero-parade
2025-03-08 00:42:25,863 [ scc.merge] INFO Excluded PRs:
2025-03-08 00:42:25,863 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-03-08 00:42:25,863 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-03-08 00:42:25,864 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-03-08 00:42:25,864 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-03-08 00:42:25,864 [ scc.merge] INFO Already up to date.
2025-03-08 00:42:25,864 [ scc.merge] INFO
2025-03-08 00:42:25,864 [ scc.merge] INFO Merged PRs:
2025-03-08 00:42:25,864 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-08 00:42:25,864 [ scc.merge] INFO
2025-03-08 00:42:25,864 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-03-08 00:42:25,864 [ scc.merge] INFO Already up to date.
2025-03-08 00:42:25,864 [ scc.merge] INFO
2025-03-08 00:42:25,864 [ scc.merge] INFO
2025-03-08 00:42:25,864 [ scc.merge] INFO Repository: ome/omero-rois
2025-03-08 00:42:25,864 [ scc.merge] INFO Excluded PRs:
2025-03-08 00:42:25,864 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-03-08 00:42:25,864 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-08 00:42:25,864 [ scc.merge] INFO Already up to date.
2025-03-08 00:42:25,864 [ scc.merge] INFO
2025-03-08 00:42:25,864 [ scc.merge] INFO
2025-03-08 00:42:25,864 [ scc.merge] INFO Repository: ome/omero-signup
2025-03-08 00:42:25,864 [ scc.merge] INFO Already up to date.
2025-03-08 00:42:25,864 [ scc.merge] INFO
2025-03-08 00:42:25,864 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-08 00:42:25,864 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-08 00:42:25,864 [ scc.merge] INFO
2025-03-08 00:42:25,864 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-03-08 00:42:25,864 [ scc.merge] INFO Excluded PRs:
2025-03-08 00:42:25,864 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-03-08 00:42:25,864 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-03-08 00:42:25,864 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-03-08 00:42:25,864 [ scc.merge] INFO Already up to date.
2025-03-08 00:42:25,865 [ scc.merge] INFO
2025-03-08 00:42:25,865 [ scc.merge] INFO Merged PRs:
2025-03-08 00:42:25,865 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-08 00:42:25,865 [ scc.merge] INFO
2025-03-08 00:42:25,865 [ scc.merge] INFO Repository: ome/omero-upload
2025-03-08 00:42:25,865 [ scc.merge] INFO Already up to date.
2025-03-08 00:42:25,865 [ scc.merge] INFO
2025-03-08 00:42:25,865 [ scc.merge] INFO
2025-03-08 00:42:25,865 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-03-08 00:42:25,865 [ scc.merge] INFO Already up to date.
2025-03-08 00:42:25,865 [ scc.merge] INFO
2025-03-08 00:42:25,865 [ scc.merge] INFO Merged PRs:
2025-03-08 00:42:25,865 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-03-08 00:42:25,865 [ scc.merge] INFO
2025-03-08 00:42:25,865 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-03-08 00:42:25,865 [ scc.merge] INFO Excluded PRs:
2025-03-08 00:42:25,865 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-03-08 00:42:25,865 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-03-08 00:42:25,865 [ scc.merge] INFO Already up to date.
2025-03-08 00:42:25,865 [ scc.merge] INFO
2025-03-08 00:42:25,865 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-08 00:42:25,865 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-08 00:42:25,865 [ scc.merge] INFO
2025-03-08 00:42:25,865 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-03-08 00:42:25,865 [ scc.merge] INFO Already up to date.
2025-03-08 00:42:25,865 [ scc.merge] INFO
2025-03-08 00:42:25,865 [ scc.merge] INFO
2025-03-08 00:42:25,865 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-03-08 00:42:25,865 [ scc.merge] INFO Already up to date.
2025-03-08 00:42:25,865 [ scc.merge] INFO
2025-03-08 00:42:25,865 [ scc.merge] INFO
2025-03-08 00:42:25,866 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-03-08 00:42:25,866 [ scc.merge] INFO Already up to date.
2025-03-08 00:42:25,866 [ scc.merge] INFO
2025-03-08 00:42:25,866 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-08 00:42:25,866 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-03-08 00:42:25,866 [ scc.merge] INFO
2025-03-08 00:42:25,866 [ scc.merge] INFO Repository: ome/scripts
2025-03-08 00:42:25,866 [ scc.merge] INFO Excluded PRs:
2025-03-08 00:42:25,866 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-03-08 00:42:25,866 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-03-08 00:42:25,866 [ scc.merge] INFO Already up to date.
2025-03-08 00:42:25,866 [ scc.merge] INFO
2025-03-08 00:42:25,866 [ scc.merge] INFO Merged PRs:
2025-03-08 00:42:25,866 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-08 00:42:25,866 [ scc.merge] INFO
2025-03-08 00:42:25,866 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-08 00:42:25,866 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-08 00:42:25,866 [ scc.merge] INFO
2025-03-08 00:42:25,866 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-03-08 00:42:25,866 [ scc.git] DEBUG Calling 'git remote'
2025-03-08 00:42:25,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-03-08 00:42:25,871 [ scc.git] DEBUG Calling 'git remote'
2025-03-08 00:42:25,876 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:25,876 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-03-08 00:42:25,877 [ scc.git] DEBUG Calling 'git remote'
2025-03-08 00:42:25,881 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:25,881 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-03-08 00:42:25,881 [ scc.git] DEBUG Calling 'git remote'
2025-03-08 00:42:25,886 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:25,886 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-03-08 00:42:25,886 [ scc.git] DEBUG Calling 'git remote'
2025-03-08 00:42:25,891 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:25,892 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-03-08 00:42:25,892 [ scc.git] DEBUG Calling 'git remote'
2025-03-08 00:42:25,897 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:25,897 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-03-08 00:42:25,897 [ scc.git] DEBUG Calling 'git remote'
2025-03-08 00:42:25,902 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:25,902 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-03-08 00:42:25,902 [ scc.git] DEBUG Calling 'git remote'
2025-03-08 00:42:25,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:25,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-08 00:42:25,907 [ scc.git] DEBUG Calling 'git remote'
2025-03-08 00:42:25,912 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:25,912 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-08 00:42:25,912 [ scc.git] DEBUG Calling 'git remote'
2025-03-08 00:42:25,917 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:25,917 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-08 00:42:25,917 [ scc.git] DEBUG Calling 'git remote'
2025-03-08 00:42:25,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:25,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-08 00:42:25,922 [ scc.git] DEBUG Calling 'git remote'
2025-03-08 00:42:25,927 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:25,927 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-08 00:42:25,927 [ scc.git] DEBUG Calling 'git remote'
2025-03-08 00:42:25,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:25,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-08 00:42:25,933 [ scc.git] DEBUG Calling 'git remote'
2025-03-08 00:42:25,939 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:25,939 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-08 00:42:25,939 [ scc.git] DEBUG Calling 'git remote'
2025-03-08 00:42:25,944 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:25,944 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-08 00:42:25,944 [ scc.git] DEBUG Calling 'git remote'
2025-03-08 00:42:25,949 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:25,949 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-08 00:42:25,949 [ scc.git] DEBUG Calling 'git remote'
2025-03-08 00:42:25,954 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:25,955 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-08 00:42:25,955 [ scc.git] DEBUG Calling 'git remote'
2025-03-08 00:42:25,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:25,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-08 00:42:25,960 [ scc.git] DEBUG Calling 'git remote'
2025-03-08 00:42:25,965 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:25,965 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-08 00:42:25,965 [ scc.git] DEBUG Calling 'git remote'
2025-03-08 00:42:25,970 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:25,970 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-08 00:42:25,970 [ scc.git] DEBUG Calling 'git remote'
2025-03-08 00:42:25,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:25,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-08 00:42:25,975 [ scc.git] DEBUG Calling 'git remote'
2025-03-08 00:42:25,980 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-08 00:42:25,980 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-08 00:42:25,980 [ scc.git] DEBUG Calling 'git remote'
2025-03-08 00:42:25,985 [ 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 de4266c] 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 125cda1] 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-08 00:43:14,236 [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-08 00:43:23,688 [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-08 00:43:26,248 [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-08 00:43:31,042 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-08 00:44:12,106 [ 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}
