Skipping 191 KB..
Full Log2025-03-20 14:44:45,773 [ scc.repo] DEBUG - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-20 14:44:46,024 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:46,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-03-20 14:44:46,277 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-20 14:44:46,529 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:46,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-20 14:44:47,222 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:47,475 [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-20 14:44:47,727 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:48,067 [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-20 14:44:48,320 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:48,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-20 14:44:48,825 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:49,005 [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-20 14:44:49,005 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-20 14:44:49,257 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:49,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-03-20 14:44:49,747 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:49,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-03-20 14:44:50,223 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:50,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-03-20 14:44:50,720 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:50,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-03-20 14:44:51,216 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:51,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-20 14:44:51,771 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:52,018 [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-20 14:44:52,270 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:52,509 [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-20 14:44:52,761 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:53,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-20 14:44:53,290 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:53,474 [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-20 14:44:53,474 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-20 14:44:53,725 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:53,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-03-20 14:44:54,228 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:54,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-03-20 14:44:54,793 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:55,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-20 14:44:55,356 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:55,571 [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-20 14:44:55,824 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:56,068 [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-20 14:44:56,320 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:56,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-20 14:44:56,866 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:57,055 [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-20 14:44:57,055 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-03-20 14:44:57,306 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:57,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-03-20 14:44:57,830 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:58,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-03-20 14:44:58,344 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:58,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-20 14:44:58,894 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:59,129 [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-20 14:44:59,381 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:44:59,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-20 14:44:59,954 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:00,148 [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-20 14:45:00,149 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-03-20 14:45:00,149 [ scc.repo] DEBUG ## Branches found:
2025-03-20 14:45:00,149 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-20 14:45:00,149 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:00,149 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:00,155 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 14:45:00,160 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 14:45:00,160 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 14:45:00,165 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 14:45:00,170 [ scc.git] DEBUG Already up to date.
2025-03-20 14:45:00,171 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-03-20 14:45:02,815 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-20 14:45:02,815 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-03-20 14:45:02,818 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-03-20 14:45:04,635 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-20 14:45:04,635 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-03-20 14:45:04,638 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-03-20 14:45:05,170 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-20 14:45:05,170 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-03-20 14:45:05,175 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-03-20 14:45:05,499 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-20 14:45:05,499 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-03-20 14:45:05,503 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-03-20 14:45:05,832 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-20 14:45:05,832 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-03-20 14:45:05,835 [ scc.git] DEBUG ## Unique users: []
2025-03-20 14:45:05,835 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:05,835 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:05,843 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-20 14:45:05,850 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:05,855 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-20 14:45:06,017 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-03-20 14:45:06,017 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-03-20 14:45:06,017 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 14:45:06,021 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-03-20 14:45:06,021 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-03-20 14:45:06,021 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-03-20 14:45:06,026 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:06,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:45:06,223 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-20 14:45:06,232 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:06,236 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-20 14:45:06,487 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-03-20 14:45:06,488 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-03-20 14:45:06,488 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-03-20 14:45:06,488 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-03-20 14:45:06,488 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 14:45:06,492 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-03-20 14:45:06,492 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-03-20 14:45:06,492 [ scc.git] DEBUG src/app/header.html | 5 +
2025-03-20 14:45:06,492 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-03-20 14:45:06,492 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-03-20 14:45:06,492 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-03-20 14:45:06,492 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-03-20 14:45:06,492 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-03-20 14:45:06,494 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:06,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:45:06,675 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-20 14:45:06,682 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:06,687 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-20 14:45:06,777 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-03-20 14:45:06,778 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 14:45:06,781 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-03-20 14:45:06,781 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-03-20 14:45:06,781 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-03-20 14:45:06,927 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:07,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:45:07,096 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-20 14:45:07,156 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:07,161 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-20 14:45:07,177 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 14:45:07,186 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-03-20 14:45:07,186 [ scc.git] DEBUG package.json | 2 +-
2025-03-20 14:45:07,186 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-03-20 14:45:07,348 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:07,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:45:07,544 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-20 14:45:07,605 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:07,610 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-20 14:45:07,811 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-20 14:45:07,811 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-03-20 14:45:07,811 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-20 14:45:07,811 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-20 14:45:07,817 [ scc.git] DEBUG Calling 'git reset --hard 3dd7021b2867e1d394de5fcccc3629cf4964c011'
2025-03-20 14:45:07,826 [ scc.git] DEBUG HEAD is now at 3dd7021 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-03-20 14:45:07,828 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:08,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:45:08,010 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-20 14:45:08,015 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-03-20 14:45:08,021 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#360](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-03-20 14:45:08,025 [ scc.config] DEBUG Found github.token
2025-03-20 14:45:08,025 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-03-20 14:45:08,026 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 14:45:08,062 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:08,062 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:08,067 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 14:45:08,105 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 14:45:08,113 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88240a4520> has no local changes
2025-03-20 14:45:08,114 [ 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#360 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/)'
2025-03-20 14:45:08,122 [ scc.git] DEBUG [detached HEAD 51c07f1] merge master -Dorg -Ssuccess-only
2025-03-20 14:45:08,122 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:45:08,123 [ scc.repo] DEBUG ## PRs found:
2025-03-20 14:45:08,262 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:08,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-03-20 14:45:08,828 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:09,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-03-20 14:45:09,386 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:09,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-03-20 14:45:09,963 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:10,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-20 14:45:10,520 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:10,762 [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-20 14:45:11,014 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:11,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-20 14:45:11,464 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:11,666 [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-20 14:45:11,666 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-03-20 14:45:11,667 [ scc.repo] DEBUG ## Branches found:
2025-03-20 14:45:11,667 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-20 14:45:11,667 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:11,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:11,673 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 14:45:11,677 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 14:45:11,678 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 14:45:11,683 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 14:45:11,688 [ scc.git] DEBUG Already up to date.
2025-03-20 14:45:11,688 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-03-20 14:45:12,636 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-03-20 14:45:12,636 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-03-20 14:45:12,641 [ scc.git] DEBUG ## Unique users: []
2025-03-20 14:45:12,641 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:12,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:12,646 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-20 14:45:12,653 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:12,657 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-20 14:45:12,667 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 14:45:12,670 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-03-20 14:45:12,670 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-03-20 14:45:12,670 [ scc.git] DEBUG requirements.txt | 2 +-
2025-03-20 14:45:12,670 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-03-20 14:45:12,670 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-03-20 14:45:12,670 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-03-20 14:45:12,673 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:12,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:45:12,844 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 14:45:12,882 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:12,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:12,887 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 14:45:12,922 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 14:45:12,928 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88241248e0> has no local changes
2025-03-20 14:45:12,928 [ 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#360 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/)'
2025-03-20 14:45:12,936 [ scc.git] DEBUG [detached HEAD 6a4b24e] merge master -Dorg -Ssuccess-only
2025-03-20 14:45:12,936 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:45:12,937 [ scc.repo] DEBUG ## PRs found:
2025-03-20 14:45:13,096 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:14,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-03-20 14:45:14,523 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:14,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-03-20 14:45:15,006 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:15,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-03-20 14:45:15,596 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:15,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-20 14:45:16,133 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:16,374 [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-20 14:45:16,626 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:16,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-20 14:45:17,135 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:17,327 [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-20 14:45:17,327 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-20 14:45:17,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:17,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-03-20 14:45:18,101 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:18,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-03-20 14:45:18,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:18,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-20 14:45:19,155 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:19,385 [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-20 14:45:19,637 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:19,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-20 14:45:20,096 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:20,288 [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-20 14:45:20,289 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-20 14:45:20,289 [ scc.repo] DEBUG ## Branches found:
2025-03-20 14:45:20,289 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-20 14:45:20,289 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:20,289 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:20,295 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 14:45:20,300 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 14:45:20,300 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 14:45:20,305 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 14:45:20,310 [ scc.git] DEBUG Already up to date.
2025-03-20 14:45:20,310 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-03-20 14:45:21,194 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-20 14:45:21,194 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-03-20 14:45:21,198 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-03-20 14:45:22,748 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-20 14:45:22,749 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-03-20 14:45:22,752 [ scc.git] DEBUG ## Unique users: []
2025-03-20 14:45:22,752 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:22,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:22,757 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-20 14:45:22,764 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:22,769 [ 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-20 14:45:22,905 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-03-20 14:45:22,906 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-03-20 14:45:22,906 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-20 14:45:22,906 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-20 14:45:22,906 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-20 14:45:22,906 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-20 14:45:22,911 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-20 14:45:22,917 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-20 14:45:22,920 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:23,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:45:23,089 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-20 14:45:23,095 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-20 14:45:23,100 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#360](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-03-20 14:45:23,105 [ scc.config] DEBUG Found github.token
2025-03-20 14:45:23,105 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-03-20 14:45:23,105 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-20 14:45:23,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:23,116 [ 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-20 14:45:23,252 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-20 14:45:23,252 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-20 14:45:23,252 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-03-20 14:45:23,252 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-20 14:45:23,252 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-20 14:45:23,257 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-20 14:45:23,264 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-20 14:45:23,341 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:23,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:45:23,507 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-20 14:45:23,513 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-20 14:45:23,518 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#360](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/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-20 14:45:23,522 [ scc.config] DEBUG Found github.token
2025-03-20 14:45:23,523 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-03-20 14:45:23,523 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 14:45:23,559 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:23,559 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:23,564 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 14:45:23,600 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 14:45:23,606 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8824090250> has no local changes
2025-03-20 14:45:23,606 [ 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#360 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/)'
2025-03-20 14:45:23,614 [ scc.git] DEBUG [detached HEAD 2acdfe5] merge master -Dorg -Ssuccess-only
2025-03-20 14:45:23,614 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:45:23,615 [ scc.repo] DEBUG ## PRs found:
2025-03-20 14:45:23,759 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:24,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-03-20 14:45:24,385 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:24,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-03-20 14:45:24,635 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-20 14:45:24,886 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:25,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-20 14:45:25,562 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:25,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-20 14:45:26,125 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:26,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-20 14:45:26,680 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:26,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-20 14:45:27,168 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:27,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-03-20 14:45:27,376 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-20 14:45:27,628 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:27,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-03-20 14:45:27,892 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-20 14:45:28,143 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:28,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-20 14:45:28,745 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:29,019 [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-20 14:45:29,272 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:29,532 [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-20 14:45:29,784 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:30,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-20 14:45:30,349 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:30,540 [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-20 14:45:30,541 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-20 14:45:30,792 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:31,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-03-20 14:45:31,324 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:31,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-03-20 14:45:31,858 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:32,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-03-20 14:45:32,375 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:32,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-03-20 14:45:32,860 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:33,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-03-20 14:45:33,372 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:33,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-03-20 14:45:33,906 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:34,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-03-20 14:45:34,318 [ scc.repo] DEBUG ## Branches found:
2025-03-20 14:45:34,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-20 14:45:34,319 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:34,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:34,324 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 14:45:34,329 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 14:45:34,329 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 14:45:34,334 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 14:45:34,340 [ scc.git] DEBUG Already up to date.
2025-03-20 14:45:34,340 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-03-20 14:45:34,637 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-20 14:45:34,637 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-03-20 14:45:34,641 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-03-20 14:45:34,949 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-20 14:45:34,949 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-03-20 14:45:34,952 [ scc.git] DEBUG ## Unique users: []
2025-03-20 14:45:34,952 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:34,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:34,957 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-20 14:45:35,006 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:35,011 [ 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-20 14:45:35,159 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 14:45:35,162 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-03-20 14:45:35,162 [ scc.git] DEBUG package.json | 2 +-
2025-03-20 14:45:35,162 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-03-20 14:45:35,165 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:35,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:45:35,326 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-03-20 14:45:35,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:35,382 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 141 (Bump axios from 1.6.0 to 1.8.2) de7db17cd62b498179713df276cff151a1f36d80'
2025-03-20 14:45:35,489 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-20 14:45:35,489 [ scc.git] DEBUG Auto-merging package.json
2025-03-20 14:45:35,489 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 14:45:35,492 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-03-20 14:45:35,492 [ scc.git] DEBUG package.json | 2 +-
2025-03-20 14:45:35,492 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-03-20 14:45:35,578 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:35,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:45:35,754 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 14:45:35,792 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:35,792 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:35,797 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 14:45:35,833 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 14:45:35,839 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88240bcf10> has no local changes
2025-03-20 14:45:35,839 [ 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'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
Generated by OMERO-plugins-push#360 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/)'
2025-03-20 14:45:35,848 [ scc.git] DEBUG [detached HEAD 6521203] merge master -Dorg -Ssuccess-only
2025-03-20 14:45:35,848 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:45:35,848 [ scc.repo] DEBUG ## PRs found:
2025-03-20 14:45:36,006 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:36,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-03-20 14:45:36,267 [ scc.repo] DEBUG ## Branches found:
2025-03-20 14:45:36,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-20 14:45:36,267 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:36,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:36,272 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 14:45:36,277 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 14:45:36,277 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 14:45:36,282 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 14:45:36,287 [ scc.git] DEBUG Already up to date.
2025-03-20 14:45:36,287 [ scc.git] DEBUG ## Unique users: []
2025-03-20 14:45:36,287 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:36,287 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:36,292 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 14:45:36,328 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:36,328 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:36,332 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 14:45:36,368 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 14:45:36,373 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88240c48e0> has no local changes
2025-03-20 14:45:36,373 [ 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#360 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/)'
2025-03-20 14:45:36,381 [ scc.git] DEBUG [detached HEAD f624edf] merge master -Dorg -Ssuccess-only
2025-03-20 14:45:36,381 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:45:36,381 [ scc.repo] DEBUG ## PRs found:
2025-03-20 14:45:36,519 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:36,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-03-20 14:45:37,126 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:37,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-03-20 14:45:37,673 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:37,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-03-20 14:45:38,169 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:38,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-03-20 14:45:38,416 [ scc.repo] DEBUG ## Branches found:
2025-03-20 14:45:38,416 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-20 14:45:38,416 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:38,416 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:38,422 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 14:45:38,426 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 14:45:38,426 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 14:45:38,431 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 14:45:38,437 [ scc.git] DEBUG Already up to date.
2025-03-20 14:45:38,437 [ scc.git] DEBUG ## Unique users: []
2025-03-20 14:45:38,437 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:38,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:38,441 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 14:45:38,478 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:38,478 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:38,483 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 14:45:38,518 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 14:45:38,525 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88240b94c0> has no local changes
2025-03-20 14:45:38,525 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Generated by OMERO-plugins-push#360 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/)'
2025-03-20 14:45:38,533 [ scc.git] DEBUG [detached HEAD 2b4b275] merge master -Dorg -Ssuccess-only
2025-03-20 14:45:38,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:45:38,533 [ scc.repo] DEBUG ## PRs found:
2025-03-20 14:45:38,668 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:39,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-03-20 14:45:39,399 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:39,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-03-20 14:45:39,908 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:40,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-03-20 14:45:40,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:40,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-20 14:45:41,042 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:41,344 [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-20 14:45:41,596 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:44,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-20 14:45:45,139 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:45,322 [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-20 14:45:45,322 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-20 14:45:45,322 [ scc.repo] DEBUG ## Branches found:
2025-03-20 14:45:45,322 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-20 14:45:45,323 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:45,323 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:45,328 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 14:45:45,333 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 14:45:45,333 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 14:45:45,338 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 14:45:45,343 [ scc.git] DEBUG Already up to date.
2025-03-20 14:45:45,344 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-03-20 14:45:45,807 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-03-20 14:45:45,807 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-03-20 14:45:45,811 [ scc.git] DEBUG ## Unique users: []
2025-03-20 14:45:45,811 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:45,811 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:45,816 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-20 14:45:45,821 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:45,826 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-20 14:45:46,161 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-03-20 14:45:46,162 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-03-20 14:45:46,162 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-03-20 14:45:46,162 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-03-20 14:45:46,162 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-03-20 14:45:46,162 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-03-20 14:45:46,162 [ scc.git] DEBUG Auto-merging setup.py
2025-03-20 14:45:46,162 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-03-20 14:45:46,162 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-20 14:45:46,162 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-20 14:45:46,167 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-20 14:45:46,173 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-03-20 14:45:46,175 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:46,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:45:46,344 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-20 14:45:46,350 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-20 14:45:46,355 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#360](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- setup.py
- omero_signup/signup_settings.py
- omero_signup/views.py
--conflicts
2025-03-20 14:45:46,359 [ scc.config] DEBUG Found github.token
2025-03-20 14:45:46,360 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-03-20 14:45:46,360 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 14:45:46,397 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:46,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:46,402 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 14:45:46,439 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 14:45:46,444 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88240a6880> has no local changes
2025-03-20 14:45:46,444 [ 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#360 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/)'
2025-03-20 14:45:46,452 [ scc.git] DEBUG [detached HEAD fad7d4e] merge master -Dorg -Ssuccess-only
2025-03-20 14:45:46,452 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:45:46,452 [ scc.repo] DEBUG ## PRs found:
2025-03-20 14:45:46,596 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:46,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-03-20 14:45:47,170 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:47,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-03-20 14:45:47,716 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:47,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-03-20 14:45:48,226 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:48,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-03-20 14:45:48,848 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:49,097 [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-20 14:45:49,349 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:49,627 [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-20 14:45:49,879 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:50,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-03-20 14:45:50,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:50,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-03-20 14:45:50,918 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:51,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-03-20 14:45:51,421 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:51,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-03-20 14:45:52,014 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:52,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-20 14:45:52,610 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:52,861 [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-20 14:45:53,113 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:53,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-20 14:45:53,631 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:53,812 [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-20 14:45:53,813 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-20 14:45:53,813 [ scc.repo] DEBUG ## Branches found:
2025-03-20 14:45:53,813 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-20 14:45:53,813 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:53,813 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:53,819 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 14:45:53,824 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 14:45:53,824 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 14:45:53,829 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 14:45:53,834 [ scc.git] DEBUG Already up to date.
2025-03-20 14:45:53,835 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-03-20 14:45:54,221 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-03-20 14:45:54,221 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-03-20 14:45:54,224 [ scc.git] DEBUG ## Unique users: []
2025-03-20 14:45:54,224 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:54,224 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:54,229 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-03-20 14:45:54,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:54,240 [ 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-20 14:45:54,253 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 14:45:54,255 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-03-20 14:45:54,255 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-03-20 14:45:54,255 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-03-20 14:45:54,256 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-03-20 14:45:54,256 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-03-20 14:45:54,256 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-03-20 14:45:54,257 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-03-20 14:45:54,258 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:54,258 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-03-20 14:45:54,258 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-03-20 14:45:54,258 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-03-20 14:45:54,258 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-03-20 14:45:54,258 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-03-20 14:45:54,258 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-03-20 14:45:54,258 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-03-20 14:45:54,258 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-03-20 14:45:54,258 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-03-20 14:45:54,259 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-03-20 14:45:54,259 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-03-20 14:45:54,259 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-03-20 14:45:54,259 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-03-20 14:45:54,259 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-03-20 14:45:54,259 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-03-20 14:45:54,259 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-03-20 14:45:54,259 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-03-20 14:45:54,259 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-03-20 14:45:54,259 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-03-20 14:45:54,259 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-03-20 14:45:54,259 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-03-20 14:45:54,259 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-03-20 14:45:54,259 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-03-20 14:45:54,259 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-03-20 14:45:54,259 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-03-20 14:45:54,259 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-03-20 14:45:54,259 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-03-20 14:45:54,259 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-03-20 14:45:54,259 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-03-20 14:45:54,259 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-03-20 14:45:54,259 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-03-20 14:45:54,259 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-03-20 14:45:54,259 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-03-20 14:45:54,259 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-03-20 14:45:54,259 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-03-20 14:45:54,259 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-03-20 14:45:54,259 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-03-20 14:45:54,259 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-03-20 14:45:54,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:45:54,426 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 14:45:54,465 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:54,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:54,470 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 14:45:54,506 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 14:45:54,512 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88240b7ac0> has no local changes
2025-03-20 14:45:54,512 [ 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#360 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/)'
2025-03-20 14:45:54,520 [ scc.git] DEBUG [detached HEAD 460313a] merge master -Dorg -Ssuccess-only
2025-03-20 14:45:54,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:45:54,521 [ scc.repo] DEBUG ## PRs found:
2025-03-20 14:45:54,678 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:54,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-03-20 14:45:54,862 [ scc.repo] DEBUG ## Branches found:
2025-03-20 14:45:54,862 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-20 14:45:54,862 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:54,862 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:54,867 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 14:45:54,872 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 14:45:54,872 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 14:45:54,877 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 14:45:54,882 [ scc.git] DEBUG Already up to date.
2025-03-20 14:45:54,882 [ scc.git] DEBUG ## Unique users: []
2025-03-20 14:45:54,882 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:54,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:54,887 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 14:45:54,923 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:54,923 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:54,928 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 14:45:54,964 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 14:45:54,969 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88240b8160> has no local changes
2025-03-20 14:45:54,970 [ 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#360 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/)'
2025-03-20 14:45:54,977 [ scc.git] DEBUG [detached HEAD 1f172ed] merge master -Dorg -Ssuccess-only
2025-03-20 14:45:54,977 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:45:54,978 [ scc.repo] DEBUG ## PRs found:
2025-03-20 14:45:55,114 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:55,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-03-20 14:45:55,684 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:55,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-03-20 14:45:56,234 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:56,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-03-20 14:45:56,717 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:57,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-20 14:45:57,285 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:57,516 [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-20 14:45:57,768 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:58,043 [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-20 14:45:58,295 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:58,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-20 14:45:58,847 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:45:59,038 [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-20 14:45:59,038 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-03-20 14:45:59,038 [ scc.repo] DEBUG ## Branches found:
2025-03-20 14:45:59,038 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-20 14:45:59,038 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:45:59,038 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:45:59,044 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 14:45:59,049 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 14:45:59,049 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 14:45:59,054 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 14:45:59,059 [ scc.git] DEBUG Already up to date.
2025-03-20 14:45:59,059 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-03-20 14:46:00,190 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-03-20 14:46:00,191 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-03-20 14:46:00,194 [ scc.git] DEBUG ## Unique users: []
2025-03-20 14:46:00,194 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:46:00,194 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:46:00,200 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-03-20 14:46:00,205 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:46:00,209 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-03-20 14:46:00,218 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 14:46:00,220 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-03-20 14:46:00,220 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-03-20 14:46:00,220 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-03-20 14:46:00,220 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-03-20 14:46:00,221 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-03-20 14:46:00,223 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:00,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:00,399 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 14:46:00,436 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:46:00,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:46:00,441 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 14:46:00,477 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 14:46:00,482 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88240b7fa0> has no local changes
2025-03-20 14:46:00,482 [ 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#360 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/)'
2025-03-20 14:46:00,490 [ scc.git] DEBUG [detached HEAD cd213ed] merge master -Dorg -Ssuccess-only
2025-03-20 14:46:00,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:00,491 [ scc.git] INFO Overriding base-branch from master to main
2025-03-20 14:46:00,491 [ scc.repo] DEBUG ## PRs found:
2025-03-20 14:46:00,651 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:01,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-03-20 14:46:01,299 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:01,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-03-20 14:46:01,859 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:02,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-03-20 14:46:02,370 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:02,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-03-20 14:46:03,044 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:03,327 [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-20 14:46:03,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:03,812 [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-20 14:46:04,064 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:04,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-03-20 14:46:04,593 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:05,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-03-20 14:46:05,669 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:05,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-03-20 14:46:06,148 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:06,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-20 14:46:06,727 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:06,974 [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-20 14:46:07,226 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:07,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-20 14:46:07,794 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:07,997 [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-20 14:46:07,998 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-20 14:46:07,998 [ scc.repo] DEBUG ## Branches found:
2025-03-20 14:46:07,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-20 14:46:07,998 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:46:07,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:46:08,004 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-03-20 14:46:08,009 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 14:46:08,009 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-03-20 14:46:08,014 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-03-20 14:46:08,019 [ scc.git] DEBUG Already up to date.
2025-03-20 14:46:08,020 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-03-20 14:46:08,582 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-03-20 14:46:08,582 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-03-20 14:46:08,586 [ scc.git] DEBUG ## Unique users: []
2025-03-20 14:46:08,587 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:46:08,587 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:46:08,592 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-20 14:46:08,597 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:46:08,602 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-20 14:46:08,702 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-03-20 14:46:08,702 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-03-20 14:46:08,702 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-20 14:46:08,703 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-20 14:46:08,707 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-20 14:46:08,713 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-03-20 14:46:08,716 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:08,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:08,899 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-20 14:46:08,905 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-20 14:46:08,910 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#360](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-03-20 14:46:08,914 [ scc.config] DEBUG Found github.token
2025-03-20 14:46:08,915 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-03-20 14:46:08,915 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 14:46:08,951 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:46:08,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:46:08,956 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 14:46:08,991 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 14:46:08,997 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8824064310> has no local changes
2025-03-20 14:46:08,997 [ 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#360 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/)'
2025-03-20 14:46:09,005 [ scc.git] DEBUG [detached HEAD 103a036] merge master -Dorg -Ssuccess-only
2025-03-20 14:46:09,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:09,005 [ scc.repo] DEBUG ## PRs found:
2025-03-20 14:46:09,151 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:09,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-03-20 14:46:09,350 [ scc.repo] DEBUG ## Branches found:
2025-03-20 14:46:09,350 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-20 14:46:09,350 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:46:09,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:46:09,355 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 14:46:09,360 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 14:46:09,360 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 14:46:09,365 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 14:46:09,370 [ scc.git] DEBUG Already up to date.
2025-03-20 14:46:09,371 [ scc.git] DEBUG ## Unique users: []
2025-03-20 14:46:09,371 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:46:09,371 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:46:09,375 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 14:46:09,413 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:46:09,414 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:46:09,418 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 14:46:09,456 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 14:46:09,462 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f881c7435b0> has no local changes
2025-03-20 14:46:09,462 [ 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#360 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/)'
2025-03-20 14:46:09,469 [ scc.git] DEBUG [detached HEAD 164d7ed] merge master -Dorg -Ssuccess-only
2025-03-20 14:46:09,470 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:09,470 [ scc.repo] DEBUG ## PRs found:
2025-03-20 14:46:09,602 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:09,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-03-20 14:46:09,802 [ scc.repo] DEBUG ## Branches found:
2025-03-20 14:46:09,802 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-20 14:46:09,802 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:46:09,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:46:09,807 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 14:46:09,812 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 14:46:09,812 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 14:46:09,817 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 14:46:09,822 [ scc.git] DEBUG Already up to date.
2025-03-20 14:46:09,822 [ scc.git] DEBUG ## Unique users: []
2025-03-20 14:46:09,822 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:46:09,822 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:46:09,827 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 14:46:09,865 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:46:09,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:46:09,870 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 14:46:09,908 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 14:46:09,913 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8824064100> has no local changes
2025-03-20 14:46:09,914 [ 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#360 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/)'
2025-03-20 14:46:09,921 [ scc.git] DEBUG [detached HEAD f6ff708] merge master -Dorg -Ssuccess-only
2025-03-20 14:46:09,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:09,922 [ scc.repo] DEBUG ## PRs found:
2025-03-20 14:46:10,054 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:10,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-03-20 14:46:10,649 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:10,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-03-20 14:46:11,186 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:11,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-03-20 14:46:11,657 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:11,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-20 14:46:12,185 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:12,408 [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-20 14:46:12,661 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:12,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-20 14:46:13,123 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:13,335 [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-20 14:46:13,336 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-03-20 14:46:13,336 [ scc.repo] DEBUG ## Branches found:
2025-03-20 14:46:13,336 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-20 14:46:13,336 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:46:13,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:46:13,342 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 14:46:13,347 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 14:46:13,347 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 14:46:13,352 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 14:46:13,357 [ scc.git] DEBUG Already up to date.
2025-03-20 14:46:13,357 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-03-20 14:46:14,262 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-03-20 14:46:14,262 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-03-20 14:46:14,266 [ scc.git] DEBUG ## Unique users: []
2025-03-20 14:46:14,266 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:46:14,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:46:14,272 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-20 14:46:14,277 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:46:14,282 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-20 14:46:14,392 [ scc.git] DEBUG Auto-merging Dockerfile
2025-03-20 14:46:14,392 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-03-20 14:46:14,392 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-20 14:46:14,392 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-20 14:46:14,398 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-20 14:46:14,404 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-03-20 14:46:14,407 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:14,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:14,583 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-20 14:46:14,589 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-20 14:46:14,595 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#360](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-03-20 14:46:14,600 [ scc.config] DEBUG Found github.token
2025-03-20 14:46:14,600 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-03-20 14:46:14,600 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 14:46:14,637 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:46:14,637 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:46:14,642 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 14:46:14,678 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 14:46:14,684 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f881c743610> has no local changes
2025-03-20 14:46:14,684 [ 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#360 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/)'
2025-03-20 14:46:14,692 [ scc.git] DEBUG [detached HEAD 5be29ee] merge master -Dorg -Ssuccess-only
2025-03-20 14:46:14,692 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:14,692 [ scc.git] INFO Overriding base-branch from master to develop
2025-03-20 14:46:14,692 [ scc.repo] DEBUG ## PRs found:
2025-03-20 14:46:14,835 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:15,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-03-20 14:46:15,535 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:15,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-03-20 14:46:16,031 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:16,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-03-20 14:46:16,514 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:16,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-20 14:46:17,126 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:17,353 [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-20 14:46:17,605 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:17,863 [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-20 14:46:18,115 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:18,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-20 14:46:18,600 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:18,780 [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-20 14:46:18,780 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-20 14:46:19,032 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:19,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-03-20 14:46:19,625 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:19,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-03-20 14:46:20,097 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:20,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-20 14:46:20,618 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:20,820 [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-20 14:46:21,072 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:21,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-20 14:46:21,548 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:21,753 [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-20 14:46:21,753 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-20 14:46:22,004 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:22,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-03-20 14:46:22,551 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:22,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-03-20 14:46:23,194 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:23,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-03-20 14:46:23,723 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:24,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-03-20 14:46:24,112 [ scc.repo] DEBUG ## Branches found:
2025-03-20 14:46:24,112 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-20 14:46:24,112 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:46:24,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:46:24,117 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-03-20 14:46:24,122 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 14:46:24,122 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-03-20 14:46:24,127 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-03-20 14:46:24,132 [ scc.git] DEBUG Already up to date.
2025-03-20 14:46:24,132 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-03-20 14:46:24,573 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-20 14:46:24,573 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-03-20 14:46:24,577 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-03-20 14:46:25,258 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-20 14:46:25,258 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-03-20 14:46:25,262 [ scc.git] DEBUG ## Unique users: []
2025-03-20 14:46:25,262 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:46:25,262 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:46:25,266 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-20 14:46:25,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:46:25,279 [ 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-20 14:46:25,313 [ 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-20 14:46:25,313 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-20 14:46:25,313 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-20 14:46:25,318 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-20 14:46:25,324 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-03-20 14:46:25,326 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:25,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:25,496 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-20 14:46:25,504 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-20 14:46:25,510 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#360](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-03-20 14:46:25,515 [ scc.config] DEBUG Found github.token
2025-03-20 14:46:25,515 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-03-20 14:46:25,515 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-20 14:46:25,522 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:46:25,526 [ 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-20 14:46:25,537 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 14:46:25,539 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-03-20 14:46:25,539 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-03-20 14:46:25,748 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:25,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:25,913 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 14:46:25,951 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 14:46:25,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 14:46:25,956 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 14:46:25,992 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 14:46:25,997 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f881c7a7580> has no local changes
2025-03-20 14:46:25,998 [ 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#360 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/)'
2025-03-20 14:46:26,006 [ scc.git] DEBUG [detached HEAD 28e253b] merge master -Dorg -Ssuccess-only
2025-03-20 14:46:26,006 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:26,006 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 14:46:26,078 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-03-20 14:46:26,165 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:26,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:26,355 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-03-20 14:46:26,360 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-03-20 14:46:26,597 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:26,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:26,776 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-03-20 14:46:26,780 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-03-20 14:46:27,018 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:27,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:27,195 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-03-20 14:46:27,200 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-03-20 14:46:27,439 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:27,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:27,624 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-03-20 14:46:27,863 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:28,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:28,046 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-03-20 14:46:28,050 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-03-20 14:46:28,288 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:28,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:28,490 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-03-20 14:46:28,494 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-03-20 14:46:28,732 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:28,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:28,985 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-03-20 14:46:28,990 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-03-20 14:46:29,228 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:29,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:29,412 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-03-20 14:46:29,416 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-03-20 14:46:29,654 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:29,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:29,861 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-03-20 14:46:29,865 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-03-20 14:46:30,104 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:30,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:30,286 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-03-20 14:46:30,291 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-03-20 14:46:30,530 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:30,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:30,714 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-03-20 14:46:30,718 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-03-20 14:46:30,957 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:31,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:31,136 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-03-20 14:46:31,141 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-03-20 14:46:31,380 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:31,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:31,556 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-03-20 14:46:31,795 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:31,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:31,989 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-03-20 14:46:32,228 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:32,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:32,425 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-03-20 14:46:32,429 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-03-20 14:46:32,668 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:32,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:32,852 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-03-20 14:46:33,090 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:33,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:33,273 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-03-20 14:46:33,511 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:33,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:33,692 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-03-20 14:46:33,697 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-03-20 14:46:33,935 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:34,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:34,139 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-03-20 14:46:34,144 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-03-20 14:46:34,382 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:34,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:34,561 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-03-20 14:46:34,565 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-03-20 14:46:34,804 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:34,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:34,972 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-03-20 14:46:34,976 [ scc.config] DEBUG Found submodule.scripts.url
2025-03-20 14:46:35,215 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 14:46:35,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 14:46:35,392 [ scc.config] DEBUG Found submodule.scripts.branch
2025-03-20 14:46:35,392 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 14:46:35,466 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88276a5f10> has local changes
2025-03-20 14:46:35,466 [ 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 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'
- PR 167 dominikl 'Add extinfo command'
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'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#360 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/360/)'
2025-03-20 14:46:35,479 [ scc.git] DEBUG [detached HEAD 526e847] merge master -Dorg -Ssuccess-only
2025-03-20 14:46:35,479 [ scc.merge] INFO Repository: ome/omero-plugins
2025-03-20 14:46:35,479 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-03-20 14:46:35,479 [ scc.merge] INFO Already up to date.
2025-03-20 14:46:35,480 [ scc.merge] INFO
2025-03-20 14:46:35,480 [ scc.merge] INFO Merged PRs:
2025-03-20 14:46:35,480 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-03-20 14:46:35,480 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-03-20 14:46:35,480 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-03-20 14:46:35,480 [ scc.merge] INFO
2025-03-20 14:46:35,480 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-03-20 14:46:35,480 [ scc.merge] INFO Already up to date.
2025-03-20 14:46:35,480 [ scc.merge] INFO
2025-03-20 14:46:35,480 [ scc.merge] INFO
2025-03-20 14:46:35,480 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-03-20 14:46:35,480 [ scc.merge] INFO Excluded PRs:
2025-03-20 14:46:35,480 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-03-20 14:46:35,480 [ scc.merge] INFO Already up to date.
2025-03-20 14:46:35,480 [ scc.merge] INFO
2025-03-20 14:46:35,480 [ scc.merge] INFO
2025-03-20 14:46:35,480 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-03-20 14:46:35,480 [ scc.merge] INFO Excluded PRs:
2025-03-20 14:46:35,480 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-03-20 14:46:35,480 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-03-20 14:46:35,480 [ scc.merge] INFO Already up to date.
2025-03-20 14:46:35,480 [ scc.merge] INFO
2025-03-20 14:46:35,480 [ scc.merge] INFO Merged PRs:
2025-03-20 14:46:35,480 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-03-20 14:46:35,480 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-03-20 14:46:35,480 [ scc.merge] INFO
2025-03-20 14:46:35,480 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-03-20 14:46:35,480 [ scc.merge] INFO Excluded PRs:
2025-03-20 14:46:35,480 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-03-20 14:46:35,480 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-20 14:46:35,480 [ scc.merge] INFO Already up to date.
2025-03-20 14:46:35,480 [ scc.merge] INFO
2025-03-20 14:46:35,480 [ scc.merge] INFO Merged PRs:
2025-03-20 14:46:35,480 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-03-20 14:46:35,480 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-03-20 14:46:35,481 [ scc.merge] INFO
2025-03-20 14:46:35,481 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 14:46:35,481 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-03-20 14:46:35,481 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-03-20 14:46:35,481 [ scc.merge] INFO
2025-03-20 14:46:35,481 [ scc.merge] INFO Repository: ome/omero-figure
2025-03-20 14:46:35,481 [ scc.merge] INFO Excluded PRs:
2025-03-20 14:46:35,481 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-03-20 14:46:35,481 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (stage: draft)
2025-03-20 14:46:35,481 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-03-20 14:46:35,481 [ scc.merge] INFO Already up to date.
2025-03-20 14:46:35,481 [ scc.merge] INFO
2025-03-20 14:46:35,481 [ scc.merge] INFO Merged PRs:
2025-03-20 14:46:35,481 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-03-20 14:46:35,481 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-03-20 14:46:35,481 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-03-20 14:46:35,481 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-03-20 14:46:35,481 [ scc.merge] INFO
2025-03-20 14:46:35,481 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 14:46:35,481 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-03-20 14:46:35,481 [ scc.merge] INFO
2025-03-20 14:46:35,481 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-03-20 14:46:35,481 [ scc.merge] INFO Already up to date.
2025-03-20 14:46:35,481 [ scc.merge] INFO
2025-03-20 14:46:35,481 [ scc.merge] INFO Merged PRs:
2025-03-20 14:46:35,481 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-03-20 14:46:35,481 [ scc.merge] INFO
2025-03-20 14:46:35,481 [ scc.merge] INFO Repository: ome/omero-gallery
2025-03-20 14:46:35,481 [ scc.merge] INFO Already up to date.
2025-03-20 14:46:35,481 [ scc.merge] INFO
2025-03-20 14:46:35,481 [ scc.merge] INFO Merged PRs:
2025-03-20 14:46:35,481 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-03-20 14:46:35,481 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-03-20 14:46:35,481 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-03-20 14:46:35,481 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-03-20 14:46:35,481 [ scc.merge] INFO
2025-03-20 14:46:35,482 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 14:46:35,482 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-03-20 14:46:35,482 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-03-20 14:46:35,482 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-03-20 14:46:35,482 [ scc.merge] INFO
2025-03-20 14:46:35,482 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-03-20 14:46:35,482 [ scc.merge] INFO Excluded PRs:
2025-03-20 14:46:35,482 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-03-20 14:46:35,482 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-03-20 14:46:35,482 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-03-20 14:46:35,482 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-03-20 14:46:35,482 [ scc.merge] INFO Already up to date.
2025-03-20 14:46:35,482 [ scc.merge] INFO
2025-03-20 14:46:35,482 [ scc.merge] INFO Merged PRs:
2025-03-20 14:46:35,482 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-03-20 14:46:35,482 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-03-20 14:46:35,482 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-20 14:46:35,482 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-20 14:46:35,482 [ scc.merge] INFO
2025-03-20 14:46:35,482 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 14:46:35,482 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-20 14:46:35,482 [ scc.merge] INFO
2025-03-20 14:46:35,482 [ scc.merge] INFO Repository: ome/omero-mapr
2025-03-20 14:46:35,482 [ scc.merge] INFO Excluded PRs:
2025-03-20 14:46:35,482 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-03-20 14:46:35,482 [ scc.merge] INFO Already up to date.
2025-03-20 14:46:35,482 [ scc.merge] INFO
2025-03-20 14:46:35,482 [ scc.merge] INFO Merged PRs:
2025-03-20 14:46:35,482 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-03-20 14:46:35,482 [ scc.merge] INFO
2025-03-20 14:46:35,482 [ scc.merge] INFO Repository: ome/omero-metadata
2025-03-20 14:46:35,482 [ scc.merge] INFO Already up to date.
2025-03-20 14:46:35,482 [ scc.merge] INFO
2025-03-20 14:46:35,482 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 14:46:35,482 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-20 14:46:35,482 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-20 14:46:35,483 [ scc.merge] INFO
2025-03-20 14:46:35,483 [ scc.merge] INFO Repository: ome/omero-parade
2025-03-20 14:46:35,483 [ scc.merge] INFO Excluded PRs:
2025-03-20 14:46:35,483 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-03-20 14:46:35,483 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-03-20 14:46:35,483 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-03-20 14:46:35,483 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-03-20 14:46:35,483 [ scc.merge] INFO Already up to date.
2025-03-20 14:46:35,483 [ scc.merge] INFO
2025-03-20 14:46:35,483 [ scc.merge] INFO Merged PRs:
2025-03-20 14:46:35,483 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-20 14:46:35,483 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-20 14:46:35,483 [ scc.merge] INFO
2025-03-20 14:46:35,483 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-03-20 14:46:35,483 [ scc.merge] INFO Already up to date.
2025-03-20 14:46:35,483 [ scc.merge] INFO
2025-03-20 14:46:35,483 [ scc.merge] INFO
2025-03-20 14:46:35,483 [ scc.merge] INFO Repository: ome/omero-rois
2025-03-20 14:46:35,483 [ scc.merge] INFO Excluded PRs:
2025-03-20 14:46:35,483 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-03-20 14:46:35,483 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-20 14:46:35,483 [ scc.merge] INFO Already up to date.
2025-03-20 14:46:35,483 [ scc.merge] INFO
2025-03-20 14:46:35,483 [ scc.merge] INFO
2025-03-20 14:46:35,483 [ scc.merge] INFO Repository: ome/omero-signup
2025-03-20 14:46:35,483 [ scc.merge] INFO Already up to date.
2025-03-20 14:46:35,483 [ scc.merge] INFO
2025-03-20 14:46:35,483 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 14:46:35,483 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-20 14:46:35,483 [ scc.merge] INFO
2025-03-20 14:46:35,483 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-03-20 14:46:35,483 [ scc.merge] INFO Excluded PRs:
2025-03-20 14:46:35,483 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-03-20 14:46:35,483 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-03-20 14:46:35,483 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-03-20 14:46:35,483 [ scc.merge] INFO Already up to date.
2025-03-20 14:46:35,483 [ scc.merge] INFO
2025-03-20 14:46:35,484 [ scc.merge] INFO Merged PRs:
2025-03-20 14:46:35,484 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-20 14:46:35,484 [ scc.merge] INFO
2025-03-20 14:46:35,484 [ scc.merge] INFO Repository: ome/omero-upload
2025-03-20 14:46:35,484 [ scc.merge] INFO Already up to date.
2025-03-20 14:46:35,484 [ scc.merge] INFO
2025-03-20 14:46:35,484 [ scc.merge] INFO
2025-03-20 14:46:35,484 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-03-20 14:46:35,484 [ scc.merge] INFO Already up to date.
2025-03-20 14:46:35,484 [ scc.merge] INFO
2025-03-20 14:46:35,484 [ scc.merge] INFO Merged PRs:
2025-03-20 14:46:35,484 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-03-20 14:46:35,484 [ scc.merge] INFO
2025-03-20 14:46:35,484 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-03-20 14:46:35,484 [ scc.merge] INFO Excluded PRs:
2025-03-20 14:46:35,484 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-03-20 14:46:35,484 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-03-20 14:46:35,484 [ scc.merge] INFO Already up to date.
2025-03-20 14:46:35,484 [ scc.merge] INFO
2025-03-20 14:46:35,484 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 14:46:35,484 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-20 14:46:35,484 [ scc.merge] INFO
2025-03-20 14:46:35,484 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-03-20 14:46:35,484 [ scc.merge] INFO Already up to date.
2025-03-20 14:46:35,484 [ scc.merge] INFO
2025-03-20 14:46:35,484 [ scc.merge] INFO
2025-03-20 14:46:35,484 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-03-20 14:46:35,484 [ scc.merge] INFO Already up to date.
2025-03-20 14:46:35,484 [ scc.merge] INFO
2025-03-20 14:46:35,484 [ scc.merge] INFO
2025-03-20 14:46:35,484 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-03-20 14:46:35,484 [ scc.merge] INFO Already up to date.
2025-03-20 14:46:35,484 [ scc.merge] INFO
2025-03-20 14:46:35,484 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 14:46:35,484 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-03-20 14:46:35,484 [ scc.merge] INFO
2025-03-20 14:46:35,485 [ scc.merge] INFO Repository: ome/scripts
2025-03-20 14:46:35,485 [ scc.merge] INFO Excluded PRs:
2025-03-20 14:46:35,485 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-03-20 14:46:35,485 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-03-20 14:46:35,485 [ scc.merge] INFO Already up to date.
2025-03-20 14:46:35,485 [ scc.merge] INFO
2025-03-20 14:46:35,485 [ scc.merge] INFO Merged PRs:
2025-03-20 14:46:35,485 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-20 14:46:35,485 [ scc.merge] INFO
2025-03-20 14:46:35,485 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 14:46:35,485 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-20 14:46:35,485 [ scc.merge] INFO
2025-03-20 14:46:35,485 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-03-20 14:46:35,485 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 14:46:35,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-03-20 14:46:35,490 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 14:46:35,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:35,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-03-20 14:46:35,495 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 14:46:35,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:35,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-03-20 14:46:35,500 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 14:46:35,504 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:35,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-03-20 14:46:35,505 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 14:46:35,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:35,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-03-20 14:46:35,509 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 14:46:35,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:35,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-03-20 14:46:35,514 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 14:46:35,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:35,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-03-20 14:46:35,519 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 14:46:35,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:35,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-20 14:46:35,524 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 14:46:35,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:35,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-20 14:46:35,529 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 14:46:35,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:35,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-20 14:46:35,534 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 14:46:35,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:35,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-20 14:46:35,538 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 14:46:35,543 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:35,543 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-20 14:46:35,543 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 14:46:35,548 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:35,548 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-20 14:46:35,548 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 14:46:35,552 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:35,553 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-20 14:46:35,553 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 14:46:35,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:35,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-20 14:46:35,557 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 14:46:35,562 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:35,562 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-20 14:46:35,562 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 14:46:35,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:35,567 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-20 14:46:35,567 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 14:46:35,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:35,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-20 14:46:35,571 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 14:46:35,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:35,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-20 14:46:35,576 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 14:46:35,581 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:35,581 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-20 14:46:35,581 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 14:46:35,585 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:35,585 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-20 14:46:35,585 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 14:46:35,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 14:46:35,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-20 14:46:35,590 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 14:46:35,594 [ 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.2-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 c9a10fd] 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 1bb6993] 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-20 14:47:25,863 [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-20 14:47:36,412 [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-20 14:47:38,991 [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-20 14:47:43,990 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-20 14:48:37,755 [ 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}
