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#354 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/)'
2025-03-07 00:48:56,846 [ scc.git] DEBUG [detached HEAD bcf3da4] merge master -Dorg -Ssuccess-only
2025-03-07 00:48:56,846 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:48:56,847 [ scc.repo] DEBUG ## PRs found:
2025-03-07 00:48:56,984 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:48:57,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-03-07 00:48:57,585 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:48:57,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/503 HTTP/1.1" 200 None
2025-03-07 00:48:58,089 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:48:58,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/503/comments HTTP/1.1" 200 None
2025-03-07 00:48:58,611 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:48:58,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502 HTTP/1.1" 200 None
2025-03-07 00:48:59,114 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:48:59,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502/comments HTTP/1.1" 200 None
2025-03-07 00:48:59,378 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-07 00:48:59,629 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:00,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-03-07 00:49:00,254 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:00,529 [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-07 00:49:00,782 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:01,166 [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-07 00:49:01,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:01,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-03-07 00:49:01,882 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:02,077 [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-07 00:49:02,078 [ scc.repo] DEBUG - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-07 00:49:02,330 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:02,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-03-07 00:49:02,587 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-07 00:49:02,839 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:03,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-07 00:49:03,434 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:03,717 [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-07 00:49:03,970 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:04,459 [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-07 00:49:04,712 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:05,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-07 00:49:05,348 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:05,523 [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-07 00:49:05,524 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-07 00:49:05,776 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:06,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-03-07 00:49:06,263 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:06,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-03-07 00:49:06,757 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:07,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-03-07 00:49:07,254 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:07,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-03-07 00:49:07,767 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:08,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-07 00:49:08,300 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:08,518 [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-07 00:49:08,771 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:09,005 [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-07 00:49:09,258 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:09,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-07 00:49:09,872 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:10,048 [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-07 00:49:10,049 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-07 00:49:10,301 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:10,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-03-07 00:49:10,787 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:11,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-03-07 00:49:11,286 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:11,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-07 00:49:11,825 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:12,082 [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-07 00:49:12,335 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:12,637 [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-07 00:49:12,890 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:13,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-07 00:49:13,346 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:13,526 [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-07 00:49:13,527 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-03-07 00:49:13,779 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:14,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-03-07 00:49:14,262 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:14,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-03-07 00:49:14,800 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:15,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-07 00:49:15,353 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:15,555 [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-07 00:49:15,808 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:16,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-07 00:49:16,354 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:16,581 [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-07 00:49:16,582 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-03-07 00:49:16,583 [ scc.repo] DEBUG ## Branches found:
2025-03-07 00:49:16,583 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-07 00:49:16,583 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:49:16,583 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:16,590 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-07 00:49:16,596 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-07 00:49:16,596 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-07 00:49:16,602 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-07 00:49:16,608 [ scc.git] DEBUG Already up to date.
2025-03-07 00:49:16,609 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-03-07 00:49:18,023 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-07 00:49:18,024 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-03-07 00:49:18,029 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-03-07 00:49:19,222 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-07 00:49:19,222 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-03-07 00:49:19,228 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-03-07 00:49:20,510 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-07 00:49:20,510 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-03-07 00:49:20,516 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-03-07 00:49:20,816 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-07 00:49:20,816 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-03-07 00:49:20,821 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-03-07 00:49:21,137 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-07 00:49:21,137 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-03-07 00:49:21,143 [ scc.git] DEBUG ## Unique users: []
2025-03-07 00:49:21,143 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:49:21,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:21,149 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-07 00:49:21,160 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:21,167 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-07 00:49:21,447 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-03-07 00:49:21,447 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-03-07 00:49:21,449 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-07 00:49:21,453 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-03-07 00:49:21,453 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-03-07 00:49:21,453 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-03-07 00:49:21,456 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:21,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:49:21,635 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-07 00:49:21,646 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:21,652 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-07 00:49:22,041 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-03-07 00:49:22,041 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-03-07 00:49:22,041 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-03-07 00:49:22,041 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-03-07 00:49:22,042 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-07 00:49:22,048 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-03-07 00:49:22,048 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-03-07 00:49:22,048 [ scc.git] DEBUG src/app/header.html | 5 +
2025-03-07 00:49:22,048 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-03-07 00:49:22,048 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-03-07 00:49:22,048 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-03-07 00:49:22,048 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-03-07 00:49:22,048 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-03-07 00:49:22,051 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:22,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:49:22,263 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-07 00:49:22,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:22,280 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-07 00:49:22,516 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-03-07 00:49:22,517 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-07 00:49:22,521 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-03-07 00:49:22,521 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-03-07 00:49:22,521 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-03-07 00:49:22,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:22,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:49:22,781 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-07 00:49:22,805 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:22,811 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-07 00:49:22,859 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-07 00:49:22,870 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-03-07 00:49:22,870 [ scc.git] DEBUG package.json | 2 +-
2025-03-07 00:49:22,870 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-03-07 00:49:23,033 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:23,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:49:23,242 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-07 00:49:23,261 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:23,273 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-07 00:49:23,505 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-07 00:49:23,506 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-03-07 00:49:23,506 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-07 00:49:23,506 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-07 00:49:23,513 [ scc.git] DEBUG Calling 'git reset --hard 5ef1344fe8f33ba915663acd708153e662fe41da'
2025-03-07 00:49:23,525 [ scc.git] DEBUG HEAD is now at 5ef1344 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-03-07 00:49:23,528 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:23,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:49:23,712 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-07 00:49:23,719 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-03-07 00:49:23,725 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#354](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-03-07 00:49:23,731 [ scc.config] DEBUG Found github.token
2025-03-07 00:49:23,731 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-03-07 00:49:23,732 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-07 00:49:23,781 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:49:23,781 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:23,788 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-07 00:49:23,841 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-07 00:49:23,853 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe528614550> has no local changes
2025-03-07 00:49:23,854 [ 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#354 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/)'
2025-03-07 00:49:23,868 [ scc.git] DEBUG [detached HEAD c1f7090] merge master -Dorg -Ssuccess-only
2025-03-07 00:49:23,869 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:49:23,869 [ scc.repo] DEBUG ## PRs found:
2025-03-07 00:49:23,964 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:24,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-03-07 00:49:24,499 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:24,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-03-07 00:49:25,017 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:25,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-03-07 00:49:25,576 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:25,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-07 00:49:26,212 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:26,475 [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-07 00:49:26,727 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:26,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-07 00:49:27,194 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:27,393 [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-07 00:49:27,394 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-03-07 00:49:27,394 [ scc.repo] DEBUG ## Branches found:
2025-03-07 00:49:27,394 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-07 00:49:27,395 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:49:27,395 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:27,401 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-07 00:49:27,406 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-07 00:49:27,406 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-07 00:49:27,412 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-07 00:49:27,418 [ scc.git] DEBUG Already up to date.
2025-03-07 00:49:27,418 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-03-07 00:49:28,172 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-03-07 00:49:28,172 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-03-07 00:49:28,178 [ scc.git] DEBUG ## Unique users: []
2025-03-07 00:49:28,178 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:49:28,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:28,184 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-07 00:49:28,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:28,196 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-07 00:49:28,208 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-07 00:49:28,211 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-03-07 00:49:28,212 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-03-07 00:49:28,212 [ scc.git] DEBUG requirements.txt | 2 +-
2025-03-07 00:49:28,212 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-03-07 00:49:28,212 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-03-07 00:49:28,212 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-03-07 00:49:28,215 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:28,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:49:28,374 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-07 00:49:28,419 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:49:28,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:28,426 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-07 00:49:28,470 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-07 00:49:28,478 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe529662f70> has no local changes
2025-03-07 00:49:28,478 [ 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#354 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/)'
2025-03-07 00:49:28,488 [ scc.git] DEBUG [detached HEAD cc19c19] merge master -Dorg -Ssuccess-only
2025-03-07 00:49:28,489 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:49:28,489 [ scc.repo] DEBUG ## PRs found:
2025-03-07 00:49:28,627 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:28,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-03-07 00:49:29,226 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:29,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-03-07 00:49:29,714 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:30,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-03-07 00:49:30,325 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:30,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-07 00:49:30,894 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:31,132 [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-07 00:49:31,384 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:31,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-07 00:49:32,009 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:32,200 [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-07 00:49:32,200 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-07 00:49:32,453 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:32,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-03-07 00:49:32,984 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:33,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-03-07 00:49:33,545 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:33,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-07 00:49:34,157 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:34,370 [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-07 00:49:34,622 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:34,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-07 00:49:35,178 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:35,388 [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-07 00:49:35,389 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-07 00:49:35,389 [ scc.repo] DEBUG ## Branches found:
2025-03-07 00:49:35,389 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-07 00:49:35,390 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:49:35,390 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:35,398 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-07 00:49:35,403 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-07 00:49:35,404 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-07 00:49:35,409 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-07 00:49:35,415 [ scc.git] DEBUG Already up to date.
2025-03-07 00:49:35,416 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-03-07 00:49:36,360 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-07 00:49:36,361 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-03-07 00:49:36,366 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-03-07 00:49:36,943 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-07 00:49:36,943 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-03-07 00:49:36,948 [ scc.git] DEBUG ## Unique users: []
2025-03-07 00:49:36,949 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:49:36,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:36,954 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-07 00:49:36,962 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:36,967 [ 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-07 00:49:37,232 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-03-07 00:49:37,232 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-03-07 00:49:37,233 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-07 00:49:37,233 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-07 00:49:37,233 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-07 00:49:37,234 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-07 00:49:37,241 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-07 00:49:37,249 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-07 00:49:37,251 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:37,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:49:37,429 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-07 00:49:37,437 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-07 00:49:37,508 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#354](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-03-07 00:49:37,520 [ scc.config] DEBUG Found github.token
2025-03-07 00:49:37,521 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-03-07 00:49:37,521 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-07 00:49:37,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:37,536 [ 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-07 00:49:37,939 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-07 00:49:37,939 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-07 00:49:37,939 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-03-07 00:49:37,940 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-07 00:49:37,940 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-07 00:49:37,948 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-07 00:49:37,957 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-07 00:49:37,960 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:38,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:49:38,143 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-07 00:49:38,152 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-07 00:49:38,158 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#354](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/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-07 00:49:38,163 [ scc.config] DEBUG Found github.token
2025-03-07 00:49:38,164 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-03-07 00:49:38,164 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-07 00:49:38,207 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:49:38,207 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:38,213 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-07 00:49:38,257 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-07 00:49:38,265 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe529660f70> has no local changes
2025-03-07 00:49:38,265 [ 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#354 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/)'
2025-03-07 00:49:38,275 [ scc.git] DEBUG [detached HEAD af2a194] merge master -Dorg -Ssuccess-only
2025-03-07 00:49:38,275 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:49:38,276 [ scc.repo] DEBUG ## PRs found:
2025-03-07 00:49:38,395 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:38,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-03-07 00:49:39,115 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:39,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-03-07 00:49:39,401 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-07 00:49:39,653 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:40,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-07 00:49:40,358 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:40,648 [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-07 00:49:40,902 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:41,181 [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-07 00:49:41,434 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:41,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-07 00:49:41,910 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:42,119 [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-07 00:49:42,119 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-07 00:49:42,371 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:42,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-03-07 00:49:42,862 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:43,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-03-07 00:49:43,373 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:43,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-03-07 00:49:43,853 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:44,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-03-07 00:49:44,362 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:44,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-03-07 00:49:44,907 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:45,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-03-07 00:49:45,434 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:45,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-03-07 00:49:45,788 [ scc.repo] DEBUG ## Branches found:
2025-03-07 00:49:45,788 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-07 00:49:45,789 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:49:45,789 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:45,796 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-07 00:49:45,802 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-07 00:49:45,803 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-07 00:49:45,809 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-07 00:49:45,816 [ scc.git] DEBUG Already up to date.
2025-03-07 00:49:45,817 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-03-07 00:49:46,124 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-07 00:49:46,125 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-03-07 00:49:46,130 [ scc.git] DEBUG ## Unique users: []
2025-03-07 00:49:46,130 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:49:46,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:46,137 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-07 00:49:46,148 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:46,153 [ 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-07 00:49:46,273 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-07 00:49:46,277 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-03-07 00:49:46,277 [ scc.git] DEBUG package.json | 2 +-
2025-03-07 00:49:46,277 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-03-07 00:49:46,281 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:46,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:49:46,459 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-07 00:49:46,506 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:49:46,506 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:46,513 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-07 00:49:46,559 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-07 00:49:46,568 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe52965b040> has no local changes
2025-03-07 00:49:46,569 [ 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#354 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/)'
2025-03-07 00:49:46,580 [ scc.git] DEBUG [detached HEAD de869d7] merge master -Dorg -Ssuccess-only
2025-03-07 00:49:46,581 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:49:46,581 [ scc.repo] DEBUG ## PRs found:
2025-03-07 00:49:46,711 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:46,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-03-07 00:49:46,923 [ scc.repo] DEBUG ## Branches found:
2025-03-07 00:49:46,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-07 00:49:46,924 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:49:46,924 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:46,930 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-07 00:49:46,935 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-07 00:49:46,935 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-07 00:49:46,940 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-07 00:49:46,946 [ scc.git] DEBUG Already up to date.
2025-03-07 00:49:46,946 [ scc.git] DEBUG ## Unique users: []
2025-03-07 00:49:46,946 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:49:46,947 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:46,951 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-07 00:49:46,996 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:49:46,996 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:47,002 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-07 00:49:47,046 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-07 00:49:47,054 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe5285f4e20> has no local changes
2025-03-07 00:49:47,054 [ 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#354 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/)'
2025-03-07 00:49:47,063 [ scc.git] DEBUG [detached HEAD d34c7a7] merge master -Dorg -Ssuccess-only
2025-03-07 00:49:47,064 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:49:47,064 [ scc.repo] DEBUG ## PRs found:
2025-03-07 00:49:47,176 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:48,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-03-07 00:49:48,299 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:48,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-03-07 00:49:48,869 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:49,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-03-07 00:49:49,393 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:49,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-03-07 00:49:49,674 [ scc.repo] DEBUG ## Branches found:
2025-03-07 00:49:49,674 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-07 00:49:49,674 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:49:49,675 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:49,681 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-07 00:49:49,686 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-07 00:49:49,686 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-07 00:49:49,693 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-07 00:49:49,699 [ scc.git] DEBUG Already up to date.
2025-03-07 00:49:49,699 [ scc.git] DEBUG ## Unique users: []
2025-03-07 00:49:49,699 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:49:49,699 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:49,705 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-07 00:49:49,751 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:49:49,751 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:49,759 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-07 00:49:49,806 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-07 00:49:49,813 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe528619250> has no local changes
2025-03-07 00:49:49,813 [ 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#354 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/)'
2025-03-07 00:49:49,823 [ scc.git] DEBUG [detached HEAD dd86830] merge master -Dorg -Ssuccess-only
2025-03-07 00:49:49,824 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:49:49,824 [ scc.repo] DEBUG ## PRs found:
2025-03-07 00:49:49,926 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:50,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-03-07 00:49:50,495 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:50,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-03-07 00:49:51,021 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:51,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-03-07 00:49:51,523 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:51,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-07 00:49:52,126 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:52,355 [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-07 00:49:52,608 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:52,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-07 00:49:53,226 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:53,422 [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-07 00:49:53,423 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-07 00:49:53,423 [ scc.repo] DEBUG ## Branches found:
2025-03-07 00:49:53,423 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-07 00:49:53,423 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:49:53,423 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:53,430 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-07 00:49:53,436 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-07 00:49:53,437 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-07 00:49:53,443 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-07 00:49:53,450 [ scc.git] DEBUG Already up to date.
2025-03-07 00:49:53,451 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-03-07 00:49:53,856 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-03-07 00:49:53,857 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-03-07 00:49:53,862 [ scc.git] DEBUG ## Unique users: []
2025-03-07 00:49:53,862 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:49:53,862 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:53,869 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-07 00:49:53,877 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:53,883 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-07 00:49:54,049 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-03-07 00:49:54,049 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-03-07 00:49:54,050 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-03-07 00:49:54,050 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-03-07 00:49:54,050 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-03-07 00:49:54,050 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-03-07 00:49:54,050 [ scc.git] DEBUG Auto-merging setup.py
2025-03-07 00:49:54,050 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-03-07 00:49:54,050 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-07 00:49:54,050 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-07 00:49:54,057 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-07 00:49:54,064 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-03-07 00:49:54,067 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:54,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:49:54,256 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-07 00:49:54,263 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-07 00:49:54,336 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#354](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/views.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
--conflicts
2025-03-07 00:49:54,344 [ scc.config] DEBUG Found github.token
2025-03-07 00:49:54,344 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-03-07 00:49:54,344 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-07 00:49:54,390 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:49:54,390 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:49:54,397 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-07 00:49:54,441 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-07 00:49:54,449 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe528607eb0> has no local changes
2025-03-07 00:49:54,450 [ 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#354 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/)'
2025-03-07 00:49:54,460 [ scc.git] DEBUG [detached HEAD b3096c4] merge master -Dorg -Ssuccess-only
2025-03-07 00:49:54,460 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:49:54,461 [ scc.repo] DEBUG ## PRs found:
2025-03-07 00:49:54,508 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:54,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-03-07 00:49:55,041 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:55,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-03-07 00:49:55,592 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:55,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-03-07 00:49:56,103 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:56,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-03-07 00:49:56,661 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:56,945 [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-07 00:49:57,198 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:57,454 [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-07 00:49:57,707 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:57,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-03-07 00:49:58,236 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:58,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-03-07 00:49:58,721 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:58,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-03-07 00:49:59,218 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:49:59,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-03-07 00:49:59,774 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:00,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-07 00:50:00,390 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:00,642 [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-07 00:50:00,894 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:01,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-07 00:50:01,356 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:01,559 [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-07 00:50:01,560 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-07 00:50:01,560 [ scc.repo] DEBUG ## Branches found:
2025-03-07 00:50:01,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-07 00:50:01,561 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:01,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:01,568 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-07 00:50:01,574 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-07 00:50:01,574 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-07 00:50:01,580 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-07 00:50:01,587 [ scc.git] DEBUG Already up to date.
2025-03-07 00:50:01,588 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-03-07 00:50:02,084 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-03-07 00:50:02,084 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-03-07 00:50:02,089 [ scc.git] DEBUG ## Unique users: []
2025-03-07 00:50:02,089 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:02,090 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:02,096 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-03-07 00:50:02,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:02,108 [ 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-07 00:50:02,170 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-07 00:50:02,174 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-03-07 00:50:02,174 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-03-07 00:50:02,174 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-03-07 00:50:02,174 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-03-07 00:50:02,174 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-03-07 00:50:02,174 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-03-07 00:50:02,174 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-03-07 00:50:02,174 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-03-07 00:50:02,175 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-03-07 00:50:02,177 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:02,177 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-03-07 00:50:02,178 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-03-07 00:50:02,178 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-03-07 00:50:02,178 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-03-07 00:50:02,178 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-03-07 00:50:02,178 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-03-07 00:50:02,178 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-03-07 00:50:02,178 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-03-07 00:50:02,178 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-03-07 00:50:02,178 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-03-07 00:50:02,178 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-03-07 00:50:02,178 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-03-07 00:50:02,178 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-03-07 00:50:02,178 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-03-07 00:50:02,178 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-03-07 00:50:02,178 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-03-07 00:50:02,178 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-03-07 00:50:02,178 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-03-07 00:50:02,178 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-03-07 00:50:02,178 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-03-07 00:50:02,178 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-03-07 00:50:02,178 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-03-07 00:50:02,178 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-03-07 00:50:02,178 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-03-07 00:50:02,178 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-03-07 00:50:02,178 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-03-07 00:50:02,178 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-03-07 00:50:02,179 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-03-07 00:50:02,179 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-03-07 00:50:02,179 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-03-07 00:50:02,179 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-03-07 00:50:02,179 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-03-07 00:50:02,179 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-03-07 00:50:02,179 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-03-07 00:50:02,179 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-03-07 00:50:02,179 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-03-07 00:50:02,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:02,359 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-07 00:50:02,403 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:02,404 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:02,411 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-07 00:50:02,454 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-07 00:50:02,462 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe5285f4f40> has no local changes
2025-03-07 00:50:02,462 [ 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#354 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/)'
2025-03-07 00:50:02,473 [ scc.git] DEBUG [detached HEAD 28a4075] merge master -Dorg -Ssuccess-only
2025-03-07 00:50:02,473 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:02,473 [ scc.repo] DEBUG ## PRs found:
2025-03-07 00:50:02,612 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:02,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-03-07 00:50:02,820 [ scc.repo] DEBUG ## Branches found:
2025-03-07 00:50:02,820 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-07 00:50:02,820 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:02,820 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:02,827 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-07 00:50:02,832 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-07 00:50:02,833 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-07 00:50:02,838 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-07 00:50:02,844 [ scc.git] DEBUG Already up to date.
2025-03-07 00:50:02,845 [ scc.git] DEBUG ## Unique users: []
2025-03-07 00:50:02,845 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:02,845 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:02,850 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-07 00:50:02,893 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:02,893 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:02,899 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-07 00:50:02,944 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-07 00:50:02,953 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe52ba9ca30> has no local changes
2025-03-07 00:50:02,953 [ 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#354 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/)'
2025-03-07 00:50:02,967 [ scc.git] DEBUG [detached HEAD b8f0f5e] merge master -Dorg -Ssuccess-only
2025-03-07 00:50:02,967 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:02,968 [ scc.repo] DEBUG ## PRs found:
2025-03-07 00:50:03,072 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:03,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-03-07 00:50:03,627 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:03,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-03-07 00:50:04,142 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:04,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-03-07 00:50:04,622 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:04,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-07 00:50:05,181 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:05,438 [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-07 00:50:05,690 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:06,003 [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-07 00:50:06,257 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:06,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-07 00:50:06,820 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:07,034 [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-07 00:50:07,035 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-03-07 00:50:07,035 [ scc.repo] DEBUG ## Branches found:
2025-03-07 00:50:07,035 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-07 00:50:07,035 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:07,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:07,043 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-07 00:50:07,049 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-07 00:50:07,050 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-07 00:50:07,056 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-07 00:50:07,063 [ scc.git] DEBUG Already up to date.
2025-03-07 00:50:07,063 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-03-07 00:50:08,136 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-03-07 00:50:08,136 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-03-07 00:50:08,141 [ scc.git] DEBUG ## Unique users: []
2025-03-07 00:50:08,141 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:08,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:08,148 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-03-07 00:50:08,156 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:08,162 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-03-07 00:50:08,321 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-07 00:50:08,325 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-03-07 00:50:08,325 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-03-07 00:50:08,325 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-03-07 00:50:08,325 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-03-07 00:50:08,325 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-03-07 00:50:08,328 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:08,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:08,509 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-07 00:50:08,556 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:08,556 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:08,562 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-07 00:50:08,607 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-07 00:50:08,616 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe52861e3a0> has no local changes
2025-03-07 00:50:08,616 [ 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#354 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/)'
2025-03-07 00:50:08,628 [ scc.git] DEBUG [detached HEAD 4d2fcb5] merge master -Dorg -Ssuccess-only
2025-03-07 00:50:08,628 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:08,628 [ scc.git] INFO Overriding base-branch from master to main
2025-03-07 00:50:08,628 [ scc.repo] DEBUG ## PRs found:
2025-03-07 00:50:08,762 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:09,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-03-07 00:50:09,314 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:09,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-03-07 00:50:09,839 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:10,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-03-07 00:50:10,362 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:10,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-03-07 00:50:11,155 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:11,441 [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-07 00:50:11,694 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:11,936 [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-07 00:50:12,189 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:12,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-03-07 00:50:12,713 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:12,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-03-07 00:50:13,243 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:13,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-03-07 00:50:13,730 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:14,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-07 00:50:14,300 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:14,615 [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-07 00:50:14,868 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:15,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-07 00:50:15,418 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:15,605 [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-07 00:50:15,606 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-07 00:50:15,606 [ scc.repo] DEBUG ## Branches found:
2025-03-07 00:50:15,606 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-07 00:50:15,607 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:15,607 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:15,613 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-03-07 00:50:15,618 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-07 00:50:15,618 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-03-07 00:50:15,624 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-03-07 00:50:15,630 [ scc.git] DEBUG Already up to date.
2025-03-07 00:50:15,630 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-03-07 00:50:16,136 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-03-07 00:50:16,137 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-03-07 00:50:16,142 [ scc.git] DEBUG ## Unique users: []
2025-03-07 00:50:16,142 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:16,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:16,148 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-07 00:50:16,155 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:16,167 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-07 00:50:16,257 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-03-07 00:50:16,258 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-03-07 00:50:16,258 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-07 00:50:16,259 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-07 00:50:16,266 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-07 00:50:16,274 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-03-07 00:50:16,277 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:16,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:16,456 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-07 00:50:16,464 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-07 00:50:16,473 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#354](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-03-07 00:50:16,480 [ scc.config] DEBUG Found github.token
2025-03-07 00:50:16,480 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-03-07 00:50:16,480 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-07 00:50:16,529 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:16,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:16,536 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-07 00:50:16,582 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-07 00:50:16,591 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe52857b3a0> has no local changes
2025-03-07 00:50:16,591 [ 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#354 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/)'
2025-03-07 00:50:16,602 [ scc.git] DEBUG [detached HEAD 49b2516] merge master -Dorg -Ssuccess-only
2025-03-07 00:50:16,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:16,603 [ scc.repo] DEBUG ## PRs found:
2025-03-07 00:50:16,709 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:16,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-03-07 00:50:16,920 [ scc.repo] DEBUG ## Branches found:
2025-03-07 00:50:16,921 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-07 00:50:16,921 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:16,921 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:16,927 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-07 00:50:16,934 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-07 00:50:16,934 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-07 00:50:16,941 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-07 00:50:16,949 [ scc.git] DEBUG Already up to date.
2025-03-07 00:50:16,949 [ scc.git] DEBUG ## Unique users: []
2025-03-07 00:50:16,949 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:16,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:16,954 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-07 00:50:17,002 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:17,003 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:17,008 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-07 00:50:17,058 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-07 00:50:17,066 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe52859bf40> has no local changes
2025-03-07 00:50:17,066 [ 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#354 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/)'
2025-03-07 00:50:17,076 [ scc.git] DEBUG [detached HEAD 45ac463] merge master -Dorg -Ssuccess-only
2025-03-07 00:50:17,076 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:17,076 [ scc.repo] DEBUG ## PRs found:
2025-03-07 00:50:17,173 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:17,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-03-07 00:50:17,369 [ scc.repo] DEBUG ## Branches found:
2025-03-07 00:50:17,370 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-07 00:50:17,370 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:17,370 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:17,376 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-07 00:50:17,383 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-07 00:50:17,383 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-07 00:50:17,390 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-07 00:50:17,397 [ scc.git] DEBUG Already up to date.
2025-03-07 00:50:17,398 [ scc.git] DEBUG ## Unique users: []
2025-03-07 00:50:17,398 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:17,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:17,403 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-07 00:50:17,452 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:17,452 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:17,459 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-07 00:50:17,504 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-07 00:50:17,512 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe52857a850> has no local changes
2025-03-07 00:50:17,512 [ 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#354 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/)'
2025-03-07 00:50:17,523 [ scc.git] DEBUG [detached HEAD 2fa1c2a] merge master -Dorg -Ssuccess-only
2025-03-07 00:50:17,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:17,524 [ scc.repo] DEBUG ## PRs found:
2025-03-07 00:50:17,622 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:17,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-03-07 00:50:18,201 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:18,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-03-07 00:50:18,682 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:18,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-03-07 00:50:19,165 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:19,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-07 00:50:19,751 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:19,956 [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-07 00:50:20,208 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:20,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-07 00:50:20,707 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:20,906 [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-07 00:50:20,907 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-03-07 00:50:20,907 [ scc.repo] DEBUG ## Branches found:
2025-03-07 00:50:20,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-07 00:50:20,907 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:20,907 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:20,913 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-07 00:50:20,919 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-07 00:50:20,919 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-07 00:50:20,924 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-07 00:50:20,930 [ scc.git] DEBUG Already up to date.
2025-03-07 00:50:20,931 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-03-07 00:50:21,433 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-03-07 00:50:21,434 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-03-07 00:50:21,439 [ scc.git] DEBUG ## Unique users: []
2025-03-07 00:50:21,439 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:21,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:21,446 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-07 00:50:21,452 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:21,458 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-07 00:50:21,611 [ scc.git] DEBUG Auto-merging Dockerfile
2025-03-07 00:50:21,612 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-03-07 00:50:21,612 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-07 00:50:21,613 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-07 00:50:21,619 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-07 00:50:21,627 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-03-07 00:50:21,630 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:21,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:21,793 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-07 00:50:21,800 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-07 00:50:21,807 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#354](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-03-07 00:50:21,812 [ scc.config] DEBUG Found github.token
2025-03-07 00:50:21,813 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-03-07 00:50:21,813 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-07 00:50:21,858 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:21,858 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:21,864 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-07 00:50:21,907 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-07 00:50:21,915 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe52858dd30> has no local changes
2025-03-07 00:50:21,916 [ 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#354 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/)'
2025-03-07 00:50:21,926 [ scc.git] DEBUG [detached HEAD d00d1eb] merge master -Dorg -Ssuccess-only
2025-03-07 00:50:21,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:21,926 [ scc.git] INFO Overriding base-branch from master to develop
2025-03-07 00:50:21,926 [ scc.repo] DEBUG ## PRs found:
2025-03-07 00:50:22,045 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:22,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-03-07 00:50:22,662 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:22,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-03-07 00:50:23,176 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:23,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-03-07 00:50:23,675 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:24,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-07 00:50:24,271 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:24,491 [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-07 00:50:24,744 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:25,049 [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-07 00:50:25,302 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:25,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-07 00:50:25,898 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:26,097 [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-07 00:50:26,098 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-07 00:50:26,349 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:26,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-03-07 00:50:26,864 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:27,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-03-07 00:50:27,357 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:27,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-07 00:50:27,891 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:28,146 [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-07 00:50:28,399 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:28,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-07 00:50:28,891 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:29,087 [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-07 00:50:29,088 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-07 00:50:29,340 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:29,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-03-07 00:50:29,849 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:30,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-03-07 00:50:30,431 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:30,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-03-07 00:50:30,903 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:31,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-03-07 00:50:31,176 [ scc.repo] DEBUG ## Branches found:
2025-03-07 00:50:31,176 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-07 00:50:31,177 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:31,177 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:31,184 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-03-07 00:50:31,191 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-07 00:50:31,191 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-03-07 00:50:31,199 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-03-07 00:50:31,208 [ scc.git] DEBUG Already up to date.
2025-03-07 00:50:31,208 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-03-07 00:50:32,144 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-07 00:50:32,145 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-03-07 00:50:32,150 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-03-07 00:50:32,758 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-07 00:50:32,758 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-03-07 00:50:32,763 [ scc.git] DEBUG ## Unique users: []
2025-03-07 00:50:32,763 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:32,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:32,769 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-07 00:50:32,777 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:32,783 [ 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-07 00:50:32,892 [ 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-07 00:50:32,892 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-07 00:50:32,893 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-07 00:50:32,899 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-07 00:50:32,906 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-03-07 00:50:32,909 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:33,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:33,093 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-07 00:50:33,103 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-07 00:50:33,110 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#354](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-03-07 00:50:33,114 [ scc.config] DEBUG Found github.token
2025-03-07 00:50:33,115 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-03-07 00:50:33,115 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-07 00:50:33,122 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:33,127 [ 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-07 00:50:33,143 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-07 00:50:33,146 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-03-07 00:50:33,146 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-03-07 00:50:33,345 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:33,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:33,531 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-07 00:50:33,581 [ scc.git] DEBUG Get sha1 of %s
2025-03-07 00:50:33,582 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-07 00:50:33,590 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-07 00:50:33,639 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-07 00:50:33,647 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe52852d0a0> has no local changes
2025-03-07 00:50:33,647 [ 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#354 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/)'
2025-03-07 00:50:33,658 [ scc.git] DEBUG [detached HEAD 978b1b0] merge master -Dorg -Ssuccess-only
2025-03-07 00:50:33,659 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:33,659 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-07 00:50:33,746 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-03-07 00:50:33,784 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:33,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:33,960 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-03-07 00:50:33,965 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-03-07 00:50:34,199 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:34,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:34,399 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-03-07 00:50:34,404 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-03-07 00:50:34,639 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:34,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:34,857 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-03-07 00:50:34,862 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-03-07 00:50:35,096 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:35,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:35,307 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-03-07 00:50:35,542 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:35,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:35,731 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-03-07 00:50:35,736 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-03-07 00:50:35,970 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:36,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:36,168 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-03-07 00:50:36,174 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-03-07 00:50:36,407 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:36,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:36,609 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-03-07 00:50:36,614 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-03-07 00:50:36,847 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:37,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:37,027 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-03-07 00:50:37,032 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-03-07 00:50:37,268 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:37,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:37,469 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-03-07 00:50:37,474 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-03-07 00:50:37,710 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:37,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:37,907 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-03-07 00:50:37,912 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-03-07 00:50:38,145 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:38,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:38,333 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-03-07 00:50:38,339 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-03-07 00:50:38,573 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:38,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:38,791 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-03-07 00:50:38,796 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-03-07 00:50:39,030 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:39,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:39,226 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-03-07 00:50:39,462 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:39,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:39,669 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-03-07 00:50:39,902 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:40,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:40,093 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-03-07 00:50:40,098 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-03-07 00:50:40,335 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:40,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:40,533 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-03-07 00:50:40,766 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:40,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:40,969 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-03-07 00:50:41,199 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:41,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:41,390 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-03-07 00:50:41,394 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-03-07 00:50:41,630 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:41,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:41,831 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-03-07 00:50:41,836 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-03-07 00:50:42,071 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:42,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:42,277 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-03-07 00:50:42,282 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-03-07 00:50:42,515 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:42,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:42,715 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-03-07 00:50:42,721 [ scc.config] DEBUG Found submodule.scripts.url
2025-03-07 00:50:42,956 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-07 00:50:43,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-07 00:50:43,260 [ scc.config] DEBUG Found submodule.scripts.branch
2025-03-07 00:50:43,260 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-07 00:50:43,365 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe52dc12f10> has local changes
2025-03-07 00:50:43,366 [ 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#354 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/354/)'
2025-03-07 00:50:43,385 [ scc.git] DEBUG [detached HEAD 49464bb] merge master -Dorg -Ssuccess-only
2025-03-07 00:50:43,386 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-03-07 00:50:43,386 [ scc.merge] INFO Repository: ome/omero-plugins
2025-03-07 00:50:43,386 [ scc.merge] INFO Already up to date.
2025-03-07 00:50:43,386 [ scc.merge] INFO
2025-03-07 00:50:43,386 [ scc.merge] INFO Merged PRs:
2025-03-07 00:50:43,386 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-03-07 00:50:43,386 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-03-07 00:50:43,386 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-03-07 00:50:43,386 [ scc.merge] INFO
2025-03-07 00:50:43,386 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-03-07 00:50:43,386 [ scc.merge] INFO Already up to date.
2025-03-07 00:50:43,386 [ scc.merge] INFO
2025-03-07 00:50:43,386 [ scc.merge] INFO
2025-03-07 00:50:43,386 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-03-07 00:50:43,386 [ scc.merge] INFO Excluded PRs:
2025-03-07 00:50:43,386 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-03-07 00:50:43,386 [ scc.merge] INFO Already up to date.
2025-03-07 00:50:43,387 [ scc.merge] INFO
2025-03-07 00:50:43,387 [ scc.merge] INFO
2025-03-07 00:50:43,387 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-03-07 00:50:43,387 [ scc.merge] INFO Excluded PRs:
2025-03-07 00:50:43,387 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-03-07 00:50:43,387 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-03-07 00:50:43,387 [ scc.merge] INFO Already up to date.
2025-03-07 00:50:43,387 [ scc.merge] INFO
2025-03-07 00:50:43,387 [ scc.merge] INFO Merged PRs:
2025-03-07 00:50:43,387 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-03-07 00:50:43,387 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-03-07 00:50:43,387 [ scc.merge] INFO
2025-03-07 00:50:43,387 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-03-07 00:50:43,387 [ scc.merge] INFO Excluded PRs:
2025-03-07 00:50:43,387 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-03-07 00:50:43,387 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-03-07 00:50:43,387 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-07 00:50:43,387 [ scc.merge] INFO Already up to date.
2025-03-07 00:50:43,387 [ scc.merge] INFO
2025-03-07 00:50:43,387 [ scc.merge] INFO Merged PRs:
2025-03-07 00:50:43,387 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-03-07 00:50:43,387 [ scc.merge] INFO
2025-03-07 00:50:43,387 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-07 00:50:43,387 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-03-07 00:50:43,387 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-03-07 00:50:43,387 [ scc.merge] INFO
2025-03-07 00:50:43,387 [ scc.merge] INFO Repository: ome/omero-figure
2025-03-07 00:50:43,387 [ scc.merge] INFO Excluded PRs:
2025-03-07 00:50:43,387 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-03-07 00:50:43,387 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (stage: draft)
2025-03-07 00:50:43,387 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-03-07 00:50:43,388 [ scc.merge] INFO Already up to date.
2025-03-07 00:50:43,388 [ scc.merge] INFO
2025-03-07 00:50:43,388 [ scc.merge] INFO Merged PRs:
2025-03-07 00:50:43,388 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-03-07 00:50:43,388 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-03-07 00:50:43,388 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-03-07 00:50:43,388 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-03-07 00:50:43,388 [ scc.merge] INFO
2025-03-07 00:50:43,388 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-07 00:50:43,388 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-03-07 00:50:43,388 [ scc.merge] INFO
2025-03-07 00:50:43,388 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-03-07 00:50:43,388 [ scc.merge] INFO Already up to date.
2025-03-07 00:50:43,388 [ scc.merge] INFO
2025-03-07 00:50:43,388 [ scc.merge] INFO Merged PRs:
2025-03-07 00:50:43,388 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-03-07 00:50:43,388 [ scc.merge] INFO
2025-03-07 00:50:43,388 [ scc.merge] INFO Repository: ome/omero-gallery
2025-03-07 00:50:43,388 [ scc.merge] INFO Already up to date.
2025-03-07 00:50:43,388 [ scc.merge] INFO
2025-03-07 00:50:43,388 [ scc.merge] INFO Merged PRs:
2025-03-07 00:50:43,388 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-03-07 00:50:43,388 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-03-07 00:50:43,388 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-03-07 00:50:43,388 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-03-07 00:50:43,388 [ scc.merge] INFO
2025-03-07 00:50:43,388 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-07 00:50:43,388 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-03-07 00:50:43,388 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-03-07 00:50:43,388 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-03-07 00:50:43,388 [ scc.merge] INFO
2025-03-07 00:50:43,388 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-03-07 00:50:43,389 [ scc.merge] INFO Excluded PRs:
2025-03-07 00:50:43,389 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-03-07 00:50:43,389 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-03-07 00:50:43,389 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-03-07 00:50:43,389 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-03-07 00:50:43,389 [ scc.merge] INFO Already up to date.
2025-03-07 00:50:43,389 [ scc.merge] INFO
2025-03-07 00:50:43,389 [ scc.merge] INFO Merged PRs:
2025-03-07 00:50:43,389 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-03-07 00:50:43,389 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-03-07 00:50:43,389 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-07 00:50:43,389 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-07 00:50:43,389 [ scc.merge] INFO
2025-03-07 00:50:43,389 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-07 00:50:43,389 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-07 00:50:43,389 [ scc.merge] INFO
2025-03-07 00:50:43,389 [ scc.merge] INFO Repository: ome/omero-mapr
2025-03-07 00:50:43,389 [ scc.merge] INFO Excluded PRs:
2025-03-07 00:50:43,389 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-03-07 00:50:43,389 [ scc.merge] INFO Already up to date.
2025-03-07 00:50:43,389 [ scc.merge] INFO
2025-03-07 00:50:43,389 [ scc.merge] INFO Merged PRs:
2025-03-07 00:50:43,389 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-03-07 00:50:43,389 [ scc.merge] INFO
2025-03-07 00:50:43,389 [ scc.merge] INFO Repository: ome/omero-metadata
2025-03-07 00:50:43,389 [ scc.merge] INFO Already up to date.
2025-03-07 00:50:43,389 [ scc.merge] INFO
2025-03-07 00:50:43,389 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-07 00:50:43,389 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-07 00:50:43,389 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-07 00:50:43,389 [ scc.merge] INFO
2025-03-07 00:50:43,390 [ scc.merge] INFO Repository: ome/omero-parade
2025-03-07 00:50:43,390 [ scc.merge] INFO Excluded PRs:
2025-03-07 00:50:43,390 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-03-07 00:50:43,390 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-03-07 00:50:43,390 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-03-07 00:50:43,390 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-03-07 00:50:43,390 [ scc.merge] INFO Already up to date.
2025-03-07 00:50:43,390 [ scc.merge] INFO
2025-03-07 00:50:43,390 [ scc.merge] INFO Merged PRs:
2025-03-07 00:50:43,390 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-07 00:50:43,390 [ scc.merge] INFO
2025-03-07 00:50:43,390 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-03-07 00:50:43,390 [ scc.merge] INFO Already up to date.
2025-03-07 00:50:43,390 [ scc.merge] INFO
2025-03-07 00:50:43,390 [ scc.merge] INFO
2025-03-07 00:50:43,390 [ scc.merge] INFO Repository: ome/omero-rois
2025-03-07 00:50:43,390 [ scc.merge] INFO Excluded PRs:
2025-03-07 00:50:43,390 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-03-07 00:50:43,390 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-07 00:50:43,390 [ scc.merge] INFO Already up to date.
2025-03-07 00:50:43,390 [ scc.merge] INFO
2025-03-07 00:50:43,390 [ scc.merge] INFO
2025-03-07 00:50:43,390 [ scc.merge] INFO Repository: ome/omero-signup
2025-03-07 00:50:43,390 [ scc.merge] INFO Already up to date.
2025-03-07 00:50:43,390 [ scc.merge] INFO
2025-03-07 00:50:43,390 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-07 00:50:43,390 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-07 00:50:43,390 [ scc.merge] INFO
2025-03-07 00:50:43,390 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-03-07 00:50:43,390 [ scc.merge] INFO Excluded PRs:
2025-03-07 00:50:43,390 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-03-07 00:50:43,390 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-03-07 00:50:43,391 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-03-07 00:50:43,391 [ scc.merge] INFO Already up to date.
2025-03-07 00:50:43,391 [ scc.merge] INFO
2025-03-07 00:50:43,391 [ scc.merge] INFO Merged PRs:
2025-03-07 00:50:43,391 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-07 00:50:43,391 [ scc.merge] INFO
2025-03-07 00:50:43,391 [ scc.merge] INFO Repository: ome/omero-upload
2025-03-07 00:50:43,391 [ scc.merge] INFO Already up to date.
2025-03-07 00:50:43,391 [ scc.merge] INFO
2025-03-07 00:50:43,391 [ scc.merge] INFO
2025-03-07 00:50:43,391 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-03-07 00:50:43,391 [ scc.merge] INFO Already up to date.
2025-03-07 00:50:43,391 [ scc.merge] INFO
2025-03-07 00:50:43,391 [ scc.merge] INFO Merged PRs:
2025-03-07 00:50:43,391 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-03-07 00:50:43,391 [ scc.merge] INFO
2025-03-07 00:50:43,391 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-03-07 00:50:43,391 [ scc.merge] INFO Excluded PRs:
2025-03-07 00:50:43,391 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-03-07 00:50:43,391 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-03-07 00:50:43,391 [ scc.merge] INFO Already up to date.
2025-03-07 00:50:43,391 [ scc.merge] INFO
2025-03-07 00:50:43,391 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-07 00:50:43,391 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-07 00:50:43,391 [ scc.merge] INFO
2025-03-07 00:50:43,391 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-03-07 00:50:43,391 [ scc.merge] INFO Already up to date.
2025-03-07 00:50:43,391 [ scc.merge] INFO
2025-03-07 00:50:43,391 [ scc.merge] INFO
2025-03-07 00:50:43,391 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-03-07 00:50:43,391 [ scc.merge] INFO Already up to date.
2025-03-07 00:50:43,391 [ scc.merge] INFO
2025-03-07 00:50:43,391 [ scc.merge] INFO
2025-03-07 00:50:43,392 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-03-07 00:50:43,392 [ scc.merge] INFO Already up to date.
2025-03-07 00:50:43,392 [ scc.merge] INFO
2025-03-07 00:50:43,392 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-07 00:50:43,392 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-03-07 00:50:43,392 [ scc.merge] INFO
2025-03-07 00:50:43,392 [ scc.merge] INFO Repository: ome/scripts
2025-03-07 00:50:43,392 [ scc.merge] INFO Excluded PRs:
2025-03-07 00:50:43,392 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-03-07 00:50:43,392 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-03-07 00:50:43,392 [ scc.merge] INFO Already up to date.
2025-03-07 00:50:43,392 [ scc.merge] INFO
2025-03-07 00:50:43,392 [ scc.merge] INFO Merged PRs:
2025-03-07 00:50:43,392 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-07 00:50:43,392 [ scc.merge] INFO
2025-03-07 00:50:43,392 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-07 00:50:43,392 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-07 00:50:43,392 [ scc.merge] INFO
2025-03-07 00:50:43,392 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-03-07 00:50:43,392 [ scc.git] DEBUG Calling 'git remote'
2025-03-07 00:50:43,399 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-03-07 00:50:43,399 [ scc.git] DEBUG Calling 'git remote'
2025-03-07 00:50:43,405 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:43,405 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-03-07 00:50:43,405 [ scc.git] DEBUG Calling 'git remote'
2025-03-07 00:50:43,410 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:43,410 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-03-07 00:50:43,410 [ scc.git] DEBUG Calling 'git remote'
2025-03-07 00:50:43,416 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:43,416 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-03-07 00:50:43,416 [ scc.git] DEBUG Calling 'git remote'
2025-03-07 00:50:43,422 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:43,423 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-03-07 00:50:43,423 [ scc.git] DEBUG Calling 'git remote'
2025-03-07 00:50:43,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:43,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-03-07 00:50:43,449 [ scc.git] DEBUG Calling 'git remote'
2025-03-07 00:50:43,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:43,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-03-07 00:50:43,459 [ scc.git] DEBUG Calling 'git remote'
2025-03-07 00:50:43,468 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:43,468 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-07 00:50:43,468 [ scc.git] DEBUG Calling 'git remote'
2025-03-07 00:50:43,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:43,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-07 00:50:43,475 [ scc.git] DEBUG Calling 'git remote'
2025-03-07 00:50:43,480 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:43,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-07 00:50:43,481 [ scc.git] DEBUG Calling 'git remote'
2025-03-07 00:50:43,485 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:43,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-07 00:50:43,486 [ scc.git] DEBUG Calling 'git remote'
2025-03-07 00:50:43,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:43,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-07 00:50:43,491 [ scc.git] DEBUG Calling 'git remote'
2025-03-07 00:50:43,497 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:43,497 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-07 00:50:43,497 [ scc.git] DEBUG Calling 'git remote'
2025-03-07 00:50:43,504 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:43,504 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-07 00:50:43,504 [ scc.git] DEBUG Calling 'git remote'
2025-03-07 00:50:43,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:43,512 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-07 00:50:43,512 [ scc.git] DEBUG Calling 'git remote'
2025-03-07 00:50:43,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:43,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-07 00:50:43,519 [ scc.git] DEBUG Calling 'git remote'
2025-03-07 00:50:43,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:43,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-07 00:50:43,524 [ scc.git] DEBUG Calling 'git remote'
2025-03-07 00:50:43,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:43,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-07 00:50:43,529 [ scc.git] DEBUG Calling 'git remote'
2025-03-07 00:50:43,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:43,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-07 00:50:43,536 [ scc.git] DEBUG Calling 'git remote'
2025-03-07 00:50:43,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:43,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-07 00:50:43,542 [ scc.git] DEBUG Calling 'git remote'
2025-03-07 00:50:43,549 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:43,549 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-07 00:50:43,549 [ scc.git] DEBUG Calling 'git remote'
2025-03-07 00:50:43,555 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-07 00:50:43,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-07 00:50:43,556 [ scc.git] DEBUG Calling 'git remote'
2025-03-07 00:50:43,562 [ 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 b02dcda] 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 21cf4c8] 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-07 00:51:35,387 [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-07 00:51:45,163 [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-07 00:51:47,767 [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-07 00:51:52,784 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-07 00:52:37,668 [ 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/3d58bc78/images/svgs/logo.svg){kind=logo}
