Skipping 183 KB..
Full Log2025-03-03 00:48:40,860 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-03 00:48:40,901 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:48:40,902 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:48:40,908 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-03 00:48:40,950 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-03 00:48:40,960 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feda242e940> has no local changes
2025-03-03 00:48:40,960 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Generated by OMERO-plugins-push#350 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/)'
2025-03-03 00:48:40,970 [ scc.git] DEBUG [detached HEAD c861be5] merge master -Dorg -Ssuccess-only
2025-03-03 00:48:40,971 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:48:40,972 [ scc.repo] DEBUG ## PRs found:
2025-03-03 00:48:41,113 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:41,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-03-03 00:48:41,663 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:41,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/503 HTTP/1.1" 200 None
2025-03-03 00:48:42,183 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:42,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/503/comments HTTP/1.1" 200 None
2025-03-03 00:48:42,634 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:42,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502 HTTP/1.1" 200 None
2025-03-03 00:48:43,122 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:43,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502/comments HTTP/1.1" 200 None
2025-03-03 00:48:43,381 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-03 00:48:43,632 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:44,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-03-03 00:48:44,279 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:44,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-03 00:48:44,851 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:45,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-03 00:48:45,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:45,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-03-03 00:48:45,969 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:46,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/45d08b7e29871ecff0386975c975dacd0865bcc4?per_page=1 HTTP/1.1" 200 2
2025-03-03 00:48:46,135 [ scc.repo] DEBUG - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-03 00:48:46,386 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:46,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-03-03 00:48:46,630 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-03 00:48:46,881 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:47,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-03 00:48:47,415 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:47,695 [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-03 00:48:47,948 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:48,239 [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-03 00:48:48,492 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:48,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-03 00:48:49,098 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:49,283 [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-03 00:48:49,284 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-03 00:48:49,535 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:49,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-03-03 00:48:50,009 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:50,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-03-03 00:48:50,471 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:50,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-03-03 00:48:50,975 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:51,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-03-03 00:48:51,482 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:51,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-03 00:48:52,010 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:52,275 [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-03 00:48:52,527 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:52,784 [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-03 00:48:53,037 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:53,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-03 00:48:53,585 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:53,778 [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-03 00:48:53,779 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-03 00:48:54,030 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:54,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-03-03 00:48:54,522 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:54,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-03-03 00:48:55,021 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:55,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-03 00:48:55,550 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:55,783 [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-03 00:48:56,036 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:56,281 [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-03 00:48:56,534 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:56,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-03 00:48:57,046 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:57,210 [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-03 00:48:57,211 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-03-03 00:48:57,463 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:57,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-03-03 00:48:57,953 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:58,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-03-03 00:48:58,456 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:58,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-03 00:48:58,963 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:59,174 [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-03 00:48:59,427 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:48:59,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-03 00:48:59,957 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:00,123 [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-03 00:49:00,124 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-03-03 00:49:00,124 [ scc.repo] DEBUG ## Branches found:
2025-03-03 00:49:00,124 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-03 00:49:00,125 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:00,125 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:00,132 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-03 00:49:00,137 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-03 00:49:00,137 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-03 00:49:00,143 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-03 00:49:00,148 [ scc.git] DEBUG Already up to date.
2025-03-03 00:49:00,149 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-03-03 00:49:01,974 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-03 00:49:01,974 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-03-03 00:49:01,980 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-03-03 00:49:02,717 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-03 00:49:02,717 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-03-03 00:49:02,722 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-03-03 00:49:03,062 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-03 00:49:03,062 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-03-03 00:49:03,068 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-03-03 00:49:03,361 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-03 00:49:03,362 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-03-03 00:49:03,367 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-03-03 00:49:03,648 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-03 00:49:03,648 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-03-03 00:49:03,654 [ scc.git] DEBUG ## Unique users: []
2025-03-03 00:49:03,654 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:03,654 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:03,661 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-03 00:49:03,670 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:03,677 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-03 00:49:03,928 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-03-03 00:49:03,928 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-03-03 00:49:04,055 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-03 00:49:04,059 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-03-03 00:49:04,059 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-03-03 00:49:04,059 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-03-03 00:49:04,062 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:04,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:49:04,231 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-03 00:49:04,241 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:04,247 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-03 00:49:04,572 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-03-03 00:49:04,572 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-03-03 00:49:04,572 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-03-03 00:49:04,573 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-03-03 00:49:04,573 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-03 00:49:04,577 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-03-03 00:49:04,577 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-03-03 00:49:04,577 [ scc.git] DEBUG src/app/header.html | 5 +
2025-03-03 00:49:04,577 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-03-03 00:49:04,577 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-03-03 00:49:04,577 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-03-03 00:49:04,577 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-03-03 00:49:04,578 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-03-03 00:49:04,580 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:04,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:49:04,748 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-03 00:49:04,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:04,766 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-03 00:49:05,023 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-03-03 00:49:05,025 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-03 00:49:05,029 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-03-03 00:49:05,029 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-03-03 00:49:05,029 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-03-03 00:49:05,032 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:05,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:49:05,203 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-03 00:49:05,296 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:05,302 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-03 00:49:05,341 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-03 00:49:05,351 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-03-03 00:49:05,351 [ scc.git] DEBUG package.json | 2 +-
2025-03-03 00:49:05,351 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-03-03 00:49:05,455 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:05,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:49:05,650 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-03 00:49:05,665 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:05,672 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-03 00:49:05,816 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-03 00:49:05,816 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-03-03 00:49:05,816 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-03 00:49:05,817 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-03 00:49:05,826 [ scc.git] DEBUG Calling 'git reset --hard 458d3f8b8aeeed71048c511a6e112a8255345276'
2025-03-03 00:49:05,837 [ scc.git] DEBUG HEAD is now at 458d3f8 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-03-03 00:49:05,903 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:06,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:49:06,078 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-03 00:49:06,085 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-03-03 00:49:06,093 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#350](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-03-03 00:49:06,100 [ scc.config] DEBUG Found github.token
2025-03-03 00:49:06,100 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-03-03 00:49:06,100 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-03 00:49:06,144 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:06,144 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:06,150 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-03 00:49:06,198 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-03 00:49:06,209 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feda03b1520> has no local changes
2025-03-03 00:49:06,209 [ 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#350 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/)'
2025-03-03 00:49:06,220 [ scc.git] DEBUG [detached HEAD 0edf42d] merge master -Dorg -Ssuccess-only
2025-03-03 00:49:06,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:49:06,221 [ scc.repo] DEBUG ## PRs found:
2025-03-03 00:49:06,330 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:06,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-03-03 00:49:06,845 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:07,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-03-03 00:49:07,329 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:07,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-03-03 00:49:07,874 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:08,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-03 00:49:08,387 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:08,601 [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-03 00:49:08,853 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:09,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-03 00:49:09,378 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:09,562 [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-03 00:49:09,562 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-03-03 00:49:09,563 [ scc.repo] DEBUG ## Branches found:
2025-03-03 00:49:09,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-03 00:49:09,563 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:09,563 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:09,569 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-03 00:49:09,574 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-03 00:49:09,574 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-03 00:49:09,580 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-03 00:49:09,588 [ scc.git] DEBUG Already up to date.
2025-03-03 00:49:09,588 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-03-03 00:49:10,510 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-03-03 00:49:10,510 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-03-03 00:49:10,516 [ scc.git] DEBUG ## Unique users: []
2025-03-03 00:49:10,517 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:10,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:10,523 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-03 00:49:10,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:10,535 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-03 00:49:10,546 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-03 00:49:10,548 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-03-03 00:49:10,548 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-03-03 00:49:10,548 [ scc.git] DEBUG requirements.txt | 2 +-
2025-03-03 00:49:10,548 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-03-03 00:49:10,548 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-03-03 00:49:10,549 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-03-03 00:49:10,551 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:10,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:49:10,714 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-03 00:49:10,760 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:10,760 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:10,768 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-03 00:49:10,810 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-03 00:49:10,819 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feda2444af0> has no local changes
2025-03-03 00:49:10,819 [ 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#350 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/)'
2025-03-03 00:49:10,835 [ scc.git] DEBUG [detached HEAD 368dca4] merge master -Dorg -Ssuccess-only
2025-03-03 00:49:10,836 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:49:10,836 [ scc.repo] DEBUG ## PRs found:
2025-03-03 00:49:10,967 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:11,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-03-03 00:49:11,576 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:11,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-03-03 00:49:12,079 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:12,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-03-03 00:49:12,634 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:12,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-03 00:49:13,182 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:13,419 [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-03 00:49:13,672 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:13,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-03 00:49:14,182 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:14,361 [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-03 00:49:14,361 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-03 00:49:14,613 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:14,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-03-03 00:49:15,128 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:15,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-03-03 00:49:15,598 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:15,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-03 00:49:16,120 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:16,331 [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-03 00:49:16,583 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:16,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-03 00:49:17,103 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:17,283 [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-03 00:49:17,284 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-03 00:49:17,284 [ scc.repo] DEBUG ## Branches found:
2025-03-03 00:49:17,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-03 00:49:17,284 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:17,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:17,291 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-03 00:49:17,295 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-03 00:49:17,296 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-03 00:49:17,301 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-03 00:49:17,306 [ scc.git] DEBUG Already up to date.
2025-03-03 00:49:17,307 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-03-03 00:49:18,176 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-03 00:49:18,177 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-03-03 00:49:18,182 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-03-03 00:49:18,756 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-03 00:49:18,756 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-03-03 00:49:18,762 [ scc.git] DEBUG ## Unique users: []
2025-03-03 00:49:18,763 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:18,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:18,770 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-03 00:49:18,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:18,784 [ 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-03 00:49:18,884 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-03-03 00:49:18,885 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-03-03 00:49:18,885 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-03 00:49:18,885 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-03 00:49:18,886 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-03 00:49:18,886 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-03 00:49:18,893 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-03 00:49:18,899 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-03 00:49:18,903 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:19,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:49:19,074 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-03 00:49:19,082 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-03 00:49:19,143 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#350](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-03-03 00:49:19,151 [ scc.config] DEBUG Found github.token
2025-03-03 00:49:19,151 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-03-03 00:49:19,151 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-03 00:49:19,159 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:19,166 [ 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-03 00:49:19,213 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-03 00:49:19,213 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-03 00:49:19,213 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-03-03 00:49:19,213 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-03 00:49:19,213 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-03 00:49:19,220 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-03 00:49:19,228 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-03 00:49:19,326 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:19,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:49:19,481 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-03 00:49:19,489 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-03 00:49:19,495 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#350](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/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-03 00:49:19,500 [ scc.config] DEBUG Found github.token
2025-03-03 00:49:19,500 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-03-03 00:49:19,500 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-03 00:49:19,540 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:19,541 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:19,546 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-03 00:49:19,586 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-03 00:49:19,593 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feda13d4fa0> has no local changes
2025-03-03 00:49:19,594 [ 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#350 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/)'
2025-03-03 00:49:19,603 [ scc.git] DEBUG [detached HEAD b8f94ad] merge master -Dorg -Ssuccess-only
2025-03-03 00:49:19,603 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:49:19,603 [ scc.repo] DEBUG ## PRs found:
2025-03-03 00:49:19,733 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:20,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-03-03 00:49:20,325 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:20,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-03-03 00:49:20,536 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-03 00:49:20,787 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:21,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-03 00:49:21,404 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:21,715 [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-03 00:49:21,968 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:22,261 [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-03 00:49:22,513 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:22,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-03 00:49:23,104 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:23,298 [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-03 00:49:23,299 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-03 00:49:23,551 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:23,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-03-03 00:49:24,027 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:24,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-03-03 00:49:24,532 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:24,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-03-03 00:49:25,007 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:25,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-03-03 00:49:25,505 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:25,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-03-03 00:49:25,982 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:26,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-03-03 00:49:26,440 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:26,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-03-03 00:49:26,712 [ scc.repo] DEBUG ## Branches found:
2025-03-03 00:49:26,712 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-03 00:49:26,712 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:26,712 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:26,719 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-03 00:49:26,724 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-03 00:49:26,724 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-03 00:49:26,729 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-03 00:49:26,734 [ scc.git] DEBUG Already up to date.
2025-03-03 00:49:26,735 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-03-03 00:49:27,057 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-03 00:49:27,058 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-03-03 00:49:27,062 [ scc.git] DEBUG ## Unique users: []
2025-03-03 00:49:27,063 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:27,063 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:27,068 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-03 00:49:27,074 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:27,079 [ 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-03 00:49:27,220 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-03 00:49:27,223 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-03-03 00:49:27,223 [ scc.git] DEBUG package.json | 2 +-
2025-03-03 00:49:27,223 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-03-03 00:49:27,226 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:27,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:49:27,393 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-03 00:49:27,446 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:27,447 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:27,452 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-03 00:49:27,491 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-03 00:49:27,499 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feda1406880> has no local changes
2025-03-03 00:49:27,499 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
Generated by OMERO-plugins-push#350 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/)'
2025-03-03 00:49:27,579 [ scc.git] DEBUG [detached HEAD 6e7a1ee] merge master -Dorg -Ssuccess-only
2025-03-03 00:49:27,579 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:49:27,579 [ scc.repo] DEBUG ## PRs found:
2025-03-03 00:49:27,645 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:27,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-03-03 00:49:27,827 [ scc.repo] DEBUG ## Branches found:
2025-03-03 00:49:27,827 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-03 00:49:27,827 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:27,827 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:27,833 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-03 00:49:27,839 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-03 00:49:27,839 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-03 00:49:27,933 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-03 00:49:27,940 [ scc.git] DEBUG Already up to date.
2025-03-03 00:49:27,940 [ scc.git] DEBUG ## Unique users: []
2025-03-03 00:49:27,940 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:27,940 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:27,945 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-03 00:49:27,985 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:27,985 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:27,992 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-03 00:49:28,032 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-03 00:49:28,038 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feda13ef220> has no local changes
2025-03-03 00:49:28,038 [ 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#350 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/)'
2025-03-03 00:49:28,047 [ scc.git] DEBUG [detached HEAD 1e28320] merge master -Dorg -Ssuccess-only
2025-03-03 00:49:28,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:49:28,048 [ scc.repo] DEBUG ## PRs found:
2025-03-03 00:49:28,079 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:28,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-03-03 00:49:28,572 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:28,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-03-03 00:49:28,828 [ scc.repo] DEBUG ## Branches found:
2025-03-03 00:49:28,828 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-03 00:49:28,828 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:28,828 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:28,834 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-03 00:49:28,840 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-03 00:49:28,840 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-03 00:49:28,845 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-03 00:49:28,850 [ scc.git] DEBUG Already up to date.
2025-03-03 00:49:28,850 [ scc.git] DEBUG ## Unique users: []
2025-03-03 00:49:28,851 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:28,851 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:28,855 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-03 00:49:28,894 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:28,894 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:28,899 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-03 00:49:28,937 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-03 00:49:28,944 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feda13d4af0> has no local changes
2025-03-03 00:49:28,944 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Generated by OMERO-plugins-push#350 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/)'
2025-03-03 00:49:28,973 [ scc.git] DEBUG [detached HEAD 0eff6b4] merge master -Dorg -Ssuccess-only
2025-03-03 00:49:28,973 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:49:28,974 [ scc.repo] DEBUG ## PRs found:
2025-03-03 00:49:29,080 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:29,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-03-03 00:49:29,591 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:29,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-03-03 00:49:30,048 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:30,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-03-03 00:49:30,509 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:30,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-03 00:49:31,067 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:31,259 [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-03 00:49:31,512 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:31,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-03 00:49:31,975 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:32,160 [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-03 00:49:32,161 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-03 00:49:32,161 [ scc.repo] DEBUG ## Branches found:
2025-03-03 00:49:32,161 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-03 00:49:32,161 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:32,161 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:32,169 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-03 00:49:32,174 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-03 00:49:32,174 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-03 00:49:32,179 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-03 00:49:32,185 [ scc.git] DEBUG Already up to date.
2025-03-03 00:49:32,185 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-03-03 00:49:32,579 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-03-03 00:49:32,579 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-03-03 00:49:32,583 [ scc.git] DEBUG ## Unique users: []
2025-03-03 00:49:32,584 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:32,584 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:32,589 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-03 00:49:32,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:32,600 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-03 00:49:32,679 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-03-03 00:49:32,679 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-03-03 00:49:32,680 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-03-03 00:49:32,680 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-03-03 00:49:32,680 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-03-03 00:49:32,680 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-03 00:49:32,680 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-03-03 00:49:32,680 [ scc.git] DEBUG Auto-merging setup.py
2025-03-03 00:49:32,680 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-03-03 00:49:32,684 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-03 00:49:32,688 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-03 00:49:32,695 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-03-03 00:49:32,697 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:32,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:49:32,852 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-03 00:49:32,859 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-03 00:49:33,140 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#350](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
--conflicts
2025-03-03 00:49:33,146 [ scc.config] DEBUG Found github.token
2025-03-03 00:49:33,146 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-03-03 00:49:33,146 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-03 00:49:33,189 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:33,189 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:33,197 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-03 00:49:33,239 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-03 00:49:33,246 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feda03befd0> has no local changes
2025-03-03 00:49:33,247 [ 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#350 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/)'
2025-03-03 00:49:33,256 [ scc.git] DEBUG [detached HEAD 3362d87] merge master -Dorg -Ssuccess-only
2025-03-03 00:49:33,256 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:49:33,256 [ scc.repo] DEBUG ## PRs found:
2025-03-03 00:49:33,259 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:33,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-03-03 00:49:33,914 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:34,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-03-03 00:49:34,401 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:34,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-03-03 00:49:34,864 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:35,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-03-03 00:49:35,412 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:35,657 [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-03 00:49:35,910 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:36,110 [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-03 00:49:36,364 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:36,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-03-03 00:49:36,833 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:37,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-03-03 00:49:37,318 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:37,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-03-03 00:49:37,825 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:38,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-03-03 00:49:38,286 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:38,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-03 00:49:38,816 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:39,052 [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-03 00:49:39,305 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:39,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-03 00:49:39,773 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:39,950 [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-03 00:49:39,951 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-03 00:49:39,952 [ scc.repo] DEBUG ## Branches found:
2025-03-03 00:49:39,952 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-03 00:49:39,952 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:39,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:39,959 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-03 00:49:39,964 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-03 00:49:39,964 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-03 00:49:40,125 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-03 00:49:40,131 [ scc.git] DEBUG Already up to date.
2025-03-03 00:49:40,132 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-03-03 00:49:40,477 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-03-03 00:49:40,477 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-03-03 00:49:40,481 [ scc.git] DEBUG ## Unique users: []
2025-03-03 00:49:40,481 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:40,481 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:40,488 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-03-03 00:49:40,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:40,502 [ 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-03 00:49:40,519 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-03 00:49:40,522 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-03-03 00:49:40,522 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-03-03 00:49:40,523 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-03-03 00:49:40,523 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-03-03 00:49:40,523 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-03-03 00:49:40,523 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-03-03 00:49:40,523 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-03-03 00:49:40,523 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-03-03 00:49:40,523 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-03-03 00:49:40,524 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-03-03 00:49:40,524 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-03-03 00:49:40,524 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-03-03 00:49:40,526 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:40,526 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-03-03 00:49:40,526 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-03-03 00:49:40,526 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-03-03 00:49:40,526 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-03-03 00:49:40,526 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-03-03 00:49:40,526 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-03-03 00:49:40,526 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-03-03 00:49:40,526 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-03-03 00:49:40,526 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-03-03 00:49:40,526 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-03-03 00:49:40,526 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-03-03 00:49:40,526 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-03-03 00:49:40,526 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-03-03 00:49:40,526 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-03-03 00:49:40,526 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-03-03 00:49:40,526 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-03-03 00:49:40,526 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-03-03 00:49:40,526 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-03-03 00:49:40,526 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-03-03 00:49:40,526 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-03-03 00:49:40,526 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-03-03 00:49:40,526 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-03-03 00:49:40,527 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-03-03 00:49:40,527 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-03-03 00:49:40,527 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-03-03 00:49:40,527 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-03-03 00:49:40,527 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-03-03 00:49:40,527 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-03-03 00:49:40,527 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-03-03 00:49:40,527 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-03-03 00:49:40,527 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-03-03 00:49:40,527 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-03-03 00:49:40,527 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-03-03 00:49:40,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:49:40,697 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-03 00:49:40,741 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:40,741 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:40,747 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-03 00:49:40,791 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-03 00:49:40,798 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feda13d4ca0> has no local changes
2025-03-03 00:49:40,798 [ 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#350 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/)'
2025-03-03 00:49:40,808 [ scc.git] DEBUG [detached HEAD 3bfac40] merge master -Dorg -Ssuccess-only
2025-03-03 00:49:40,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:49:40,808 [ scc.repo] DEBUG ## PRs found:
2025-03-03 00:49:40,949 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:41,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-03-03 00:49:41,139 [ scc.repo] DEBUG ## Branches found:
2025-03-03 00:49:41,139 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-03 00:49:41,139 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:41,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:41,145 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-03 00:49:41,150 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-03 00:49:41,150 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-03 00:49:41,156 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-03 00:49:41,161 [ scc.git] DEBUG Already up to date.
2025-03-03 00:49:41,161 [ scc.git] DEBUG ## Unique users: []
2025-03-03 00:49:41,161 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:41,162 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:41,166 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-03 00:49:41,205 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:41,205 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:41,211 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-03 00:49:41,249 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-03 00:49:41,256 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feda037c250> has no local changes
2025-03-03 00:49:41,256 [ 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#350 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/)'
2025-03-03 00:49:41,264 [ scc.git] DEBUG [detached HEAD c4fa6ac] merge master -Dorg -Ssuccess-only
2025-03-03 00:49:41,265 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:49:41,265 [ scc.repo] DEBUG ## PRs found:
2025-03-03 00:49:41,391 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:41,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-03-03 00:49:41,911 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:42,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-03-03 00:49:42,388 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:42,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-03-03 00:49:42,854 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:43,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-03 00:49:43,381 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:43,614 [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-03 00:49:43,866 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:44,071 [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-03 00:49:44,324 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:44,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-03 00:49:44,804 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:45,021 [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-03 00:49:45,021 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-03-03 00:49:45,021 [ scc.repo] DEBUG ## Branches found:
2025-03-03 00:49:45,021 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-03 00:49:45,022 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:45,022 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:45,028 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-03 00:49:45,032 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-03 00:49:45,033 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-03 00:49:45,037 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-03 00:49:45,043 [ scc.git] DEBUG Already up to date.
2025-03-03 00:49:45,043 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-03-03 00:49:45,725 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-03-03 00:49:45,726 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-03-03 00:49:45,730 [ scc.git] DEBUG ## Unique users: []
2025-03-03 00:49:45,730 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:45,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:45,736 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-03-03 00:49:45,741 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:45,746 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-03-03 00:49:45,826 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-03 00:49:45,829 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-03-03 00:49:45,829 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-03-03 00:49:45,829 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-03-03 00:49:45,829 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-03-03 00:49:45,829 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-03-03 00:49:45,832 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:46,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:49:46,003 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-03 00:49:46,043 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:46,043 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:46,049 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-03 00:49:46,089 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-03 00:49:46,096 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feda13d4d30> has no local changes
2025-03-03 00:49:46,096 [ 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#350 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/)'
2025-03-03 00:49:46,107 [ scc.git] DEBUG [detached HEAD 0c620aa] merge master -Dorg -Ssuccess-only
2025-03-03 00:49:46,107 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:49:46,107 [ scc.git] INFO Overriding base-branch from master to main
2025-03-03 00:49:46,108 [ scc.repo] DEBUG ## PRs found:
2025-03-03 00:49:46,255 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:46,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-03-03 00:49:46,798 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:47,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-03-03 00:49:47,331 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:47,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-03-03 00:49:47,854 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:48,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-03-03 00:49:48,388 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:48,652 [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-03 00:49:48,906 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:49,147 [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-03 00:49:49,400 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:49,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-03-03 00:49:49,877 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:50,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-03-03 00:49:50,364 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:50,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-03-03 00:49:50,853 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:51,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-03 00:49:51,386 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:51,592 [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-03 00:49:51,844 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:52,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-03 00:49:52,297 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:52,474 [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-03 00:49:52,475 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-03 00:49:52,475 [ scc.repo] DEBUG ## Branches found:
2025-03-03 00:49:52,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-03 00:49:52,475 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:52,476 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:52,481 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-03-03 00:49:52,486 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-03 00:49:52,486 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-03-03 00:49:52,492 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-03-03 00:49:52,497 [ scc.git] DEBUG Already up to date.
2025-03-03 00:49:52,497 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-03-03 00:49:52,942 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-03-03 00:49:52,943 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-03-03 00:49:52,948 [ scc.git] DEBUG ## Unique users: []
2025-03-03 00:49:52,948 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:52,948 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:52,954 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-03 00:49:52,961 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:52,967 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-03 00:49:53,064 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-03-03 00:49:53,064 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-03-03 00:49:53,064 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-03 00:49:53,064 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-03 00:49:53,071 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-03 00:49:53,077 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-03-03 00:49:53,080 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:53,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:49:53,261 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-03 00:49:53,268 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-03 00:49:53,273 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#350](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-03-03 00:49:53,278 [ scc.config] DEBUG Found github.token
2025-03-03 00:49:53,278 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-03-03 00:49:53,279 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-03 00:49:53,317 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:53,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:53,323 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-03 00:49:53,361 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-03 00:49:53,369 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feda0362100> has no local changes
2025-03-03 00:49:53,369 [ 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#350 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/)'
2025-03-03 00:49:53,379 [ scc.git] DEBUG [detached HEAD 8b3a212] merge master -Dorg -Ssuccess-only
2025-03-03 00:49:53,379 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:49:53,380 [ scc.repo] DEBUG ## PRs found:
2025-03-03 00:49:53,513 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:53,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-03-03 00:49:53,695 [ scc.repo] DEBUG ## Branches found:
2025-03-03 00:49:53,695 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-03 00:49:53,695 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:53,695 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:53,701 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-03 00:49:53,707 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-03 00:49:53,707 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-03 00:49:53,766 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-03 00:49:53,773 [ scc.git] DEBUG Already up to date.
2025-03-03 00:49:53,773 [ scc.git] DEBUG ## Unique users: []
2025-03-03 00:49:53,773 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:53,773 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:53,779 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-03 00:49:53,821 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:53,822 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:53,828 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-03 00:49:53,871 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-03 00:49:53,878 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feda02945b0> has no local changes
2025-03-03 00:49:53,878 [ 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#350 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/)'
2025-03-03 00:49:53,887 [ scc.git] DEBUG [detached HEAD 4bd3b59] merge master -Dorg -Ssuccess-only
2025-03-03 00:49:53,887 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:49:53,887 [ scc.repo] DEBUG ## PRs found:
2025-03-03 00:49:53,947 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:54,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-03-03 00:49:54,152 [ scc.repo] DEBUG ## Branches found:
2025-03-03 00:49:54,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-03 00:49:54,152 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:54,152 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:54,158 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-03 00:49:54,163 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-03 00:49:54,163 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-03 00:49:54,168 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-03 00:49:54,173 [ scc.git] DEBUG Already up to date.
2025-03-03 00:49:54,173 [ scc.git] DEBUG ## Unique users: []
2025-03-03 00:49:54,173 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:54,174 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:54,178 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-03 00:49:54,217 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:54,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:54,224 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-03 00:49:54,263 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-03 00:49:54,270 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feda0383520> has no local changes
2025-03-03 00:49:54,270 [ 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#350 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/)'
2025-03-03 00:49:54,279 [ scc.git] DEBUG [detached HEAD b5b359d] merge master -Dorg -Ssuccess-only
2025-03-03 00:49:54,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:49:54,280 [ scc.repo] DEBUG ## PRs found:
2025-03-03 00:49:54,404 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:54,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-03-03 00:49:54,909 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:55,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-03-03 00:49:55,463 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:55,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-03-03 00:49:55,930 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:56,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-03 00:49:56,443 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:56,655 [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-03 00:49:56,908 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:57,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-03 00:49:57,446 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:57,638 [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-03 00:49:57,639 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-03-03 00:49:57,639 [ scc.repo] DEBUG ## Branches found:
2025-03-03 00:49:57,639 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-03 00:49:57,639 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:57,639 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:57,645 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-03 00:49:57,651 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-03 00:49:57,651 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-03 00:49:57,656 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-03 00:49:57,662 [ scc.git] DEBUG Already up to date.
2025-03-03 00:49:57,662 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-03-03 00:49:58,331 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-03-03 00:49:58,331 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-03-03 00:49:58,336 [ scc.git] DEBUG ## Unique users: []
2025-03-03 00:49:58,336 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:58,337 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:58,343 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-03 00:49:58,348 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:58,353 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-03 00:49:58,456 [ scc.git] DEBUG Auto-merging Dockerfile
2025-03-03 00:49:58,456 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-03-03 00:49:58,456 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-03 00:49:58,456 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-03 00:49:58,463 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-03 00:49:58,469 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-03-03 00:49:58,472 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:58,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:49:58,639 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-03 00:49:58,647 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-03 00:49:58,653 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#350](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-03-03 00:49:58,657 [ scc.config] DEBUG Found github.token
2025-03-03 00:49:58,658 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-03-03 00:49:58,658 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-03 00:49:58,695 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:49:58,695 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:49:58,701 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-03 00:49:58,738 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-03 00:49:58,746 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feda0294610> has no local changes
2025-03-03 00:49:58,746 [ 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#350 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/)'
2025-03-03 00:49:58,754 [ scc.git] DEBUG [detached HEAD c522276] merge master -Dorg -Ssuccess-only
2025-03-03 00:49:58,755 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:49:58,755 [ scc.git] INFO Overriding base-branch from master to develop
2025-03-03 00:49:58,755 [ scc.repo] DEBUG ## PRs found:
2025-03-03 00:49:58,891 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:59,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-03-03 00:49:59,505 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:49:59,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-03-03 00:49:59,984 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:00,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-03-03 00:50:00,455 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:00,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-03 00:50:00,901 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:01,145 [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-03 00:50:01,397 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:01,700 [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-03 00:50:01,953 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:02,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-03 00:50:02,412 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:02,632 [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-03 00:50:02,633 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-03 00:50:02,885 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:03,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-03-03 00:50:03,350 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:03,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-03-03 00:50:03,828 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:04,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-03 00:50:04,355 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:04,547 [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-03 00:50:04,799 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:05,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-03 00:50:05,275 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:05,453 [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-03 00:50:05,453 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-03 00:50:05,705 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:05,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-03-03 00:50:06,197 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:06,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-03-03 00:50:06,730 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:06,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-03-03 00:50:07,208 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:07,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-03-03 00:50:07,474 [ scc.repo] DEBUG ## Branches found:
2025-03-03 00:50:07,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-03 00:50:07,474 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:50:07,474 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:50:07,481 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-03-03 00:50:07,485 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-03 00:50:07,486 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-03-03 00:50:07,491 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-03-03 00:50:07,496 [ scc.git] DEBUG Already up to date.
2025-03-03 00:50:07,496 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-03-03 00:50:08,301 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-03 00:50:08,301 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-03-03 00:50:08,306 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-03-03 00:50:09,057 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-03 00:50:09,058 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-03-03 00:50:09,065 [ scc.git] DEBUG ## Unique users: []
2025-03-03 00:50:09,065 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:50:09,065 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:50:09,071 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-03 00:50:09,079 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:50:09,084 [ 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-03 00:50:09,159 [ 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-03 00:50:09,159 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-03 00:50:09,159 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-03 00:50:09,166 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-03 00:50:09,172 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-03-03 00:50:09,175 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:09,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:09,339 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-03 00:50:09,348 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-03 00:50:09,355 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#350](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-03-03 00:50:09,361 [ scc.config] DEBUG Found github.token
2025-03-03 00:50:09,362 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-03-03 00:50:09,362 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-03 00:50:09,370 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:50:09,375 [ 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-03 00:50:09,398 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-03 00:50:09,401 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-03-03 00:50:09,401 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-03-03 00:50:09,591 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:09,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:09,756 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-03 00:50:09,796 [ scc.git] DEBUG Get sha1 of %s
2025-03-03 00:50:09,796 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-03 00:50:09,802 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-03 00:50:09,868 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-03 00:50:09,881 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feda02e8580> has no local changes
2025-03-03 00:50:09,882 [ 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#350 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/)'
2025-03-03 00:50:09,894 [ scc.git] DEBUG [detached HEAD 9bdd1b5] merge master -Dorg -Ssuccess-only
2025-03-03 00:50:09,894 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:50:09,894 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-03 00:50:09,975 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-03-03 00:50:10,008 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:10,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:10,195 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-03-03 00:50:10,200 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-03-03 00:50:10,437 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:10,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:10,617 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-03-03 00:50:10,623 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-03-03 00:50:10,858 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:11,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:11,035 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-03-03 00:50:11,040 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-03-03 00:50:11,276 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:11,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:11,930 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-03-03 00:50:12,168 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:12,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:12,352 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-03-03 00:50:12,357 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-03-03 00:50:12,592 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:12,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:12,763 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-03-03 00:50:12,768 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-03-03 00:50:13,002 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:13,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:13,182 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-03-03 00:50:13,187 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-03-03 00:50:13,423 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:13,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:13,615 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-03-03 00:50:13,622 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-03-03 00:50:13,851 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:14,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:14,019 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-03-03 00:50:14,024 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-03-03 00:50:14,260 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:14,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:14,442 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-03-03 00:50:14,447 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-03-03 00:50:14,682 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:14,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:14,899 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-03-03 00:50:14,904 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-03-03 00:50:15,140 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:15,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:15,315 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-03-03 00:50:15,320 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-03-03 00:50:15,557 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:15,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:15,741 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-03-03 00:50:15,976 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:16,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:16,161 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-03-03 00:50:16,396 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:16,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:16,564 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-03-03 00:50:16,570 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-03-03 00:50:16,805 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:16,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:16,979 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-03-03 00:50:17,212 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:17,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:17,397 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-03-03 00:50:17,632 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:17,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:17,804 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-03-03 00:50:17,809 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-03-03 00:50:18,045 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:18,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:18,232 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-03-03 00:50:18,236 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-03-03 00:50:18,472 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:18,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:18,638 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-03-03 00:50:18,643 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-03-03 00:50:18,881 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:19,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:19,107 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-03-03 00:50:19,114 [ scc.config] DEBUG Found submodule.scripts.url
2025-03-03 00:50:19,338 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-03 00:50:19,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-03 00:50:19,506 [ scc.config] DEBUG Found submodule.scripts.branch
2025-03-03 00:50:19,506 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-03 00:50:19,583 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7feda37c5ca0> has local changes
2025-03-03 00:50:19,583 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 167 dominikl 'Add extinfo command' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 600 Rdornier 'Label on rois' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#350 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/350/)'
2025-03-03 00:50:19,614 [ scc.git] DEBUG [detached HEAD 9b38002] merge master -Dorg -Ssuccess-only
2025-03-03 00:50:19,614 [ scc.merge] INFO Repository: ome/omero-plugins
2025-03-03 00:50:19,615 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-03-03 00:50:19,615 [ scc.merge] INFO Already up to date.
2025-03-03 00:50:19,615 [ scc.merge] INFO
2025-03-03 00:50:19,615 [ scc.merge] INFO Merged PRs:
2025-03-03 00:50:19,615 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-03-03 00:50:19,615 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-03-03 00:50:19,615 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-03-03 00:50:19,615 [ scc.merge] INFO
2025-03-03 00:50:19,615 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-03-03 00:50:19,615 [ scc.merge] INFO Already up to date.
2025-03-03 00:50:19,616 [ scc.merge] INFO
2025-03-03 00:50:19,616 [ scc.merge] INFO
2025-03-03 00:50:19,616 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-03-03 00:50:19,616 [ scc.merge] INFO Excluded PRs:
2025-03-03 00:50:19,616 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-03-03 00:50:19,616 [ scc.merge] INFO Already up to date.
2025-03-03 00:50:19,616 [ scc.merge] INFO
2025-03-03 00:50:19,616 [ scc.merge] INFO
2025-03-03 00:50:19,616 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-03-03 00:50:19,616 [ scc.merge] INFO Excluded PRs:
2025-03-03 00:50:19,616 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-03-03 00:50:19,616 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-03-03 00:50:19,616 [ scc.merge] INFO Already up to date.
2025-03-03 00:50:19,616 [ scc.merge] INFO
2025-03-03 00:50:19,616 [ scc.merge] INFO Merged PRs:
2025-03-03 00:50:19,616 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-03-03 00:50:19,616 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-03-03 00:50:19,616 [ scc.merge] INFO
2025-03-03 00:50:19,616 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-03-03 00:50:19,616 [ scc.merge] INFO Excluded PRs:
2025-03-03 00:50:19,616 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-03-03 00:50:19,616 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-03-03 00:50:19,616 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-03 00:50:19,616 [ scc.merge] INFO Already up to date.
2025-03-03 00:50:19,616 [ scc.merge] INFO
2025-03-03 00:50:19,616 [ scc.merge] INFO Merged PRs:
2025-03-03 00:50:19,616 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-03-03 00:50:19,616 [ scc.merge] INFO
2025-03-03 00:50:19,616 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-03 00:50:19,616 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-03-03 00:50:19,616 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-03-03 00:50:19,616 [ scc.merge] INFO
2025-03-03 00:50:19,616 [ scc.merge] INFO Repository: ome/omero-figure
2025-03-03 00:50:19,616 [ scc.merge] INFO Excluded PRs:
2025-03-03 00:50:19,616 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-03-03 00:50:19,616 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (stage: draft)
2025-03-03 00:50:19,616 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-03-03 00:50:19,616 [ scc.merge] INFO Already up to date.
2025-03-03 00:50:19,616 [ scc.merge] INFO
2025-03-03 00:50:19,617 [ scc.merge] INFO Merged PRs:
2025-03-03 00:50:19,617 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-03-03 00:50:19,617 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-03-03 00:50:19,617 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-03-03 00:50:19,617 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-03-03 00:50:19,617 [ scc.merge] INFO
2025-03-03 00:50:19,617 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-03 00:50:19,617 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-03-03 00:50:19,617 [ scc.merge] INFO
2025-03-03 00:50:19,617 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-03-03 00:50:19,617 [ scc.merge] INFO Already up to date.
2025-03-03 00:50:19,617 [ scc.merge] INFO
2025-03-03 00:50:19,617 [ scc.merge] INFO Merged PRs:
2025-03-03 00:50:19,617 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-03-03 00:50:19,617 [ scc.merge] INFO
2025-03-03 00:50:19,617 [ scc.merge] INFO Repository: ome/omero-gallery
2025-03-03 00:50:19,617 [ scc.merge] INFO Already up to date.
2025-03-03 00:50:19,617 [ scc.merge] INFO
2025-03-03 00:50:19,617 [ scc.merge] INFO Merged PRs:
2025-03-03 00:50:19,617 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-03-03 00:50:19,617 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-03-03 00:50:19,617 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-03-03 00:50:19,617 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-03-03 00:50:19,617 [ scc.merge] INFO
2025-03-03 00:50:19,617 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-03 00:50:19,617 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-03-03 00:50:19,617 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-03-03 00:50:19,617 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-03-03 00:50:19,617 [ scc.merge] INFO
2025-03-03 00:50:19,617 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-03-03 00:50:19,617 [ scc.merge] INFO Excluded PRs:
2025-03-03 00:50:19,617 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-03-03 00:50:19,617 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-03-03 00:50:19,617 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-03-03 00:50:19,617 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-03-03 00:50:19,617 [ scc.merge] INFO Already up to date.
2025-03-03 00:50:19,617 [ scc.merge] INFO
2025-03-03 00:50:19,617 [ scc.merge] INFO Merged PRs:
2025-03-03 00:50:19,617 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-03-03 00:50:19,617 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-03-03 00:50:19,618 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-03 00:50:19,618 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-03 00:50:19,618 [ scc.merge] INFO
2025-03-03 00:50:19,618 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-03 00:50:19,618 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-03 00:50:19,618 [ scc.merge] INFO
2025-03-03 00:50:19,618 [ scc.merge] INFO Repository: ome/omero-mapr
2025-03-03 00:50:19,618 [ scc.merge] INFO Excluded PRs:
2025-03-03 00:50:19,618 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-03-03 00:50:19,618 [ scc.merge] INFO Already up to date.
2025-03-03 00:50:19,618 [ scc.merge] INFO
2025-03-03 00:50:19,618 [ scc.merge] INFO Merged PRs:
2025-03-03 00:50:19,618 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-03-03 00:50:19,618 [ scc.merge] INFO
2025-03-03 00:50:19,618 [ scc.merge] INFO Repository: ome/omero-metadata
2025-03-03 00:50:19,618 [ scc.merge] INFO Already up to date.
2025-03-03 00:50:19,618 [ scc.merge] INFO
2025-03-03 00:50:19,618 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-03 00:50:19,618 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-03 00:50:19,618 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-03 00:50:19,618 [ scc.merge] INFO
2025-03-03 00:50:19,618 [ scc.merge] INFO Repository: ome/omero-parade
2025-03-03 00:50:19,618 [ scc.merge] INFO Excluded PRs:
2025-03-03 00:50:19,618 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-03-03 00:50:19,618 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-03-03 00:50:19,618 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-03-03 00:50:19,618 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-03-03 00:50:19,618 [ scc.merge] INFO Already up to date.
2025-03-03 00:50:19,618 [ scc.merge] INFO
2025-03-03 00:50:19,618 [ scc.merge] INFO Merged PRs:
2025-03-03 00:50:19,618 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-03 00:50:19,618 [ scc.merge] INFO
2025-03-03 00:50:19,618 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-03-03 00:50:19,618 [ scc.merge] INFO Already up to date.
2025-03-03 00:50:19,618 [ scc.merge] INFO
2025-03-03 00:50:19,618 [ scc.merge] INFO
2025-03-03 00:50:19,618 [ scc.merge] INFO Repository: ome/omero-rois
2025-03-03 00:50:19,618 [ scc.merge] INFO Excluded PRs:
2025-03-03 00:50:19,618 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-03 00:50:19,618 [ scc.merge] INFO Already up to date.
2025-03-03 00:50:19,619 [ scc.merge] INFO
2025-03-03 00:50:19,619 [ scc.merge] INFO
2025-03-03 00:50:19,619 [ scc.merge] INFO Repository: ome/omero-signup
2025-03-03 00:50:19,619 [ scc.merge] INFO Already up to date.
2025-03-03 00:50:19,619 [ scc.merge] INFO
2025-03-03 00:50:19,619 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-03 00:50:19,619 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-03 00:50:19,619 [ scc.merge] INFO
2025-03-03 00:50:19,619 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-03-03 00:50:19,619 [ scc.merge] INFO Excluded PRs:
2025-03-03 00:50:19,619 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-03-03 00:50:19,619 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-03-03 00:50:19,619 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-03-03 00:50:19,619 [ scc.merge] INFO Already up to date.
2025-03-03 00:50:19,619 [ scc.merge] INFO
2025-03-03 00:50:19,619 [ scc.merge] INFO Merged PRs:
2025-03-03 00:50:19,619 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-03 00:50:19,619 [ scc.merge] INFO
2025-03-03 00:50:19,619 [ scc.merge] INFO Repository: ome/omero-upload
2025-03-03 00:50:19,619 [ scc.merge] INFO Already up to date.
2025-03-03 00:50:19,619 [ scc.merge] INFO
2025-03-03 00:50:19,619 [ scc.merge] INFO
2025-03-03 00:50:19,619 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-03-03 00:50:19,619 [ scc.merge] INFO Already up to date.
2025-03-03 00:50:19,619 [ scc.merge] INFO
2025-03-03 00:50:19,619 [ scc.merge] INFO Merged PRs:
2025-03-03 00:50:19,619 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-03-03 00:50:19,619 [ scc.merge] INFO
2025-03-03 00:50:19,619 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-03-03 00:50:19,619 [ scc.merge] INFO Excluded PRs:
2025-03-03 00:50:19,619 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-03-03 00:50:19,619 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-03-03 00:50:19,619 [ scc.merge] INFO Already up to date.
2025-03-03 00:50:19,619 [ scc.merge] INFO
2025-03-03 00:50:19,619 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-03 00:50:19,619 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-03 00:50:19,619 [ scc.merge] INFO
2025-03-03 00:50:19,619 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-03-03 00:50:19,619 [ scc.merge] INFO Already up to date.
2025-03-03 00:50:19,619 [ scc.merge] INFO
2025-03-03 00:50:19,620 [ scc.merge] INFO
2025-03-03 00:50:19,620 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-03-03 00:50:19,620 [ scc.merge] INFO Already up to date.
2025-03-03 00:50:19,620 [ scc.merge] INFO
2025-03-03 00:50:19,620 [ scc.merge] INFO
2025-03-03 00:50:19,620 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-03-03 00:50:19,620 [ scc.merge] INFO Already up to date.
2025-03-03 00:50:19,620 [ scc.merge] INFO
2025-03-03 00:50:19,620 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-03 00:50:19,620 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-03-03 00:50:19,620 [ scc.merge] INFO
2025-03-03 00:50:19,620 [ scc.merge] INFO Repository: ome/scripts
2025-03-03 00:50:19,620 [ scc.merge] INFO Excluded PRs:
2025-03-03 00:50:19,620 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-03-03 00:50:19,620 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-03-03 00:50:19,620 [ scc.merge] INFO Already up to date.
2025-03-03 00:50:19,620 [ scc.merge] INFO
2025-03-03 00:50:19,620 [ scc.merge] INFO Merged PRs:
2025-03-03 00:50:19,620 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-03 00:50:19,620 [ scc.merge] INFO
2025-03-03 00:50:19,620 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-03 00:50:19,620 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-03 00:50:19,620 [ scc.merge] INFO
2025-03-03 00:50:19,620 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-03-03 00:50:19,620 [ scc.git] DEBUG Calling 'git remote'
2025-03-03 00:50:19,626 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-03-03 00:50:19,626 [ scc.git] DEBUG Calling 'git remote'
2025-03-03 00:50:19,631 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:50:19,631 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-03-03 00:50:19,631 [ scc.git] DEBUG Calling 'git remote'
2025-03-03 00:50:19,635 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:50:19,636 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-03-03 00:50:19,636 [ scc.git] DEBUG Calling 'git remote'
2025-03-03 00:50:19,640 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:50:19,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-03-03 00:50:19,641 [ scc.git] DEBUG Calling 'git remote'
2025-03-03 00:50:19,645 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:50:19,645 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-03-03 00:50:19,645 [ scc.git] DEBUG Calling 'git remote'
2025-03-03 00:50:19,650 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:50:19,650 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-03-03 00:50:19,651 [ scc.git] DEBUG Calling 'git remote'
2025-03-03 00:50:19,655 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:50:19,656 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-03-03 00:50:19,656 [ scc.git] DEBUG Calling 'git remote'
2025-03-03 00:50:19,660 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:50:19,660 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-03 00:50:19,660 [ scc.git] DEBUG Calling 'git remote'
2025-03-03 00:50:19,665 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:50:19,665 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-03 00:50:19,665 [ scc.git] DEBUG Calling 'git remote'
2025-03-03 00:50:19,670 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:50:19,670 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-03 00:50:19,670 [ scc.git] DEBUG Calling 'git remote'
2025-03-03 00:50:19,675 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:50:19,675 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-03 00:50:19,675 [ scc.git] DEBUG Calling 'git remote'
2025-03-03 00:50:19,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:50:19,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-03 00:50:19,680 [ scc.git] DEBUG Calling 'git remote'
2025-03-03 00:50:19,685 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:50:19,685 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-03 00:50:19,685 [ scc.git] DEBUG Calling 'git remote'
2025-03-03 00:50:19,689 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:50:19,690 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-03 00:50:19,690 [ scc.git] DEBUG Calling 'git remote'
2025-03-03 00:50:19,694 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:50:19,694 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-03 00:50:19,694 [ scc.git] DEBUG Calling 'git remote'
2025-03-03 00:50:19,699 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:50:19,699 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-03 00:50:19,699 [ scc.git] DEBUG Calling 'git remote'
2025-03-03 00:50:19,704 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:50:19,704 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-03 00:50:19,704 [ scc.git] DEBUG Calling 'git remote'
2025-03-03 00:50:19,709 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:50:19,709 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-03 00:50:19,709 [ scc.git] DEBUG Calling 'git remote'
2025-03-03 00:50:19,714 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:50:19,714 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-03 00:50:19,714 [ scc.git] DEBUG Calling 'git remote'
2025-03-03 00:50:19,719 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:50:19,719 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-03 00:50:19,719 [ scc.git] DEBUG Calling 'git remote'
2025-03-03 00:50:19,724 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:50:19,724 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-03 00:50:19,724 [ scc.git] DEBUG Calling 'git remote'
2025-03-03 00:50:19,729 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-03 00:50:19,729 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-03 00:50:19,729 [ scc.git] DEBUG Calling 'git remote'
2025-03-03 00:50:19,734 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.10.0 to 5.10.1-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD e44e6d9] 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 308ae06] 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-03 00:51:08,739 [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-03 00:51:18,186 [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-03 00:51:20,693 [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-03 00:51:25,509 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-03 00:52:05,077 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts (hide)
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/3d58bc78/images/svgs/logo.svg){kind=logo}
