Skipping 183 KB..
Full Log2025-03-02 00:46:48,098 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-02 00:46:48,151 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:46:48,151 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:46:48,158 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-02 00:46:48,201 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-02 00:46:48,209 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7e9b187c40> has no local changes
2025-03-02 00:46:48,210 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Generated by OMERO-plugins-push#349 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/)'
2025-03-02 00:46:48,221 [ scc.git] DEBUG [detached HEAD 72d008c] merge master -Dorg -Ssuccess-only
2025-03-02 00:46:48,221 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:46:48,221 [ scc.repo] DEBUG ## PRs found:
2025-03-02 00:46:48,351 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:46:48,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-03-02 00:46:48,924 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:46:49,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/503 HTTP/1.1" 200 None
2025-03-02 00:46:49,393 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:46:49,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/503/comments HTTP/1.1" 200 None
2025-03-02 00:46:49,883 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:46:50,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502 HTTP/1.1" 200 None
2025-03-02 00:46:50,366 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:46:50,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502/comments HTTP/1.1" 200 None
2025-03-02 00:46:50,585 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-02 00:46:50,836 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:46:51,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-03-02 00:46:51,393 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:46:51,683 [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-02 00:46:51,935 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:46:52,243 [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-02 00:46:52,495 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:46:52,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-03-02 00:46:53,041 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:46:53,222 [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-02 00:46:53,222 [ scc.repo] DEBUG - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-02 00:46:53,474 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:46:53,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-03-02 00:46:53,711 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-02 00:46:53,961 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:46:54,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-02 00:46:54,527 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:46:54,790 [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-02 00:46:55,042 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:46:55,312 [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-02 00:46:55,564 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:46:55,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-02 00:46:56,156 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:46:56,343 [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-02 00:46:56,344 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-02 00:46:56,595 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:46:56,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-03-02 00:46:57,071 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:46:57,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-03-02 00:46:57,542 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:46:57,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-03-02 00:46:58,003 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:46:58,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-03-02 00:46:58,488 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:46:58,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-02 00:46:59,016 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:46:59,253 [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-02 00:46:59,505 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:46:59,703 [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-02 00:46:59,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:00,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-02 00:47:00,408 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:00,592 [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-02 00:47:00,593 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-02 00:47:00,844 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:01,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-03-02 00:47:01,328 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:01,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-03-02 00:47:01,894 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:02,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-02 00:47:02,424 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:02,625 [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-02 00:47:02,878 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:03,124 [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-02 00:47:03,378 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:03,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-02 00:47:03,889 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:04,064 [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-02 00:47:04,064 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-03-02 00:47:04,316 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:04,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-03-02 00:47:04,802 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:05,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-03-02 00:47:05,273 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:05,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-02 00:47:05,847 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:06,048 [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-02 00:47:06,300 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:06,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-02 00:47:06,824 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:07,000 [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-02 00:47:07,001 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-03-02 00:47:07,002 [ scc.repo] DEBUG ## Branches found:
2025-03-02 00:47:07,002 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-02 00:47:07,003 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:07,003 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:07,011 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-02 00:47:07,017 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-02 00:47:07,017 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-02 00:47:07,024 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-02 00:47:07,030 [ scc.git] DEBUG Already up to date.
2025-03-02 00:47:07,030 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-03-02 00:47:10,077 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-02 00:47:10,078 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-03-02 00:47:10,083 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-03-02 00:47:11,949 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-02 00:47:11,949 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-03-02 00:47:11,954 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-03-02 00:47:12,416 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-02 00:47:12,416 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-03-02 00:47:12,421 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-03-02 00:47:12,730 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-02 00:47:12,730 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-03-02 00:47:12,736 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-03-02 00:47:13,043 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-02 00:47:13,043 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-03-02 00:47:13,048 [ scc.git] DEBUG ## Unique users: []
2025-03-02 00:47:13,049 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:13,049 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:13,055 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-02 00:47:13,064 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:13,070 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-02 00:47:13,276 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-03-02 00:47:13,276 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-03-02 00:47:13,277 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-02 00:47:13,281 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-03-02 00:47:13,281 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-03-02 00:47:13,281 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-03-02 00:47:13,284 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:13,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:47:13,464 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-02 00:47:13,474 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:13,481 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-02 00:47:13,740 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-03-02 00:47:13,740 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-03-02 00:47:13,740 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-03-02 00:47:13,740 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-03-02 00:47:13,741 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-02 00:47:13,746 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-03-02 00:47:13,746 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-03-02 00:47:13,746 [ scc.git] DEBUG src/app/header.html | 5 +
2025-03-02 00:47:13,746 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-03-02 00:47:13,746 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-03-02 00:47:13,746 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-03-02 00:47:13,746 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-03-02 00:47:13,746 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-03-02 00:47:13,749 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:13,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:47:13,908 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-02 00:47:13,918 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:13,924 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-02 00:47:14,304 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-03-02 00:47:14,305 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-02 00:47:14,309 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-03-02 00:47:14,309 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-03-02 00:47:14,309 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-03-02 00:47:14,312 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:14,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:47:14,466 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-02 00:47:14,541 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:14,548 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-02 00:47:14,595 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-02 00:47:14,606 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-03-02 00:47:14,606 [ scc.git] DEBUG package.json | 2 +-
2025-03-02 00:47:14,606 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-03-02 00:47:14,718 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:14,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:47:14,887 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-02 00:47:14,908 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:14,925 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-02 00:47:15,044 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-02 00:47:15,044 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-03-02 00:47:15,044 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-02 00:47:15,044 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-02 00:47:15,052 [ scc.git] DEBUG Calling 'git reset --hard 02adc4853e8137836fc24b8da9c58b470f26b0bf'
2025-03-02 00:47:15,063 [ scc.git] DEBUG HEAD is now at 02adc48 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-03-02 00:47:15,139 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:15,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:47:15,295 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-02 00:47:15,302 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-03-02 00:47:15,307 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#349](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-03-02 00:47:15,313 [ scc.config] DEBUG Found github.token
2025-03-02 00:47:15,313 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-03-02 00:47:15,314 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-02 00:47:15,356 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:15,356 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:15,362 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-02 00:47:15,407 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-02 00:47:15,417 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7e980b2520> has no local changes
2025-03-02 00:47:15,417 [ 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#349 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/)'
2025-03-02 00:47:15,432 [ scc.git] DEBUG [detached HEAD 4031576] merge master -Dorg -Ssuccess-only
2025-03-02 00:47:15,432 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:47:15,432 [ scc.repo] DEBUG ## PRs found:
2025-03-02 00:47:15,547 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:15,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-03-02 00:47:16,140 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:16,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-03-02 00:47:16,628 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:16,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-03-02 00:47:17,151 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:17,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-02 00:47:17,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:17,875 [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-02 00:47:18,128 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:18,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-02 00:47:18,660 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:18,844 [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-02 00:47:18,845 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-03-02 00:47:18,845 [ scc.repo] DEBUG ## Branches found:
2025-03-02 00:47:18,845 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-02 00:47:18,846 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:18,846 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:18,853 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-02 00:47:18,859 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-02 00:47:18,859 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-02 00:47:18,865 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-02 00:47:18,871 [ scc.git] DEBUG Already up to date.
2025-03-02 00:47:18,871 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-03-02 00:47:19,724 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-03-02 00:47:19,724 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-03-02 00:47:19,730 [ scc.git] DEBUG ## Unique users: []
2025-03-02 00:47:19,730 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:19,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:19,736 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-02 00:47:19,744 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:19,750 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-02 00:47:19,763 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-02 00:47:19,766 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-03-02 00:47:19,766 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-03-02 00:47:19,766 [ scc.git] DEBUG requirements.txt | 2 +-
2025-03-02 00:47:19,767 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-03-02 00:47:19,767 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-03-02 00:47:19,767 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-03-02 00:47:19,769 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:19,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:47:19,933 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-02 00:47:19,976 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:19,976 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:19,982 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-02 00:47:20,025 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-02 00:47:20,032 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7e9a14b8e0> has no local changes
2025-03-02 00:47:20,032 [ 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#349 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/)'
2025-03-02 00:47:20,041 [ scc.git] DEBUG [detached HEAD 5ae05ab] merge master -Dorg -Ssuccess-only
2025-03-02 00:47:20,041 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:47:20,041 [ scc.repo] DEBUG ## PRs found:
2025-03-02 00:47:20,185 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:20,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-03-02 00:47:20,710 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:21,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-03-02 00:47:21,278 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:21,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-03-02 00:47:21,772 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:22,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-02 00:47:22,308 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:22,496 [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-02 00:47:22,748 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:23,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-02 00:47:23,254 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:23,420 [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-02 00:47:23,421 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-02 00:47:23,672 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:23,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-03-02 00:47:24,141 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:24,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-03-02 00:47:24,616 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:24,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-02 00:47:25,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:25,435 [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-02 00:47:25,688 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:25,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-02 00:47:26,240 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:26,420 [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-02 00:47:26,420 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-02 00:47:26,420 [ scc.repo] DEBUG ## Branches found:
2025-03-02 00:47:26,421 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-02 00:47:26,421 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:26,421 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:26,427 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-02 00:47:26,432 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-02 00:47:26,432 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-02 00:47:26,437 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-02 00:47:26,442 [ scc.git] DEBUG Already up to date.
2025-03-02 00:47:26,443 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-03-02 00:47:27,112 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-02 00:47:27,112 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-03-02 00:47:27,117 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-03-02 00:47:27,635 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-02 00:47:27,635 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-03-02 00:47:27,640 [ scc.git] DEBUG ## Unique users: []
2025-03-02 00:47:27,640 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:27,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:27,646 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-02 00:47:27,653 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:27,658 [ 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-02 00:47:27,792 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-03-02 00:47:27,792 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-03-02 00:47:27,792 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-02 00:47:27,792 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-02 00:47:27,793 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-02 00:47:27,794 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-02 00:47:27,802 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-02 00:47:27,811 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-02 00:47:27,813 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:28,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:47:28,008 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-02 00:47:28,016 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-02 00:47:28,112 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#349](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-03-02 00:47:28,118 [ scc.config] DEBUG Found github.token
2025-03-02 00:47:28,118 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-03-02 00:47:28,119 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-02 00:47:28,126 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:28,132 [ 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-02 00:47:28,277 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-02 00:47:28,277 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-02 00:47:28,277 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-03-02 00:47:28,277 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-02 00:47:28,277 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-02 00:47:28,285 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-02 00:47:28,293 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-02 00:47:28,296 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:28,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:47:28,469 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-02 00:47:28,479 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-02 00:47:28,486 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#349](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/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-02 00:47:28,491 [ scc.config] DEBUG Found github.token
2025-03-02 00:47:28,492 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-03-02 00:47:28,492 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-02 00:47:28,534 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:28,534 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:28,540 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-02 00:47:28,582 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-02 00:47:28,590 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7e9809c250> has no local changes
2025-03-02 00:47:28,590 [ 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#349 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/)'
2025-03-02 00:47:28,598 [ scc.git] DEBUG [detached HEAD d10c8df] merge master -Dorg -Ssuccess-only
2025-03-02 00:47:28,599 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:47:28,599 [ scc.repo] DEBUG ## PRs found:
2025-03-02 00:47:28,721 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:28,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-03-02 00:47:29,222 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:29,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-03-02 00:47:29,455 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-02 00:47:29,706 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:30,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-02 00:47:30,297 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:30,556 [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-02 00:47:30,808 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:31,119 [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-02 00:47:31,372 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:31,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-02 00:47:31,978 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:32,161 [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-02 00:47:32,162 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-02 00:47:32,413 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:32,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-03-02 00:47:32,901 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:33,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-03-02 00:47:33,390 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:33,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-03-02 00:47:33,866 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:34,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-03-02 00:47:34,325 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:34,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-03-02 00:47:34,844 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:35,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-03-02 00:47:35,321 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:35,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-03-02 00:47:35,567 [ scc.repo] DEBUG ## Branches found:
2025-03-02 00:47:35,567 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-02 00:47:35,567 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:35,567 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:35,573 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-02 00:47:35,578 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-02 00:47:35,578 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-02 00:47:35,583 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-02 00:47:35,589 [ scc.git] DEBUG Already up to date.
2025-03-02 00:47:35,589 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-03-02 00:47:35,906 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-02 00:47:35,907 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-03-02 00:47:35,911 [ scc.git] DEBUG ## Unique users: []
2025-03-02 00:47:35,911 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:35,911 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:35,917 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-02 00:47:35,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:35,927 [ 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-02 00:47:36,041 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-02 00:47:36,044 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-03-02 00:47:36,044 [ scc.git] DEBUG package.json | 2 +-
2025-03-02 00:47:36,044 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-03-02 00:47:36,047 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:36,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:47:36,200 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-02 00:47:36,244 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:36,244 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:36,251 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-02 00:47:36,293 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-02 00:47:36,300 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7e990e0f10> has no local changes
2025-03-02 00:47:36,300 [ 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#349 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/)'
2025-03-02 00:47:36,308 [ scc.git] DEBUG [detached HEAD d58da23] merge master -Dorg -Ssuccess-only
2025-03-02 00:47:36,309 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:47:36,309 [ scc.repo] DEBUG ## PRs found:
2025-03-02 00:47:36,452 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:36,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-03-02 00:47:36,641 [ scc.repo] DEBUG ## Branches found:
2025-03-02 00:47:36,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-02 00:47:36,641 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:36,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:36,648 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-02 00:47:36,652 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-02 00:47:36,653 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-02 00:47:36,658 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-02 00:47:36,663 [ scc.git] DEBUG Already up to date.
2025-03-02 00:47:36,663 [ scc.git] DEBUG ## Unique users: []
2025-03-02 00:47:36,663 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:36,663 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:36,668 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-02 00:47:36,710 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:36,710 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:36,717 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-02 00:47:36,759 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-02 00:47:36,766 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7e991078e0> has no local changes
2025-03-02 00:47:36,767 [ 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#349 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/)'
2025-03-02 00:47:36,776 [ scc.git] DEBUG [detached HEAD b143256] merge master -Dorg -Ssuccess-only
2025-03-02 00:47:36,776 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:47:36,776 [ scc.repo] DEBUG ## PRs found:
2025-03-02 00:47:36,893 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:37,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-03-02 00:47:37,394 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:37,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-03-02 00:47:37,616 [ scc.repo] DEBUG ## Branches found:
2025-03-02 00:47:37,616 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-02 00:47:37,616 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:37,616 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:37,622 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-02 00:47:37,627 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-02 00:47:37,627 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-02 00:47:37,633 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-02 00:47:37,638 [ scc.git] DEBUG Already up to date.
2025-03-02 00:47:37,638 [ scc.git] DEBUG ## Unique users: []
2025-03-02 00:47:37,638 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:37,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:37,643 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-02 00:47:37,683 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:37,683 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:37,689 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-02 00:47:37,728 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-02 00:47:37,735 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7e9808f4c0> has no local changes
2025-03-02 00:47:37,735 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Generated by OMERO-plugins-push#349 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/)'
2025-03-02 00:47:37,743 [ scc.git] DEBUG [detached HEAD f2869df] merge master -Dorg -Ssuccess-only
2025-03-02 00:47:37,744 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:47:37,744 [ scc.repo] DEBUG ## PRs found:
2025-03-02 00:47:37,868 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:38,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-03-02 00:47:38,405 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:38,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-03-02 00:47:38,905 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:39,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-03-02 00:47:39,360 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:39,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-02 00:47:39,962 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:40,177 [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-02 00:47:40,430 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:40,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-02 00:47:40,893 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:41,079 [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-02 00:47:41,080 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-02 00:47:41,080 [ scc.repo] DEBUG ## Branches found:
2025-03-02 00:47:41,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-02 00:47:41,080 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:41,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:41,087 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-02 00:47:41,093 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-02 00:47:41,094 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-02 00:47:41,100 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-02 00:47:41,107 [ scc.git] DEBUG Already up to date.
2025-03-02 00:47:41,107 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-03-02 00:47:41,550 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-03-02 00:47:41,551 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-03-02 00:47:41,556 [ scc.git] DEBUG ## Unique users: []
2025-03-02 00:47:41,556 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:41,556 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:41,562 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-02 00:47:41,568 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:41,573 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-02 00:47:41,751 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-03-02 00:47:41,752 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-03-02 00:47:41,752 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-03-02 00:47:41,752 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-03-02 00:47:41,752 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-03-02 00:47:41,752 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-03-02 00:47:41,752 [ scc.git] DEBUG Auto-merging setup.py
2025-03-02 00:47:41,752 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-03-02 00:47:41,752 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-02 00:47:41,752 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-02 00:47:41,759 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-02 00:47:41,766 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-03-02 00:47:41,768 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:41,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:47:41,935 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-02 00:47:41,943 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-02 00:47:41,971 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#349](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
--conflicts
2025-03-02 00:47:41,978 [ scc.config] DEBUG Found github.token
2025-03-02 00:47:41,978 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-03-02 00:47:41,978 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-02 00:47:42,020 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:42,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:42,027 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-02 00:47:42,070 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-02 00:47:42,078 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7e98090880> has no local changes
2025-03-02 00:47:42,079 [ 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#349 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/)'
2025-03-02 00:47:42,089 [ scc.git] DEBUG [detached HEAD e39c1df] merge master -Dorg -Ssuccess-only
2025-03-02 00:47:42,089 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:47:42,089 [ scc.repo] DEBUG ## PRs found:
2025-03-02 00:47:42,189 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:42,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-03-02 00:47:42,729 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:42,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-03-02 00:47:43,209 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:43,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-03-02 00:47:43,699 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:44,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-03-02 00:47:44,289 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:44,536 [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-02 00:47:44,790 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:45,028 [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-02 00:47:45,280 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:45,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-03-02 00:47:45,781 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:46,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-03-02 00:47:46,267 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:46,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-03-02 00:47:46,746 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:46,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-03-02 00:47:47,213 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:47,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-02 00:47:47,721 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:47,953 [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-02 00:47:48,207 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:48,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-02 00:47:48,668 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:48,860 [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-02 00:47:48,860 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-02 00:47:48,861 [ scc.repo] DEBUG ## Branches found:
2025-03-02 00:47:48,861 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-02 00:47:48,861 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:48,861 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:48,867 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-02 00:47:48,873 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-02 00:47:48,873 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-02 00:47:48,879 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-02 00:47:48,884 [ scc.git] DEBUG Already up to date.
2025-03-02 00:47:48,885 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-03-02 00:47:49,335 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-03-02 00:47:49,335 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-03-02 00:47:49,342 [ scc.git] DEBUG ## Unique users: []
2025-03-02 00:47:49,342 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:49,342 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:49,351 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-03-02 00:47:49,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:49,369 [ 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-02 00:47:49,403 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-02 00:47:49,407 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-03-02 00:47:49,407 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-03-02 00:47:49,407 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-03-02 00:47:49,407 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-03-02 00:47:49,407 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-03-02 00:47:49,407 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-03-02 00:47:49,407 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-03-02 00:47:49,407 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-03-02 00:47:49,407 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-03-02 00:47:49,408 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-03-02 00:47:49,410 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:49,410 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-03-02 00:47:49,411 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-03-02 00:47:49,411 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-03-02 00:47:49,411 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-03-02 00:47:49,411 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-03-02 00:47:49,411 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-03-02 00:47:49,411 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-03-02 00:47:49,411 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-03-02 00:47:49,411 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-03-02 00:47:49,411 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-03-02 00:47:49,411 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-03-02 00:47:49,411 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-03-02 00:47:49,411 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-03-02 00:47:49,411 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-03-02 00:47:49,411 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-03-02 00:47:49,411 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-03-02 00:47:49,411 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-03-02 00:47:49,411 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-03-02 00:47:49,411 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-03-02 00:47:49,411 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-03-02 00:47:49,411 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-03-02 00:47:49,411 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-03-02 00:47:49,411 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-03-02 00:47:49,411 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-03-02 00:47:49,411 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-03-02 00:47:49,411 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-03-02 00:47:49,411 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-03-02 00:47:49,411 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-03-02 00:47:49,411 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-03-02 00:47:49,411 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-03-02 00:47:49,411 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-03-02 00:47:49,412 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-03-02 00:47:49,412 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-03-02 00:47:49,412 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-03-02 00:47:49,412 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-03-02 00:47:49,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:47:49,582 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-02 00:47:49,625 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:49,625 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:49,632 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-02 00:47:49,674 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-02 00:47:49,682 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7e980b3ac0> has no local changes
2025-03-02 00:47:49,683 [ 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#349 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/)'
2025-03-02 00:47:49,693 [ scc.git] DEBUG [detached HEAD d3c44ba] merge master -Dorg -Ssuccess-only
2025-03-02 00:47:49,694 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:47:49,694 [ scc.repo] DEBUG ## PRs found:
2025-03-02 00:47:49,834 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:50,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-03-02 00:47:50,056 [ scc.repo] DEBUG ## Branches found:
2025-03-02 00:47:50,056 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-02 00:47:50,056 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:50,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:50,063 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-02 00:47:50,068 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-02 00:47:50,068 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-02 00:47:50,073 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-02 00:47:50,078 [ scc.git] DEBUG Already up to date.
2025-03-02 00:47:50,079 [ scc.git] DEBUG ## Unique users: []
2025-03-02 00:47:50,079 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:50,079 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:50,083 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-02 00:47:50,121 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:50,122 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:50,127 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-02 00:47:50,165 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-02 00:47:50,172 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7e980a0160> has no local changes
2025-03-02 00:47:50,172 [ 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#349 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/)'
2025-03-02 00:47:50,180 [ scc.git] DEBUG [detached HEAD 2364d3b] merge master -Dorg -Ssuccess-only
2025-03-02 00:47:50,181 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:47:50,181 [ scc.repo] DEBUG ## PRs found:
2025-03-02 00:47:50,308 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:50,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-03-02 00:47:50,845 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:51,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-03-02 00:47:51,327 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:51,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-03-02 00:47:51,802 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:52,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-02 00:47:52,348 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:52,578 [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-02 00:47:52,832 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:53,048 [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-02 00:47:53,301 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:53,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-02 00:47:53,845 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:54,018 [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-02 00:47:54,019 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-03-02 00:47:54,019 [ scc.repo] DEBUG ## Branches found:
2025-03-02 00:47:54,019 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-02 00:47:54,019 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:54,019 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:54,025 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-02 00:47:54,030 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-02 00:47:54,030 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-02 00:47:54,038 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-02 00:47:54,058 [ scc.git] DEBUG Already up to date.
2025-03-02 00:47:54,058 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-03-02 00:47:54,790 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-03-02 00:47:54,791 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-03-02 00:47:54,795 [ scc.git] DEBUG ## Unique users: []
2025-03-02 00:47:54,795 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:54,795 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:54,802 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-03-02 00:47:54,809 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:54,814 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-03-02 00:47:54,877 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-02 00:47:54,880 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-03-02 00:47:54,880 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-03-02 00:47:54,880 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-03-02 00:47:54,880 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-03-02 00:47:54,880 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-03-02 00:47:54,883 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:55,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:47:55,044 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-02 00:47:55,087 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:47:55,087 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:47:55,093 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-02 00:47:55,134 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-02 00:47:55,141 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7e980b3fa0> has no local changes
2025-03-02 00:47:55,141 [ 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#349 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/)'
2025-03-02 00:47:55,149 [ scc.git] DEBUG [detached HEAD bc0fbe9] merge master -Dorg -Ssuccess-only
2025-03-02 00:47:55,149 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:47:55,149 [ scc.git] INFO Overriding base-branch from master to main
2025-03-02 00:47:55,150 [ scc.repo] DEBUG ## PRs found:
2025-03-02 00:47:55,296 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:55,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-03-02 00:47:55,787 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:56,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-03-02 00:47:56,271 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:56,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-03-02 00:47:56,819 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:57,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-03-02 00:47:57,370 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:57,596 [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-02 00:47:57,848 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:58,090 [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-02 00:47:58,344 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:58,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-03-02 00:47:58,843 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:59,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-03-02 00:47:59,336 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:47:59,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-03-02 00:47:59,792 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:00,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-02 00:48:00,328 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:00,579 [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-02 00:48:00,832 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:01,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-02 00:48:01,349 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:01,527 [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-02 00:48:01,528 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-02 00:48:01,528 [ scc.repo] DEBUG ## Branches found:
2025-03-02 00:48:01,528 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-02 00:48:01,528 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:48:01,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:48:01,535 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-03-02 00:48:01,540 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-02 00:48:01,540 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-03-02 00:48:01,545 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-03-02 00:48:01,551 [ scc.git] DEBUG Already up to date.
2025-03-02 00:48:01,551 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-03-02 00:48:01,933 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-03-02 00:48:01,933 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-03-02 00:48:01,938 [ scc.git] DEBUG ## Unique users: []
2025-03-02 00:48:01,938 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:48:01,938 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:48:01,944 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-02 00:48:01,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:48:01,954 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-02 00:48:02,156 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-03-02 00:48:02,156 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-03-02 00:48:02,156 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-02 00:48:02,157 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-02 00:48:02,166 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-02 00:48:02,174 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-03-02 00:48:02,177 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:02,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:02,333 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-02 00:48:02,340 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-02 00:48:02,346 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#349](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-03-02 00:48:02,352 [ scc.config] DEBUG Found github.token
2025-03-02 00:48:02,353 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-03-02 00:48:02,353 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-02 00:48:02,401 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:48:02,402 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:48:02,409 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-02 00:48:02,471 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-02 00:48:02,477 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7e9806df10> has no local changes
2025-03-02 00:48:02,478 [ 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#349 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/)'
2025-03-02 00:48:02,486 [ scc.git] DEBUG [detached HEAD eaa1a32] merge master -Dorg -Ssuccess-only
2025-03-02 00:48:02,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:02,486 [ scc.repo] DEBUG ## PRs found:
2025-03-02 00:48:02,585 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:02,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-03-02 00:48:02,772 [ scc.repo] DEBUG ## Branches found:
2025-03-02 00:48:02,772 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-02 00:48:02,772 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:48:02,772 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:48:02,781 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-02 00:48:02,786 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-02 00:48:02,786 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-02 00:48:02,791 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-02 00:48:02,797 [ scc.git] DEBUG Already up to date.
2025-03-02 00:48:02,797 [ scc.git] DEBUG ## Unique users: []
2025-03-02 00:48:02,797 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:48:02,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:48:02,807 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-02 00:48:02,859 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:48:02,859 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:48:02,866 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-02 00:48:02,910 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-02 00:48:02,917 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7e807855b0> has no local changes
2025-03-02 00:48:02,917 [ 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#349 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/)'
2025-03-02 00:48:02,926 [ scc.git] DEBUG [detached HEAD fe823f0] merge master -Dorg -Ssuccess-only
2025-03-02 00:48:02,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:02,926 [ scc.repo] DEBUG ## PRs found:
2025-03-02 00:48:03,025 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:03,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-03-02 00:48:03,213 [ scc.repo] DEBUG ## Branches found:
2025-03-02 00:48:03,213 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-02 00:48:03,213 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:48:03,213 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:48:03,222 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-02 00:48:03,227 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-02 00:48:03,227 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-02 00:48:03,233 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-02 00:48:03,238 [ scc.git] DEBUG Already up to date.
2025-03-02 00:48:03,239 [ scc.git] DEBUG ## Unique users: []
2025-03-02 00:48:03,239 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:48:03,239 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:48:03,244 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-02 00:48:03,285 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:48:03,285 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:48:03,291 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-02 00:48:03,334 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-02 00:48:03,342 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7e9806df70> has no local changes
2025-03-02 00:48:03,342 [ 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#349 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/)'
2025-03-02 00:48:03,351 [ scc.git] DEBUG [detached HEAD dc9deb7] merge master -Dorg -Ssuccess-only
2025-03-02 00:48:03,351 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:03,352 [ scc.repo] DEBUG ## PRs found:
2025-03-02 00:48:03,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:03,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-03-02 00:48:03,999 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:04,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-03-02 00:48:04,529 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:04,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-03-02 00:48:05,006 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:05,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-02 00:48:05,574 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:05,769 [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-02 00:48:06,024 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:06,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-02 00:48:06,553 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:06,770 [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-02 00:48:06,771 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-03-02 00:48:06,771 [ scc.repo] DEBUG ## Branches found:
2025-03-02 00:48:06,771 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-02 00:48:06,772 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:48:06,772 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:48:06,780 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-02 00:48:06,787 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-02 00:48:06,788 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-02 00:48:06,795 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-02 00:48:06,803 [ scc.git] DEBUG Already up to date.
2025-03-02 00:48:06,803 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-03-02 00:48:07,310 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-03-02 00:48:07,311 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-03-02 00:48:07,327 [ scc.git] DEBUG ## Unique users: []
2025-03-02 00:48:07,327 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:48:07,327 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:48:07,337 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-02 00:48:07,346 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:48:07,356 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-02 00:48:07,486 [ scc.git] DEBUG Auto-merging Dockerfile
2025-03-02 00:48:07,486 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-03-02 00:48:07,486 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-02 00:48:07,487 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-02 00:48:07,494 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-02 00:48:07,503 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-03-02 00:48:07,507 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:07,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:07,664 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-02 00:48:07,681 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-02 00:48:07,696 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#349](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-03-02 00:48:07,704 [ scc.config] DEBUG Found github.token
2025-03-02 00:48:07,705 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-03-02 00:48:07,705 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-02 00:48:07,752 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:48:07,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:48:07,760 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-02 00:48:07,811 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-02 00:48:07,819 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7e80785610> has no local changes
2025-03-02 00:48:07,820 [ 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#349 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/)'
2025-03-02 00:48:07,831 [ scc.git] DEBUG [detached HEAD a21430b] merge master -Dorg -Ssuccess-only
2025-03-02 00:48:07,832 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:07,832 [ scc.git] INFO Overriding base-branch from master to develop
2025-03-02 00:48:07,833 [ scc.repo] DEBUG ## PRs found:
2025-03-02 00:48:07,917 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:08,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-03-02 00:48:08,529 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:08,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-03-02 00:48:08,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:09,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-03-02 00:48:09,495 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:09,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-02 00:48:09,955 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:10,219 [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-02 00:48:10,472 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:10,702 [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-02 00:48:10,955 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:11,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-02 00:48:11,412 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:11,587 [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-02 00:48:11,588 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-02 00:48:11,839 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:12,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-03-02 00:48:12,338 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:12,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-03-02 00:48:12,799 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:13,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-02 00:48:13,267 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:13,515 [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-02 00:48:13,769 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:13,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-02 00:48:14,233 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:14,407 [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-02 00:48:14,408 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-02 00:48:14,660 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:14,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-03-02 00:48:15,189 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:15,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-03-02 00:48:15,731 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:15,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-03-02 00:48:16,210 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:16,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-03-02 00:48:16,529 [ scc.repo] DEBUG ## Branches found:
2025-03-02 00:48:16,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-02 00:48:16,529 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:48:16,530 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:48:16,538 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-03-02 00:48:16,547 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-02 00:48:16,547 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-03-02 00:48:16,556 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-03-02 00:48:16,565 [ scc.git] DEBUG Already up to date.
2025-03-02 00:48:16,565 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-03-02 00:48:17,298 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-02 00:48:17,299 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-03-02 00:48:17,306 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-03-02 00:48:17,866 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-02 00:48:17,866 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-03-02 00:48:17,871 [ scc.git] DEBUG ## Unique users: []
2025-03-02 00:48:17,871 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:48:17,871 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:48:17,877 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-02 00:48:17,886 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:48:17,893 [ 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-02 00:48:17,976 [ 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-02 00:48:17,976 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-02 00:48:17,977 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-02 00:48:17,983 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-02 00:48:17,990 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-03-02 00:48:17,993 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:18,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:18,164 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-02 00:48:18,173 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-02 00:48:18,179 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#349](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-03-02 00:48:18,184 [ scc.config] DEBUG Found github.token
2025-03-02 00:48:18,184 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-03-02 00:48:18,184 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-02 00:48:18,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:48:18,197 [ 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-02 00:48:18,212 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-02 00:48:18,215 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-03-02 00:48:18,215 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-03-02 00:48:18,416 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:18,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:18,593 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-02 00:48:18,639 [ scc.git] DEBUG Get sha1 of %s
2025-03-02 00:48:18,640 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-02 00:48:18,646 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-02 00:48:18,692 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-02 00:48:18,700 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7e807f6880> has no local changes
2025-03-02 00:48:18,700 [ 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#349 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/)'
2025-03-02 00:48:18,711 [ scc.git] DEBUG [detached HEAD e768e6b] merge master -Dorg -Ssuccess-only
2025-03-02 00:48:18,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:18,711 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-02 00:48:18,793 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-03-02 00:48:18,845 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:19,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:19,036 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-03-02 00:48:19,043 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-03-02 00:48:19,274 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:19,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:19,454 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-03-02 00:48:19,459 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-03-02 00:48:19,695 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:19,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:19,875 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-03-02 00:48:19,881 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-03-02 00:48:20,117 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:20,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:20,325 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-03-02 00:48:20,552 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:20,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:20,742 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-03-02 00:48:20,748 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-03-02 00:48:20,981 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:21,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:21,162 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-03-02 00:48:21,168 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-03-02 00:48:21,403 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:21,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:21,607 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-03-02 00:48:21,617 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-03-02 00:48:21,832 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:21,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:22,000 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-03-02 00:48:22,006 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-03-02 00:48:22,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:22,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:22,440 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-03-02 00:48:22,447 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-03-02 00:48:22,678 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:22,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:22,864 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-03-02 00:48:22,870 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-03-02 00:48:23,103 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:23,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:23,303 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-03-02 00:48:23,308 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-03-02 00:48:23,540 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:23,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:23,711 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-03-02 00:48:23,717 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-03-02 00:48:23,951 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:24,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:24,156 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-03-02 00:48:24,384 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:24,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:24,650 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-03-02 00:48:24,882 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:25,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:25,069 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-03-02 00:48:25,076 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-03-02 00:48:25,306 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:25,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:25,490 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-03-02 00:48:25,724 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:25,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:25,948 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-03-02 00:48:26,182 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:26,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:26,419 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-03-02 00:48:26,425 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-03-02 00:48:26,659 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:26,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:26,839 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-03-02 00:48:26,844 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-03-02 00:48:27,079 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:27,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:27,255 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-03-02 00:48:27,262 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-03-02 00:48:27,490 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:27,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:27,672 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-03-02 00:48:27,678 [ scc.config] DEBUG Found submodule.scripts.url
2025-03-02 00:48:27,912 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-02 00:48:28,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-02 00:48:28,103 [ scc.config] DEBUG Found submodule.scripts.branch
2025-03-02 00:48:28,104 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-02 00:48:28,206 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7e9d6aaf10> has local changes
2025-03-02 00:48:28,206 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 167 dominikl 'Add extinfo command' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 600 Rdornier 'Label on rois' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#349 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/349/)'
2025-03-02 00:48:28,222 [ scc.git] DEBUG [detached HEAD 7280109] merge master -Dorg -Ssuccess-only
2025-03-02 00:48:28,223 [ scc.merge] INFO Repository: ome/omero-plugins
2025-03-02 00:48:28,223 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-03-02 00:48:28,223 [ scc.merge] INFO Already up to date.
2025-03-02 00:48:28,223 [ scc.merge] INFO
2025-03-02 00:48:28,223 [ scc.merge] INFO Merged PRs:
2025-03-02 00:48:28,223 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-03-02 00:48:28,223 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-03-02 00:48:28,223 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-03-02 00:48:28,223 [ scc.merge] INFO
2025-03-02 00:48:28,223 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-03-02 00:48:28,223 [ scc.merge] INFO Already up to date.
2025-03-02 00:48:28,223 [ scc.merge] INFO
2025-03-02 00:48:28,223 [ scc.merge] INFO
2025-03-02 00:48:28,223 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-03-02 00:48:28,223 [ scc.merge] INFO Excluded PRs:
2025-03-02 00:48:28,223 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-03-02 00:48:28,223 [ scc.merge] INFO Already up to date.
2025-03-02 00:48:28,223 [ scc.merge] INFO
2025-03-02 00:48:28,223 [ scc.merge] INFO
2025-03-02 00:48:28,223 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-03-02 00:48:28,223 [ scc.merge] INFO Excluded PRs:
2025-03-02 00:48:28,223 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-03-02 00:48:28,223 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-03-02 00:48:28,223 [ scc.merge] INFO Already up to date.
2025-03-02 00:48:28,223 [ scc.merge] INFO
2025-03-02 00:48:28,224 [ scc.merge] INFO Merged PRs:
2025-03-02 00:48:28,224 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-03-02 00:48:28,224 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-03-02 00:48:28,224 [ scc.merge] INFO
2025-03-02 00:48:28,224 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-03-02 00:48:28,224 [ scc.merge] INFO Excluded PRs:
2025-03-02 00:48:28,224 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-03-02 00:48:28,224 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-03-02 00:48:28,224 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-02 00:48:28,224 [ scc.merge] INFO Already up to date.
2025-03-02 00:48:28,224 [ scc.merge] INFO
2025-03-02 00:48:28,224 [ scc.merge] INFO Merged PRs:
2025-03-02 00:48:28,224 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-03-02 00:48:28,224 [ scc.merge] INFO
2025-03-02 00:48:28,224 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-02 00:48:28,224 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-03-02 00:48:28,224 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-03-02 00:48:28,224 [ scc.merge] INFO
2025-03-02 00:48:28,224 [ scc.merge] INFO Repository: ome/omero-figure
2025-03-02 00:48:28,224 [ scc.merge] INFO Excluded PRs:
2025-03-02 00:48:28,224 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-03-02 00:48:28,224 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (stage: draft)
2025-03-02 00:48:28,224 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-03-02 00:48:28,224 [ scc.merge] INFO Already up to date.
2025-03-02 00:48:28,224 [ scc.merge] INFO
2025-03-02 00:48:28,224 [ scc.merge] INFO Merged PRs:
2025-03-02 00:48:28,224 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-03-02 00:48:28,224 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-03-02 00:48:28,224 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-03-02 00:48:28,224 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-03-02 00:48:28,224 [ scc.merge] INFO
2025-03-02 00:48:28,224 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-02 00:48:28,224 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-03-02 00:48:28,224 [ scc.merge] INFO
2025-03-02 00:48:28,224 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-03-02 00:48:28,225 [ scc.merge] INFO Already up to date.
2025-03-02 00:48:28,225 [ scc.merge] INFO
2025-03-02 00:48:28,225 [ scc.merge] INFO Merged PRs:
2025-03-02 00:48:28,225 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-03-02 00:48:28,225 [ scc.merge] INFO
2025-03-02 00:48:28,225 [ scc.merge] INFO Repository: ome/omero-gallery
2025-03-02 00:48:28,225 [ scc.merge] INFO Already up to date.
2025-03-02 00:48:28,225 [ scc.merge] INFO
2025-03-02 00:48:28,225 [ scc.merge] INFO Merged PRs:
2025-03-02 00:48:28,225 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-03-02 00:48:28,225 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-03-02 00:48:28,225 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-03-02 00:48:28,225 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-03-02 00:48:28,225 [ scc.merge] INFO
2025-03-02 00:48:28,225 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-02 00:48:28,225 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-03-02 00:48:28,225 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-03-02 00:48:28,225 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-03-02 00:48:28,225 [ scc.merge] INFO
2025-03-02 00:48:28,225 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-03-02 00:48:28,225 [ scc.merge] INFO Excluded PRs:
2025-03-02 00:48:28,225 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-03-02 00:48:28,225 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-03-02 00:48:28,225 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-03-02 00:48:28,225 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-03-02 00:48:28,225 [ scc.merge] INFO Already up to date.
2025-03-02 00:48:28,225 [ scc.merge] INFO
2025-03-02 00:48:28,225 [ scc.merge] INFO Merged PRs:
2025-03-02 00:48:28,225 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-03-02 00:48:28,225 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-03-02 00:48:28,225 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-02 00:48:28,225 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-02 00:48:28,225 [ scc.merge] INFO
2025-03-02 00:48:28,225 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-02 00:48:28,225 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-02 00:48:28,225 [ scc.merge] INFO
2025-03-02 00:48:28,226 [ scc.merge] INFO Repository: ome/omero-mapr
2025-03-02 00:48:28,226 [ scc.merge] INFO Excluded PRs:
2025-03-02 00:48:28,226 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-03-02 00:48:28,226 [ scc.merge] INFO Already up to date.
2025-03-02 00:48:28,226 [ scc.merge] INFO
2025-03-02 00:48:28,226 [ scc.merge] INFO Merged PRs:
2025-03-02 00:48:28,226 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-03-02 00:48:28,226 [ scc.merge] INFO
2025-03-02 00:48:28,226 [ scc.merge] INFO Repository: ome/omero-metadata
2025-03-02 00:48:28,226 [ scc.merge] INFO Already up to date.
2025-03-02 00:48:28,226 [ scc.merge] INFO
2025-03-02 00:48:28,226 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-02 00:48:28,226 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-02 00:48:28,226 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-02 00:48:28,226 [ scc.merge] INFO
2025-03-02 00:48:28,226 [ scc.merge] INFO Repository: ome/omero-parade
2025-03-02 00:48:28,226 [ scc.merge] INFO Excluded PRs:
2025-03-02 00:48:28,226 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-03-02 00:48:28,226 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-03-02 00:48:28,226 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-03-02 00:48:28,226 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-03-02 00:48:28,226 [ scc.merge] INFO Already up to date.
2025-03-02 00:48:28,226 [ scc.merge] INFO
2025-03-02 00:48:28,226 [ scc.merge] INFO Merged PRs:
2025-03-02 00:48:28,226 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-02 00:48:28,226 [ scc.merge] INFO
2025-03-02 00:48:28,226 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-03-02 00:48:28,226 [ scc.merge] INFO Already up to date.
2025-03-02 00:48:28,226 [ scc.merge] INFO
2025-03-02 00:48:28,226 [ scc.merge] INFO
2025-03-02 00:48:28,226 [ scc.merge] INFO Repository: ome/omero-rois
2025-03-02 00:48:28,226 [ scc.merge] INFO Excluded PRs:
2025-03-02 00:48:28,226 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-02 00:48:28,226 [ scc.merge] INFO Already up to date.
2025-03-02 00:48:28,226 [ scc.merge] INFO
2025-03-02 00:48:28,226 [ scc.merge] INFO
2025-03-02 00:48:28,226 [ scc.merge] INFO Repository: ome/omero-signup
2025-03-02 00:48:28,227 [ scc.merge] INFO Already up to date.
2025-03-02 00:48:28,227 [ scc.merge] INFO
2025-03-02 00:48:28,227 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-02 00:48:28,227 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-02 00:48:28,227 [ scc.merge] INFO
2025-03-02 00:48:28,227 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-03-02 00:48:28,227 [ scc.merge] INFO Excluded PRs:
2025-03-02 00:48:28,227 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-03-02 00:48:28,227 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-03-02 00:48:28,227 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-03-02 00:48:28,227 [ scc.merge] INFO Already up to date.
2025-03-02 00:48:28,227 [ scc.merge] INFO
2025-03-02 00:48:28,227 [ scc.merge] INFO Merged PRs:
2025-03-02 00:48:28,227 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-02 00:48:28,227 [ scc.merge] INFO
2025-03-02 00:48:28,227 [ scc.merge] INFO Repository: ome/omero-upload
2025-03-02 00:48:28,227 [ scc.merge] INFO Already up to date.
2025-03-02 00:48:28,227 [ scc.merge] INFO
2025-03-02 00:48:28,227 [ scc.merge] INFO
2025-03-02 00:48:28,227 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-03-02 00:48:28,227 [ scc.merge] INFO Already up to date.
2025-03-02 00:48:28,227 [ scc.merge] INFO
2025-03-02 00:48:28,227 [ scc.merge] INFO Merged PRs:
2025-03-02 00:48:28,227 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-03-02 00:48:28,227 [ scc.merge] INFO
2025-03-02 00:48:28,227 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-03-02 00:48:28,227 [ scc.merge] INFO Excluded PRs:
2025-03-02 00:48:28,227 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-03-02 00:48:28,227 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-03-02 00:48:28,227 [ scc.merge] INFO Already up to date.
2025-03-02 00:48:28,227 [ scc.merge] INFO
2025-03-02 00:48:28,227 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-02 00:48:28,227 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-02 00:48:28,227 [ scc.merge] INFO
2025-03-02 00:48:28,227 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-03-02 00:48:28,227 [ scc.merge] INFO Already up to date.
2025-03-02 00:48:28,228 [ scc.merge] INFO
2025-03-02 00:48:28,228 [ scc.merge] INFO
2025-03-02 00:48:28,228 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-03-02 00:48:28,228 [ scc.merge] INFO Already up to date.
2025-03-02 00:48:28,228 [ scc.merge] INFO
2025-03-02 00:48:28,228 [ scc.merge] INFO
2025-03-02 00:48:28,228 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-03-02 00:48:28,228 [ scc.merge] INFO Already up to date.
2025-03-02 00:48:28,228 [ scc.merge] INFO
2025-03-02 00:48:28,228 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-02 00:48:28,228 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-03-02 00:48:28,228 [ scc.merge] INFO
2025-03-02 00:48:28,228 [ scc.merge] INFO Repository: ome/scripts
2025-03-02 00:48:28,228 [ scc.merge] INFO Excluded PRs:
2025-03-02 00:48:28,228 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-03-02 00:48:28,228 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-03-02 00:48:28,228 [ scc.merge] INFO Already up to date.
2025-03-02 00:48:28,228 [ scc.merge] INFO
2025-03-02 00:48:28,228 [ scc.merge] INFO Merged PRs:
2025-03-02 00:48:28,228 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-02 00:48:28,228 [ scc.merge] INFO
2025-03-02 00:48:28,228 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-02 00:48:28,228 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-02 00:48:28,228 [ scc.merge] INFO
2025-03-02 00:48:28,228 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-03-02 00:48:28,228 [ scc.git] DEBUG Calling 'git remote'
2025-03-02 00:48:28,235 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-03-02 00:48:28,235 [ scc.git] DEBUG Calling 'git remote'
2025-03-02 00:48:28,241 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:28,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-03-02 00:48:28,242 [ scc.git] DEBUG Calling 'git remote'
2025-03-02 00:48:28,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:28,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-03-02 00:48:28,248 [ scc.git] DEBUG Calling 'git remote'
2025-03-02 00:48:28,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:28,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-03-02 00:48:28,255 [ scc.git] DEBUG Calling 'git remote'
2025-03-02 00:48:28,261 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:28,261 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-03-02 00:48:28,261 [ scc.git] DEBUG Calling 'git remote'
2025-03-02 00:48:28,268 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:28,268 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-03-02 00:48:28,268 [ scc.git] DEBUG Calling 'git remote'
2025-03-02 00:48:28,275 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:28,275 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-03-02 00:48:28,275 [ scc.git] DEBUG Calling 'git remote'
2025-03-02 00:48:28,281 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:28,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-02 00:48:28,282 [ scc.git] DEBUG Calling 'git remote'
2025-03-02 00:48:28,287 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:28,287 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-02 00:48:28,287 [ scc.git] DEBUG Calling 'git remote'
2025-03-02 00:48:28,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:28,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-02 00:48:28,293 [ scc.git] DEBUG Calling 'git remote'
2025-03-02 00:48:28,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:28,299 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-02 00:48:28,299 [ scc.git] DEBUG Calling 'git remote'
2025-03-02 00:48:28,304 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:28,304 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-02 00:48:28,304 [ scc.git] DEBUG Calling 'git remote'
2025-03-02 00:48:28,309 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:28,309 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-02 00:48:28,309 [ scc.git] DEBUG Calling 'git remote'
2025-03-02 00:48:28,314 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:28,314 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-02 00:48:28,314 [ scc.git] DEBUG Calling 'git remote'
2025-03-02 00:48:28,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:28,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-02 00:48:28,319 [ scc.git] DEBUG Calling 'git remote'
2025-03-02 00:48:28,324 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:28,325 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-02 00:48:28,325 [ scc.git] DEBUG Calling 'git remote'
2025-03-02 00:48:28,331 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:28,331 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-02 00:48:28,331 [ scc.git] DEBUG Calling 'git remote'
2025-03-02 00:48:28,337 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:28,337 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-02 00:48:28,337 [ scc.git] DEBUG Calling 'git remote'
2025-03-02 00:48:28,343 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:28,343 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-02 00:48:28,343 [ scc.git] DEBUG Calling 'git remote'
2025-03-02 00:48:28,350 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:28,350 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-02 00:48:28,350 [ scc.git] DEBUG Calling 'git remote'
2025-03-02 00:48:28,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:28,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-02 00:48:28,355 [ scc.git] DEBUG Calling 'git remote'
2025-03-02 00:48:28,361 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-02 00:48:28,361 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-02 00:48:28,361 [ scc.git] DEBUG Calling 'git remote'
2025-03-02 00:48:28,366 [ 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 1cd9916] 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 2469f7e] 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-02 00:49:17,695 [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-02 00:49:27,194 [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-02 00:49:29,615 [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-02 00:49:34,390 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-02 00:50:15,035 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts (hide)
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/316c2b55/images/svgs/logo.svg){kind=logo}
