Skipping 183 KB..
Full Log2025-02-27 00:48:16,245 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-27 00:48:16,301 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-27 00:48:16,311 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5367580940> has no local changes
2025-02-27 00:48:16,311 [ 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#346 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/)'
2025-02-27 00:48:16,326 [ scc.git] DEBUG [detached HEAD 11bffc6] merge master -Dorg -Ssuccess-only
2025-02-27 00:48:16,326 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:48:16,326 [ scc.repo] DEBUG ## PRs found:
2025-02-27 00:48:16,431 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:16,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-02-27 00:48:16,985 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:17,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/503 HTTP/1.1" 200 None
2025-02-27 00:48:17,481 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:17,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/503/comments HTTP/1.1" 200 None
2025-02-27 00:48:17,955 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:18,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502 HTTP/1.1" 200 None
2025-02-27 00:48:18,444 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:18,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502/comments HTTP/1.1" 200 None
2025-02-27 00:48:18,681 [ scc.repo] DEBUG # ... Include label: dependencies
2025-02-27 00:48:18,933 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:19,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-02-27 00:48:19,534 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:19,832 [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-02-27 00:48:20,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:20,371 [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-02-27 00:48:20,624 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:20,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-02-27 00:48:21,083 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:21,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/45d08b7e29871ecff0386975c975dacd0865bcc4?per_page=1 HTTP/1.1" 200 2
2025-02-27 00:48:21,331 [ scc.repo] DEBUG - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-02-27 00:48:21,583 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:21,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-02-27 00:48:21,843 [ scc.repo] DEBUG # ... Include label: dependencies
2025-02-27 00:48:22,095 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:22,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-02-27 00:48:22,679 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:22,957 [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-02-27 00:48:23,211 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:23,496 [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-02-27 00:48:23,750 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:23,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-02-27 00:48:24,243 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:24,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2025-02-27 00:48:24,431 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-02-27 00:48:24,683 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:24,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-02-27 00:48:25,174 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:25,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-02-27 00:48:25,644 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:25,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-02-27 00:48:26,121 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:26,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-02-27 00:48:26,618 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:26,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-02-27 00:48:27,167 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:27,437 [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-02-27 00:48:27,691 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:27,956 [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-02-27 00:48:28,210 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:28,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-02-27 00:48:28,767 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:28,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2025-02-27 00:48:28,936 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-02-27 00:48:29,189 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:29,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-02-27 00:48:29,660 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:29,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-02-27 00:48:30,205 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:30,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-02-27 00:48:30,745 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:30,977 [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-02-27 00:48:31,233 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:31,485 [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-02-27 00:48:31,740 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:31,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-02-27 00:48:32,205 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:32,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2025-02-27 00:48:32,390 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-02-27 00:48:32,642 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:32,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-02-27 00:48:33,137 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:33,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-02-27 00:48:33,604 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:33,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-02-27 00:48:34,147 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:34,360 [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-02-27 00:48:34,614 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:34,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-02-27 00:48:35,148 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:35,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2025-02-27 00:48:35,321 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-02-27 00:48:35,322 [ scc.repo] DEBUG ## Branches found:
2025-02-27 00:48:35,322 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-02-27 00:48:35,323 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:48:35,323 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:48:35,331 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-27 00:48:35,339 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-27 00:48:35,339 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-27 00:48:35,347 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-27 00:48:35,354 [ scc.git] DEBUG Already up to date.
2025-02-27 00:48:35,355 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-02-27 00:48:37,594 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-27 00:48:37,594 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-02-27 00:48:37,599 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-02-27 00:48:39,365 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-27 00:48:39,365 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-02-27 00:48:39,371 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-02-27 00:48:39,764 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-27 00:48:39,764 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-02-27 00:48:39,770 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-02-27 00:48:40,102 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-27 00:48:40,103 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-02-27 00:48:40,107 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-02-27 00:48:40,397 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-27 00:48:40,397 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-02-27 00:48:40,404 [ scc.git] DEBUG ## Unique users: []
2025-02-27 00:48:40,404 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:48:40,404 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:48:40,410 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-02-27 00:48:40,418 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:48:40,424 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-02-27 00:48:40,634 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-02-27 00:48:40,635 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-02-27 00:48:40,635 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-27 00:48:40,639 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-02-27 00:48:40,639 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-02-27 00:48:40,639 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-02-27 00:48:40,642 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:40,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:48:40,843 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-02-27 00:48:40,854 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:48:40,861 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-02-27 00:48:41,176 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-02-27 00:48:41,176 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-02-27 00:48:41,176 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-02-27 00:48:41,176 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-02-27 00:48:41,177 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-27 00:48:41,181 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-02-27 00:48:41,181 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-02-27 00:48:41,181 [ scc.git] DEBUG src/app/header.html | 5 +
2025-02-27 00:48:41,181 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-02-27 00:48:41,182 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-02-27 00:48:41,182 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-02-27 00:48:41,182 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-02-27 00:48:41,182 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-02-27 00:48:41,184 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:41,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:48:41,380 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-02-27 00:48:41,391 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:48:41,397 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-02-27 00:48:41,617 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-02-27 00:48:41,618 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-27 00:48:41,622 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-02-27 00:48:41,622 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-02-27 00:48:41,622 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-02-27 00:48:41,631 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:41,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:48:41,812 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-02-27 00:48:41,872 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:48:41,879 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-02-27 00:48:41,955 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-27 00:48:41,966 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-02-27 00:48:41,967 [ scc.git] DEBUG package.json | 2 +-
2025-02-27 00:48:41,967 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-02-27 00:48:42,065 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:42,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:48:42,229 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-02-27 00:48:42,246 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:48:42,251 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-02-27 00:48:42,331 [ scc.git] DEBUG Auto-merging package-lock.json
2025-02-27 00:48:42,331 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-02-27 00:48:42,331 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-27 00:48:42,332 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-27 00:48:42,340 [ scc.git] DEBUG Calling 'git reset --hard 10bb8a2eef44267ccd0233ed096292eba7f80928'
2025-02-27 00:48:42,352 [ scc.git] DEBUG HEAD is now at 10bb8a2 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-02-27 00:48:42,481 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:42,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:48:42,640 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-02-27 00:48:42,648 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-02-27 00:48:42,654 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#346](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-02-27 00:48:42,660 [ scc.config] DEBUG Found github.token
2025-02-27 00:48:42,660 [ scc.git] DEBUG Adding comment to issue #502.
2025-02-27 00:48:42,893 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:43,444 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-iviewer/issues/502/comments HTTP/1.1" 201 2017
2025-02-27 00:48:43,445 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-27 00:48:43,485 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:48:43,486 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:48:43,491 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-27 00:48:43,532 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-27 00:48:43,542 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f53644ef520> has no local changes
2025-02-27 00:48:43,542 [ 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#346 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/)'
2025-02-27 00:48:43,552 [ scc.git] DEBUG [detached HEAD d3e6183] merge master -Dorg -Ssuccess-only
2025-02-27 00:48:43,553 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:48:43,553 [ scc.repo] DEBUG ## PRs found:
2025-02-27 00:48:43,697 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:44,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-02-27 00:48:44,255 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:44,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-02-27 00:48:44,744 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:45,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-02-27 00:48:45,298 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:45,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-02-27 00:48:45,843 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:46,058 [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-02-27 00:48:46,311 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:46,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-02-27 00:48:46,830 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:47,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-02-27 00:48:47,018 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-02-27 00:48:47,019 [ scc.repo] DEBUG ## Branches found:
2025-02-27 00:48:47,019 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-02-27 00:48:47,019 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:48:47,019 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:48:47,027 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-27 00:48:47,033 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-27 00:48:47,034 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-27 00:48:47,041 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-27 00:48:47,048 [ scc.git] DEBUG Already up to date.
2025-02-27 00:48:47,048 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-02-27 00:48:47,930 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-02-27 00:48:47,931 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-02-27 00:48:47,936 [ scc.git] DEBUG ## Unique users: []
2025-02-27 00:48:47,937 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:48:47,937 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:48:47,945 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-02-27 00:48:47,955 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:48:47,963 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-02-27 00:48:47,977 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-27 00:48:47,981 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-02-27 00:48:47,981 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-02-27 00:48:47,981 [ scc.git] DEBUG requirements.txt | 2 +-
2025-02-27 00:48:47,981 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-02-27 00:48:47,981 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-02-27 00:48:47,981 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-02-27 00:48:47,984 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:48,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:48:48,154 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-27 00:48:48,202 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:48:48,203 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:48:48,210 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-27 00:48:48,258 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-27 00:48:48,267 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f536757caf0> has no local changes
2025-02-27 00:48:48,267 [ 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#346 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/)'
2025-02-27 00:48:48,277 [ scc.git] DEBUG [detached HEAD 7464010] merge master -Dorg -Ssuccess-only
2025-02-27 00:48:48,277 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:48:48,278 [ scc.repo] DEBUG ## PRs found:
2025-02-27 00:48:48,407 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:48,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-02-27 00:48:48,917 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:49,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-02-27 00:48:49,394 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:49,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-02-27 00:48:49,950 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:50,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-02-27 00:48:50,490 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:50,673 [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-02-27 00:48:50,926 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:51,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-02-27 00:48:51,528 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:51,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-02-27 00:48:51,748 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-02-27 00:48:52,000 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:52,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-02-27 00:48:52,489 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:52,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-02-27 00:48:52,962 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:53,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-02-27 00:48:53,514 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:53,741 [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-02-27 00:48:53,994 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:54,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-02-27 00:48:54,523 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:54,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-02-27 00:48:54,697 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-02-27 00:48:54,697 [ scc.repo] DEBUG ## Branches found:
2025-02-27 00:48:54,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-02-27 00:48:54,698 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:48:54,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:48:54,705 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-27 00:48:54,713 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-27 00:48:54,713 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-27 00:48:54,722 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-27 00:48:54,728 [ scc.git] DEBUG Already up to date.
2025-02-27 00:48:54,729 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-02-27 00:48:55,482 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-02-27 00:48:55,482 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-02-27 00:48:55,487 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-02-27 00:48:55,984 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-02-27 00:48:55,984 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-02-27 00:48:55,989 [ scc.git] DEBUG ## Unique users: []
2025-02-27 00:48:55,989 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:48:55,990 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:48:55,996 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-02-27 00:48:56,007 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:48:56,015 [ 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-02-27 00:48:56,215 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-02-27 00:48:56,215 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-02-27 00:48:56,215 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-02-27 00:48:56,215 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-02-27 00:48:56,215 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-27 00:48:56,216 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-27 00:48:56,222 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-27 00:48:56,230 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-02-27 00:48:56,233 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:56,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:48:56,396 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-02-27 00:48:56,405 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-27 00:48:56,562 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#346](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-02-27 00:48:56,570 [ scc.config] DEBUG Found github.token
2025-02-27 00:48:56,571 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-02-27 00:48:56,571 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-02-27 00:48:56,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:48:56,589 [ 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-02-27 00:48:56,626 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-02-27 00:48:56,626 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-02-27 00:48:56,626 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-02-27 00:48:56,626 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-27 00:48:56,627 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-27 00:48:56,635 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-27 00:48:56,645 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-02-27 00:48:56,648 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:56,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:48:56,831 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-02-27 00:48:56,841 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-27 00:48:56,851 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#346](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/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-02-27 00:48:56,858 [ scc.config] DEBUG Found github.token
2025-02-27 00:48:56,859 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-02-27 00:48:56,859 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-27 00:48:56,906 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:48:56,907 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:48:56,915 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-27 00:48:56,962 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-27 00:48:56,971 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5366527a90> has no local changes
2025-02-27 00:48:56,971 [ 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#346 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/)'
2025-02-27 00:48:56,983 [ scc.git] DEBUG [detached HEAD bddf926] merge master -Dorg -Ssuccess-only
2025-02-27 00:48:56,984 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:48:56,984 [ scc.repo] DEBUG ## PRs found:
2025-02-27 00:48:57,082 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:57,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-02-27 00:48:57,624 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:57,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-02-27 00:48:57,886 [ scc.repo] DEBUG # ... Include label: dependencies
2025-02-27 00:48:58,137 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:58,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-02-27 00:48:58,718 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:59,012 [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-02-27 00:48:59,265 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:59,515 [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-02-27 00:48:59,768 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:48:59,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-02-27 00:49:00,232 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:00,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-02-27 00:49:00,427 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-02-27 00:49:00,679 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:00,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-02-27 00:49:01,163 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:01,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-02-27 00:49:01,670 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:01,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-02-27 00:49:02,162 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:02,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-02-27 00:49:02,644 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:02,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-02-27 00:49:03,146 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:03,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-02-27 00:49:03,636 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:03,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-02-27 00:49:03,935 [ scc.repo] DEBUG ## Branches found:
2025-02-27 00:49:03,935 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-02-27 00:49:03,935 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:03,935 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:03,941 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-27 00:49:03,946 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-27 00:49:03,946 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-27 00:49:03,951 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-27 00:49:03,957 [ scc.git] DEBUG Already up to date.
2025-02-27 00:49:03,958 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-02-27 00:49:04,316 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-02-27 00:49:04,317 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-02-27 00:49:04,322 [ scc.git] DEBUG ## Unique users: []
2025-02-27 00:49:04,322 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:04,323 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:04,330 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-02-27 00:49:04,337 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:04,344 [ 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-02-27 00:49:04,458 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-27 00:49:04,461 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-02-27 00:49:04,461 [ scc.git] DEBUG package.json | 2 +-
2025-02-27 00:49:04,461 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-02-27 00:49:04,464 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:04,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:04,625 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-27 00:49:04,674 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:04,674 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:04,681 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-27 00:49:04,722 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-27 00:49:04,730 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5366547880> has no local changes
2025-02-27 00:49:04,731 [ 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#346 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/)'
2025-02-27 00:49:04,741 [ scc.git] DEBUG [detached HEAD 51b9308] merge master -Dorg -Ssuccess-only
2025-02-27 00:49:04,741 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:04,742 [ scc.repo] DEBUG ## PRs found:
2025-02-27 00:49:04,881 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:05,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-02-27 00:49:05,080 [ scc.repo] DEBUG ## Branches found:
2025-02-27 00:49:05,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-02-27 00:49:05,080 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:05,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:05,089 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-27 00:49:05,094 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-27 00:49:05,094 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-27 00:49:05,100 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-27 00:49:05,105 [ scc.git] DEBUG Already up to date.
2025-02-27 00:49:05,105 [ scc.git] DEBUG ## Unique users: []
2025-02-27 00:49:05,106 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:05,106 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:05,111 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-27 00:49:05,153 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:05,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:05,158 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-27 00:49:05,197 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-27 00:49:05,204 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5366533220> has no local changes
2025-02-27 00:49:05,204 [ 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#346 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/)'
2025-02-27 00:49:05,213 [ scc.git] DEBUG [detached HEAD 1484d6e] merge master -Dorg -Ssuccess-only
2025-02-27 00:49:05,214 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:05,214 [ scc.repo] DEBUG ## PRs found:
2025-02-27 00:49:05,332 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:05,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-02-27 00:49:05,839 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:06,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-02-27 00:49:06,057 [ scc.repo] DEBUG ## Branches found:
2025-02-27 00:49:06,057 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-02-27 00:49:06,057 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:06,057 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:06,065 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-27 00:49:06,070 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-27 00:49:06,070 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-27 00:49:06,076 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-27 00:49:06,082 [ scc.git] DEBUG Already up to date.
2025-02-27 00:49:06,083 [ scc.git] DEBUG ## Unique users: []
2025-02-27 00:49:06,083 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:06,083 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:06,088 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-27 00:49:06,130 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:06,131 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:06,137 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-27 00:49:06,179 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-27 00:49:06,186 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5366527fa0> has no local changes
2025-02-27 00:49:06,187 [ 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#346 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/)'
2025-02-27 00:49:06,196 [ scc.git] DEBUG [detached HEAD 948a3bb] merge master -Dorg -Ssuccess-only
2025-02-27 00:49:06,196 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:06,197 [ scc.repo] DEBUG ## PRs found:
2025-02-27 00:49:06,309 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:06,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-02-27 00:49:06,816 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:07,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-02-27 00:49:07,301 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:07,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-02-27 00:49:07,793 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:08,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-02-27 00:49:08,346 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:08,585 [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-02-27 00:49:08,840 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:09,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-02-27 00:49:09,430 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:09,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-02-27 00:49:09,623 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-02-27 00:49:09,623 [ scc.repo] DEBUG ## Branches found:
2025-02-27 00:49:09,623 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-02-27 00:49:09,623 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:09,623 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:09,631 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-27 00:49:09,636 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-27 00:49:09,636 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-27 00:49:09,643 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-27 00:49:09,648 [ scc.git] DEBUG Already up to date.
2025-02-27 00:49:09,648 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-02-27 00:49:10,016 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-02-27 00:49:10,016 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-02-27 00:49:10,022 [ scc.git] DEBUG ## Unique users: []
2025-02-27 00:49:10,022 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:10,022 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:10,030 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-02-27 00:49:10,038 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:10,045 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-02-27 00:49:10,208 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-02-27 00:49:10,209 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-02-27 00:49:10,209 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-02-27 00:49:10,209 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-02-27 00:49:10,209 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-02-27 00:49:10,209 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-02-27 00:49:10,209 [ scc.git] DEBUG Auto-merging setup.py
2025-02-27 00:49:10,209 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-02-27 00:49:10,209 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-27 00:49:10,210 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-27 00:49:10,216 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-02-27 00:49:10,225 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-02-27 00:49:10,228 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:10,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:10,399 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-02-27 00:49:10,407 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-02-27 00:49:10,473 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#346](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- setup.py
- omero_signup/views.py
- omero_signup/urls.py
--conflicts
2025-02-27 00:49:10,480 [ scc.config] DEBUG Found github.token
2025-02-27 00:49:10,480 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-02-27 00:49:10,480 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-27 00:49:10,523 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:10,523 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:10,531 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-27 00:49:10,580 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-27 00:49:10,588 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f53644d9fd0> has no local changes
2025-02-27 00:49:10,588 [ 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#346 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/)'
2025-02-27 00:49:10,599 [ scc.git] DEBUG [detached HEAD 0e30904] merge master -Dorg -Ssuccess-only
2025-02-27 00:49:10,599 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:10,600 [ scc.repo] DEBUG ## PRs found:
2025-02-27 00:49:10,651 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:10,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-02-27 00:49:11,206 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:11,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-02-27 00:49:11,707 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:11,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-02-27 00:49:12,232 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:12,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-02-27 00:49:12,761 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:13,014 [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-02-27 00:49:13,269 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:13,492 [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-02-27 00:49:13,746 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:13,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-02-27 00:49:14,251 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:14,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-02-27 00:49:14,735 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:14,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-02-27 00:49:15,217 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:15,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-02-27 00:49:15,694 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:16,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-02-27 00:49:16,268 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:16,475 [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-02-27 00:49:16,729 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:17,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-02-27 00:49:17,264 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:17,449 [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-02-27 00:49:17,450 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-02-27 00:49:17,450 [ scc.repo] DEBUG ## Branches found:
2025-02-27 00:49:17,450 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-02-27 00:49:17,450 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:17,451 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:17,458 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-27 00:49:17,464 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-27 00:49:17,464 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-27 00:49:17,470 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-27 00:49:17,476 [ scc.git] DEBUG Already up to date.
2025-02-27 00:49:17,476 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-02-27 00:49:17,948 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-02-27 00:49:17,948 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-02-27 00:49:17,953 [ scc.git] DEBUG ## Unique users: []
2025-02-27 00:49:17,954 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:17,954 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:17,960 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-02-27 00:49:17,968 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:17,974 [ 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-02-27 00:49:18,038 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-27 00:49:18,041 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-02-27 00:49:18,042 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-02-27 00:49:18,042 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-02-27 00:49:18,042 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-02-27 00:49:18,042 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-02-27 00:49:18,042 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-02-27 00:49:18,042 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-02-27 00:49:18,043 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-02-27 00:49:18,043 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-02-27 00:49:18,043 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-02-27 00:49:18,045 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:18,045 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-02-27 00:49:18,045 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-02-27 00:49:18,045 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-02-27 00:49:18,045 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-02-27 00:49:18,045 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-02-27 00:49:18,045 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-02-27 00:49:18,045 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-02-27 00:49:18,045 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-02-27 00:49:18,045 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-02-27 00:49:18,045 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-02-27 00:49:18,045 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-02-27 00:49:18,045 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-02-27 00:49:18,045 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-02-27 00:49:18,045 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-02-27 00:49:18,045 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-02-27 00:49:18,045 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-02-27 00:49:18,045 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-02-27 00:49:18,045 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-02-27 00:49:18,046 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-02-27 00:49:18,046 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-02-27 00:49:18,046 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-02-27 00:49:18,046 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-02-27 00:49:18,046 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-02-27 00:49:18,046 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-02-27 00:49:18,046 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-02-27 00:49:18,046 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-02-27 00:49:18,046 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-02-27 00:49:18,046 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-02-27 00:49:18,046 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-02-27 00:49:18,046 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-02-27 00:49:18,046 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-02-27 00:49:18,046 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-02-27 00:49:18,046 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-02-27 00:49:18,046 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-02-27 00:49:18,046 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-02-27 00:49:18,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:18,217 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-27 00:49:18,260 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:18,260 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:18,267 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-27 00:49:18,318 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-27 00:49:18,327 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5366527d90> has no local changes
2025-02-27 00:49:18,328 [ 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#346 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/)'
2025-02-27 00:49:18,338 [ scc.git] DEBUG [detached HEAD 350324f] merge master -Dorg -Ssuccess-only
2025-02-27 00:49:18,338 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:18,339 [ scc.repo] DEBUG ## PRs found:
2025-02-27 00:49:18,469 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:18,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-02-27 00:49:18,654 [ scc.repo] DEBUG ## Branches found:
2025-02-27 00:49:18,654 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-02-27 00:49:18,654 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:18,654 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:18,661 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-27 00:49:18,667 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-27 00:49:18,667 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-27 00:49:18,673 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-27 00:49:18,678 [ scc.git] DEBUG Already up to date.
2025-02-27 00:49:18,679 [ scc.git] DEBUG ## Unique users: []
2025-02-27 00:49:18,679 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:18,679 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:18,685 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-27 00:49:18,728 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:18,729 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:18,735 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-27 00:49:18,780 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-27 00:49:18,788 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5364488250> has no local changes
2025-02-27 00:49:18,788 [ 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#346 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/)'
2025-02-27 00:49:18,798 [ scc.git] DEBUG [detached HEAD 7dfc54c] merge master -Dorg -Ssuccess-only
2025-02-27 00:49:18,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:18,799 [ scc.repo] DEBUG ## PRs found:
2025-02-27 00:49:18,906 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:19,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-02-27 00:49:19,422 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:19,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-02-27 00:49:19,916 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:20,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-02-27 00:49:20,381 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:20,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-02-27 00:49:20,941 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:21,218 [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-02-27 00:49:21,471 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:21,693 [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-02-27 00:49:21,947 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:22,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-02-27 00:49:22,481 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:22,656 [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-02-27 00:49:22,657 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-02-27 00:49:22,657 [ scc.repo] DEBUG ## Branches found:
2025-02-27 00:49:22,657 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-02-27 00:49:22,657 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:22,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:22,664 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-27 00:49:22,670 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-27 00:49:22,670 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-27 00:49:22,676 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-27 00:49:22,683 [ scc.git] DEBUG Already up to date.
2025-02-27 00:49:22,683 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-02-27 00:49:23,316 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-02-27 00:49:23,316 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-02-27 00:49:23,321 [ scc.git] DEBUG ## Unique users: []
2025-02-27 00:49:23,321 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:23,321 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:23,328 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-02-27 00:49:23,334 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:23,339 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-02-27 00:49:23,388 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-27 00:49:23,391 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-02-27 00:49:23,391 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-02-27 00:49:23,391 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-02-27 00:49:23,391 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-02-27 00:49:23,391 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-02-27 00:49:23,394 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:23,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:23,553 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-27 00:49:23,600 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:23,600 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:23,607 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-27 00:49:23,649 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-27 00:49:23,656 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5366527d60> has no local changes
2025-02-27 00:49:23,656 [ 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#346 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/)'
2025-02-27 00:49:23,665 [ scc.git] DEBUG [detached HEAD 71acfea] merge master -Dorg -Ssuccess-only
2025-02-27 00:49:23,665 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:23,665 [ scc.git] INFO Overriding base-branch from master to main
2025-02-27 00:49:23,665 [ scc.repo] DEBUG ## PRs found:
2025-02-27 00:49:23,805 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:24,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-02-27 00:49:24,318 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:24,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-02-27 00:49:24,795 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:25,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-02-27 00:49:25,303 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:25,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-02-27 00:49:25,856 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:26,115 [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-02-27 00:49:26,369 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:26,587 [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-02-27 00:49:26,840 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:27,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-02-27 00:49:27,325 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:27,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-02-27 00:49:27,806 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:28,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-02-27 00:49:28,314 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:28,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-02-27 00:49:28,847 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:29,049 [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-02-27 00:49:29,302 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:29,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-02-27 00:49:29,765 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:29,941 [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-02-27 00:49:29,942 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-02-27 00:49:29,943 [ scc.repo] DEBUG ## Branches found:
2025-02-27 00:49:29,943 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-02-27 00:49:29,943 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:29,943 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:29,951 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-02-27 00:49:29,957 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-27 00:49:29,957 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-02-27 00:49:29,963 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-02-27 00:49:29,970 [ scc.git] DEBUG Already up to date.
2025-02-27 00:49:29,970 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-02-27 00:49:30,343 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-02-27 00:49:30,343 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-02-27 00:49:30,349 [ scc.git] DEBUG ## Unique users: []
2025-02-27 00:49:30,349 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:30,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:30,355 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-02-27 00:49:30,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:30,366 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-02-27 00:49:30,451 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-02-27 00:49:30,451 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-02-27 00:49:30,451 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-27 00:49:30,451 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-27 00:49:30,461 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-02-27 00:49:30,468 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-02-27 00:49:30,471 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:30,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:30,641 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-02-27 00:49:30,649 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-02-27 00:49:30,663 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#346](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-02-27 00:49:30,668 [ scc.config] DEBUG Found github.token
2025-02-27 00:49:30,669 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-02-27 00:49:30,669 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-27 00:49:30,707 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:30,708 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:30,713 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-27 00:49:30,754 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-27 00:49:30,762 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f53644b6700> has no local changes
2025-02-27 00:49:30,763 [ 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#346 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/)'
2025-02-27 00:49:30,772 [ scc.git] DEBUG [detached HEAD 61c5bf1] merge master -Dorg -Ssuccess-only
2025-02-27 00:49:30,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:30,773 [ scc.repo] DEBUG ## PRs found:
2025-02-27 00:49:30,894 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:31,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-02-27 00:49:31,093 [ scc.repo] DEBUG ## Branches found:
2025-02-27 00:49:31,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-02-27 00:49:31,094 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:31,094 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:31,101 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-27 00:49:31,106 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-27 00:49:31,106 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-27 00:49:31,112 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-27 00:49:31,118 [ scc.git] DEBUG Already up to date.
2025-02-27 00:49:31,118 [ scc.git] DEBUG ## Unique users: []
2025-02-27 00:49:31,118 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:31,118 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:31,124 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-27 00:49:31,165 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:31,165 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:31,172 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-27 00:49:31,213 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-27 00:49:31,220 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f53643d35b0> has no local changes
2025-02-27 00:49:31,220 [ 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#346 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/)'
2025-02-27 00:49:31,230 [ scc.git] DEBUG [detached HEAD 38106f5] merge master -Dorg -Ssuccess-only
2025-02-27 00:49:31,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:31,230 [ scc.repo] DEBUG ## PRs found:
2025-02-27 00:49:31,346 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:31,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-02-27 00:49:31,545 [ scc.repo] DEBUG ## Branches found:
2025-02-27 00:49:31,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-02-27 00:49:31,545 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:31,545 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:31,552 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-27 00:49:31,558 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-27 00:49:31,558 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-27 00:49:31,563 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-27 00:49:31,569 [ scc.git] DEBUG Already up to date.
2025-02-27 00:49:31,569 [ scc.git] DEBUG ## Unique users: []
2025-02-27 00:49:31,570 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:31,570 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:31,574 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-27 00:49:31,617 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:31,617 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:31,623 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-27 00:49:31,666 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-27 00:49:31,675 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f53644a3520> has no local changes
2025-02-27 00:49:31,675 [ 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#346 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/)'
2025-02-27 00:49:31,687 [ scc.git] DEBUG [detached HEAD 6ed1c7f] merge master -Dorg -Ssuccess-only
2025-02-27 00:49:31,687 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:31,688 [ scc.repo] DEBUG ## PRs found:
2025-02-27 00:49:31,797 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:32,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-02-27 00:49:32,324 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:32,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-02-27 00:49:32,817 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:33,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-02-27 00:49:33,282 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:33,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-02-27 00:49:33,896 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:34,142 [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-02-27 00:49:34,395 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:34,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-02-27 00:49:34,990 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:35,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-02-27 00:49:35,192 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-02-27 00:49:35,192 [ scc.repo] DEBUG ## Branches found:
2025-02-27 00:49:35,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-02-27 00:49:35,192 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:35,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:35,199 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-27 00:49:35,204 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-27 00:49:35,205 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-27 00:49:35,210 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-27 00:49:35,218 [ scc.git] DEBUG Already up to date.
2025-02-27 00:49:35,218 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-02-27 00:49:35,642 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-02-27 00:49:35,642 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-02-27 00:49:35,648 [ scc.git] DEBUG ## Unique users: []
2025-02-27 00:49:35,648 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:35,648 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:35,655 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-02-27 00:49:35,662 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:35,668 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-02-27 00:49:35,777 [ scc.git] DEBUG Auto-merging Dockerfile
2025-02-27 00:49:35,778 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-02-27 00:49:35,778 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-27 00:49:35,778 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-27 00:49:35,786 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-02-27 00:49:35,794 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-02-27 00:49:35,797 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:35,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:35,963 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-02-27 00:49:35,972 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-02-27 00:49:35,978 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#346](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-02-27 00:49:35,984 [ scc.config] DEBUG Found github.token
2025-02-27 00:49:35,984 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-02-27 00:49:35,985 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-27 00:49:36,027 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:36,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:36,034 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-27 00:49:36,080 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-27 00:49:36,088 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f53643d3610> has no local changes
2025-02-27 00:49:36,089 [ 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#346 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/)'
2025-02-27 00:49:36,099 [ scc.git] DEBUG [detached HEAD fae745d] merge master -Dorg -Ssuccess-only
2025-02-27 00:49:36,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:36,100 [ scc.git] INFO Overriding base-branch from master to develop
2025-02-27 00:49:36,100 [ scc.repo] DEBUG ## PRs found:
2025-02-27 00:49:36,216 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:36,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-02-27 00:49:36,832 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:37,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-02-27 00:49:37,351 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:37,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-02-27 00:49:37,840 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:38,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-02-27 00:49:38,296 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:38,568 [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-02-27 00:49:38,822 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:39,034 [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-02-27 00:49:39,287 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:39,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-02-27 00:49:39,742 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:39,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-02-27 00:49:39,907 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-02-27 00:49:40,159 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:40,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-02-27 00:49:40,659 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:40,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-02-27 00:49:41,128 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:41,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-02-27 00:49:41,669 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:41,864 [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-02-27 00:49:42,117 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:42,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-02-27 00:49:42,561 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:42,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-02-27 00:49:42,741 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-02-27 00:49:42,994 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:43,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-02-27 00:49:43,475 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:43,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-02-27 00:49:43,999 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:44,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-02-27 00:49:44,507 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:44,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-02-27 00:49:44,750 [ scc.repo] DEBUG ## Branches found:
2025-02-27 00:49:44,750 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-02-27 00:49:44,750 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:44,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:44,758 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-02-27 00:49:44,764 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-27 00:49:44,764 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-02-27 00:49:44,770 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-02-27 00:49:44,777 [ scc.git] DEBUG Already up to date.
2025-02-27 00:49:44,777 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-02-27 00:49:45,605 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-02-27 00:49:45,605 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-02-27 00:49:45,610 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-02-27 00:49:46,137 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-02-27 00:49:46,137 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-02-27 00:49:46,143 [ scc.git] DEBUG ## Unique users: []
2025-02-27 00:49:46,143 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:46,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:46,152 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-02-27 00:49:46,163 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:46,172 [ 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-02-27 00:49:46,263 [ 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-02-27 00:49:46,264 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-27 00:49:46,264 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-27 00:49:46,273 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-02-27 00:49:46,280 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-02-27 00:49:46,283 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:46,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:46,484 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-02-27 00:49:46,498 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-02-27 00:49:46,506 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#346](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-02-27 00:49:46,514 [ scc.config] DEBUG Found github.token
2025-02-27 00:49:46,514 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-02-27 00:49:46,515 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-02-27 00:49:46,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:46,531 [ 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-02-27 00:49:46,558 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-27 00:49:46,561 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-02-27 00:49:46,561 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-02-27 00:49:46,735 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:46,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:46,916 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-27 00:49:46,963 [ scc.git] DEBUG Get sha1 of %s
2025-02-27 00:49:46,964 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-27 00:49:46,970 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-27 00:49:47,014 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-27 00:49:47,023 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5364438580> has no local changes
2025-02-27 00:49:47,023 [ 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#346 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/)'
2025-02-27 00:49:47,035 [ scc.git] DEBUG [detached HEAD f544259] merge master -Dorg -Ssuccess-only
2025-02-27 00:49:47,035 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:47,035 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-27 00:49:47,120 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-02-27 00:49:47,169 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:47,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:47,348 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-02-27 00:49:47,355 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-02-27 00:49:47,589 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:47,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:47,773 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-02-27 00:49:47,779 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-02-27 00:49:48,009 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:48,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:48,187 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-02-27 00:49:48,194 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-02-27 00:49:48,426 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:48,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:48,612 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-02-27 00:49:48,843 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:49,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:49,025 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-02-27 00:49:49,030 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-02-27 00:49:49,264 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:49,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:49,453 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-02-27 00:49:49,459 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-02-27 00:49:49,688 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:49,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:49,874 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-02-27 00:49:49,879 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-02-27 00:49:50,111 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:50,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:50,293 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-02-27 00:49:50,301 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-02-27 00:49:50,525 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:50,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:50,710 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-02-27 00:49:50,715 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-02-27 00:49:50,947 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:51,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:51,130 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-02-27 00:49:51,136 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-02-27 00:49:51,368 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:51,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:51,550 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-02-27 00:49:51,555 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-02-27 00:49:51,788 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:51,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:51,973 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-02-27 00:49:51,982 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-02-27 00:49:52,207 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:52,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:52,392 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-02-27 00:49:52,625 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:52,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:52,815 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-02-27 00:49:53,047 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:53,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:53,222 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-02-27 00:49:53,229 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-02-27 00:49:53,459 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:53,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:53,637 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-02-27 00:49:53,871 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:54,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:54,057 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-02-27 00:49:54,290 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:54,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:54,478 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-02-27 00:49:54,483 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-02-27 00:49:54,717 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:54,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:54,937 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-02-27 00:49:54,943 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-02-27 00:49:55,175 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:55,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:55,368 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-02-27 00:49:55,373 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-02-27 00:49:55,605 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:55,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:55,779 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-02-27 00:49:55,783 [ scc.config] DEBUG Found submodule.scripts.url
2025-02-27 00:49:56,020 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-27 00:49:56,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-27 00:49:56,223 [ scc.config] DEBUG Found submodule.scripts.branch
2025-02-27 00:49:56,224 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-27 00:49:56,302 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5368905ca0> has local changes
2025-02-27 00:49:56,302 [ 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#346 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/346/)'
2025-02-27 00:49:56,317 [ scc.git] DEBUG [detached HEAD 5cba506] merge master -Dorg -Ssuccess-only
2025-02-27 00:49:56,317 [ scc.merge] INFO Repository: ome/omero-plugins
2025-02-27 00:49:56,317 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-02-27 00:49:56,317 [ scc.merge] INFO Already up to date.
2025-02-27 00:49:56,317 [ scc.merge] INFO
2025-02-27 00:49:56,318 [ scc.merge] INFO Merged PRs:
2025-02-27 00:49:56,318 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-02-27 00:49:56,318 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-02-27 00:49:56,318 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-02-27 00:49:56,318 [ scc.merge] INFO
2025-02-27 00:49:56,318 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-02-27 00:49:56,318 [ scc.merge] INFO Already up to date.
2025-02-27 00:49:56,318 [ scc.merge] INFO
2025-02-27 00:49:56,318 [ scc.merge] INFO
2025-02-27 00:49:56,318 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-02-27 00:49:56,318 [ scc.merge] INFO Excluded PRs:
2025-02-27 00:49:56,318 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-02-27 00:49:56,318 [ scc.merge] INFO Already up to date.
2025-02-27 00:49:56,318 [ scc.merge] INFO
2025-02-27 00:49:56,318 [ scc.merge] INFO
2025-02-27 00:49:56,318 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-02-27 00:49:56,318 [ scc.merge] INFO Excluded PRs:
2025-02-27 00:49:56,318 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-02-27 00:49:56,318 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-02-27 00:49:56,318 [ scc.merge] INFO Already up to date.
2025-02-27 00:49:56,318 [ scc.merge] INFO
2025-02-27 00:49:56,318 [ scc.merge] INFO Merged PRs:
2025-02-27 00:49:56,318 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-02-27 00:49:56,318 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-02-27 00:49:56,318 [ scc.merge] INFO
2025-02-27 00:49:56,318 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-02-27 00:49:56,318 [ scc.merge] INFO Excluded PRs:
2025-02-27 00:49:56,318 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-02-27 00:49:56,318 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-02-27 00:49:56,318 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-02-27 00:49:56,318 [ scc.merge] INFO Already up to date.
2025-02-27 00:49:56,318 [ scc.merge] INFO
2025-02-27 00:49:56,318 [ scc.merge] INFO Merged PRs:
2025-02-27 00:49:56,318 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-02-27 00:49:56,318 [ scc.merge] INFO
2025-02-27 00:49:56,318 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-27 00:49:56,318 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-02-27 00:49:56,319 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-02-27 00:49:56,319 [ scc.merge] INFO
2025-02-27 00:49:56,319 [ scc.merge] INFO Repository: ome/omero-figure
2025-02-27 00:49:56,319 [ scc.merge] INFO Excluded PRs:
2025-02-27 00:49:56,319 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-02-27 00:49:56,319 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (stage: draft)
2025-02-27 00:49:56,319 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-02-27 00:49:56,319 [ scc.merge] INFO Already up to date.
2025-02-27 00:49:56,319 [ scc.merge] INFO
2025-02-27 00:49:56,319 [ scc.merge] INFO Merged PRs:
2025-02-27 00:49:56,319 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-02-27 00:49:56,319 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-02-27 00:49:56,319 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-02-27 00:49:56,319 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-02-27 00:49:56,319 [ scc.merge] INFO
2025-02-27 00:49:56,319 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-27 00:49:56,319 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-02-27 00:49:56,319 [ scc.merge] INFO
2025-02-27 00:49:56,319 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-02-27 00:49:56,319 [ scc.merge] INFO Already up to date.
2025-02-27 00:49:56,319 [ scc.merge] INFO
2025-02-27 00:49:56,319 [ scc.merge] INFO Merged PRs:
2025-02-27 00:49:56,319 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-02-27 00:49:56,319 [ scc.merge] INFO
2025-02-27 00:49:56,319 [ scc.merge] INFO Repository: ome/omero-gallery
2025-02-27 00:49:56,319 [ scc.merge] INFO Already up to date.
2025-02-27 00:49:56,319 [ scc.merge] INFO
2025-02-27 00:49:56,319 [ scc.merge] INFO Merged PRs:
2025-02-27 00:49:56,319 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-02-27 00:49:56,319 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-02-27 00:49:56,319 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-02-27 00:49:56,319 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-02-27 00:49:56,319 [ scc.merge] INFO
2025-02-27 00:49:56,319 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-27 00:49:56,319 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-02-27 00:49:56,319 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-02-27 00:49:56,319 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-02-27 00:49:56,319 [ scc.merge] INFO
2025-02-27 00:49:56,320 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-02-27 00:49:56,320 [ scc.merge] INFO Excluded PRs:
2025-02-27 00:49:56,320 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-02-27 00:49:56,320 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-02-27 00:49:56,320 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-02-27 00:49:56,320 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-02-27 00:49:56,320 [ scc.merge] INFO Already up to date.
2025-02-27 00:49:56,320 [ scc.merge] INFO
2025-02-27 00:49:56,320 [ scc.merge] INFO Merged PRs:
2025-02-27 00:49:56,320 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-02-27 00:49:56,320 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-02-27 00:49:56,320 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-02-27 00:49:56,320 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-02-27 00:49:56,320 [ scc.merge] INFO
2025-02-27 00:49:56,320 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-27 00:49:56,320 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-02-27 00:49:56,320 [ scc.merge] INFO
2025-02-27 00:49:56,320 [ scc.merge] INFO Repository: ome/omero-mapr
2025-02-27 00:49:56,320 [ scc.merge] INFO Excluded PRs:
2025-02-27 00:49:56,320 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-02-27 00:49:56,320 [ scc.merge] INFO Already up to date.
2025-02-27 00:49:56,320 [ scc.merge] INFO
2025-02-27 00:49:56,320 [ scc.merge] INFO Merged PRs:
2025-02-27 00:49:56,320 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-02-27 00:49:56,320 [ scc.merge] INFO
2025-02-27 00:49:56,320 [ scc.merge] INFO Repository: ome/omero-metadata
2025-02-27 00:49:56,320 [ scc.merge] INFO Already up to date.
2025-02-27 00:49:56,320 [ scc.merge] INFO
2025-02-27 00:49:56,320 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-27 00:49:56,320 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-02-27 00:49:56,320 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-02-27 00:49:56,320 [ scc.merge] INFO
2025-02-27 00:49:56,321 [ scc.merge] INFO Repository: ome/omero-parade
2025-02-27 00:49:56,321 [ scc.merge] INFO Excluded PRs:
2025-02-27 00:49:56,321 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-02-27 00:49:56,321 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-02-27 00:49:56,321 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-02-27 00:49:56,321 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-02-27 00:49:56,321 [ scc.merge] INFO Already up to date.
2025-02-27 00:49:56,321 [ scc.merge] INFO
2025-02-27 00:49:56,321 [ scc.merge] INFO Merged PRs:
2025-02-27 00:49:56,321 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-02-27 00:49:56,321 [ scc.merge] INFO
2025-02-27 00:49:56,321 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-02-27 00:49:56,321 [ scc.merge] INFO Already up to date.
2025-02-27 00:49:56,321 [ scc.merge] INFO
2025-02-27 00:49:56,321 [ scc.merge] INFO
2025-02-27 00:49:56,321 [ scc.merge] INFO Repository: ome/omero-rois
2025-02-27 00:49:56,321 [ scc.merge] INFO Excluded PRs:
2025-02-27 00:49:56,321 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-02-27 00:49:56,321 [ scc.merge] INFO Already up to date.
2025-02-27 00:49:56,321 [ scc.merge] INFO
2025-02-27 00:49:56,321 [ scc.merge] INFO
2025-02-27 00:49:56,321 [ scc.merge] INFO Repository: ome/omero-signup
2025-02-27 00:49:56,321 [ scc.merge] INFO Already up to date.
2025-02-27 00:49:56,321 [ scc.merge] INFO
2025-02-27 00:49:56,321 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-27 00:49:56,321 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-02-27 00:49:56,321 [ scc.merge] INFO
2025-02-27 00:49:56,321 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-02-27 00:49:56,321 [ scc.merge] INFO Excluded PRs:
2025-02-27 00:49:56,321 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-02-27 00:49:56,321 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-02-27 00:49:56,321 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-02-27 00:49:56,321 [ scc.merge] INFO Already up to date.
2025-02-27 00:49:56,321 [ scc.merge] INFO
2025-02-27 00:49:56,322 [ scc.merge] INFO Merged PRs:
2025-02-27 00:49:56,322 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-02-27 00:49:56,322 [ scc.merge] INFO
2025-02-27 00:49:56,322 [ scc.merge] INFO Repository: ome/omero-upload
2025-02-27 00:49:56,322 [ scc.merge] INFO Already up to date.
2025-02-27 00:49:56,322 [ scc.merge] INFO
2025-02-27 00:49:56,322 [ scc.merge] INFO
2025-02-27 00:49:56,322 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-02-27 00:49:56,322 [ scc.merge] INFO Already up to date.
2025-02-27 00:49:56,322 [ scc.merge] INFO
2025-02-27 00:49:56,322 [ scc.merge] INFO Merged PRs:
2025-02-27 00:49:56,322 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-02-27 00:49:56,322 [ scc.merge] INFO
2025-02-27 00:49:56,322 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-02-27 00:49:56,322 [ scc.merge] INFO Excluded PRs:
2025-02-27 00:49:56,322 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-02-27 00:49:56,322 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-02-27 00:49:56,322 [ scc.merge] INFO Already up to date.
2025-02-27 00:49:56,322 [ scc.merge] INFO
2025-02-27 00:49:56,322 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-27 00:49:56,322 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-02-27 00:49:56,322 [ scc.merge] INFO
2025-02-27 00:49:56,322 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-02-27 00:49:56,322 [ scc.merge] INFO Already up to date.
2025-02-27 00:49:56,322 [ scc.merge] INFO
2025-02-27 00:49:56,322 [ scc.merge] INFO
2025-02-27 00:49:56,322 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-02-27 00:49:56,322 [ scc.merge] INFO Already up to date.
2025-02-27 00:49:56,322 [ scc.merge] INFO
2025-02-27 00:49:56,322 [ scc.merge] INFO
2025-02-27 00:49:56,322 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-02-27 00:49:56,323 [ scc.merge] INFO Already up to date.
2025-02-27 00:49:56,323 [ scc.merge] INFO
2025-02-27 00:49:56,323 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-27 00:49:56,323 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-02-27 00:49:56,323 [ scc.merge] INFO
2025-02-27 00:49:56,323 [ scc.merge] INFO Repository: ome/scripts
2025-02-27 00:49:56,323 [ scc.merge] INFO Excluded PRs:
2025-02-27 00:49:56,323 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-02-27 00:49:56,323 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-02-27 00:49:56,323 [ scc.merge] INFO Already up to date.
2025-02-27 00:49:56,323 [ scc.merge] INFO
2025-02-27 00:49:56,323 [ scc.merge] INFO Merged PRs:
2025-02-27 00:49:56,323 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-02-27 00:49:56,323 [ scc.merge] INFO
2025-02-27 00:49:56,323 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-27 00:49:56,323 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-02-27 00:49:56,323 [ scc.merge] INFO
2025-02-27 00:49:56,323 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-02-27 00:49:56,323 [ scc.git] DEBUG Calling 'git remote'
2025-02-27 00:49:56,329 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-02-27 00:49:56,329 [ scc.git] DEBUG Calling 'git remote'
2025-02-27 00:49:56,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:56,335 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-02-27 00:49:56,335 [ scc.git] DEBUG Calling 'git remote'
2025-02-27 00:49:56,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:56,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-02-27 00:49:56,340 [ scc.git] DEBUG Calling 'git remote'
2025-02-27 00:49:56,345 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:56,345 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-02-27 00:49:56,345 [ scc.git] DEBUG Calling 'git remote'
2025-02-27 00:49:56,350 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:56,350 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-02-27 00:49:56,350 [ scc.git] DEBUG Calling 'git remote'
2025-02-27 00:49:56,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:56,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-02-27 00:49:56,355 [ scc.git] DEBUG Calling 'git remote'
2025-02-27 00:49:56,360 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:56,360 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-02-27 00:49:56,360 [ scc.git] DEBUG Calling 'git remote'
2025-02-27 00:49:56,365 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:56,365 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-02-27 00:49:56,365 [ scc.git] DEBUG Calling 'git remote'
2025-02-27 00:49:56,370 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:56,370 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-02-27 00:49:56,370 [ scc.git] DEBUG Calling 'git remote'
2025-02-27 00:49:56,375 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:56,375 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-02-27 00:49:56,375 [ scc.git] DEBUG Calling 'git remote'
2025-02-27 00:49:56,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:56,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-02-27 00:49:56,380 [ scc.git] DEBUG Calling 'git remote'
2025-02-27 00:49:56,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:56,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-02-27 00:49:56,385 [ scc.git] DEBUG Calling 'git remote'
2025-02-27 00:49:56,391 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:56,391 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-02-27 00:49:56,391 [ scc.git] DEBUG Calling 'git remote'
2025-02-27 00:49:56,398 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:56,398 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-02-27 00:49:56,398 [ scc.git] DEBUG Calling 'git remote'
2025-02-27 00:49:56,403 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:56,403 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-02-27 00:49:56,403 [ scc.git] DEBUG Calling 'git remote'
2025-02-27 00:49:56,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:56,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-02-27 00:49:56,409 [ scc.git] DEBUG Calling 'git remote'
2025-02-27 00:49:56,415 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:56,415 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-02-27 00:49:56,415 [ scc.git] DEBUG Calling 'git remote'
2025-02-27 00:49:56,421 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:56,421 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-02-27 00:49:56,421 [ scc.git] DEBUG Calling 'git remote'
2025-02-27 00:49:56,428 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:56,428 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-02-27 00:49:56,428 [ scc.git] DEBUG Calling 'git remote'
2025-02-27 00:49:56,434 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:56,434 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-02-27 00:49:56,434 [ scc.git] DEBUG Calling 'git remote'
2025-02-27 00:49:56,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:56,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-02-27 00:49:56,440 [ scc.git] DEBUG Calling 'git remote'
2025-02-27 00:49:56,446 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-27 00:49:56,446 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-02-27 00:49:56,446 [ scc.git] DEBUG Calling 'git remote'
2025-02-27 00:49:56,451 [ 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 d444b9c] 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 8a12777] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-02-27 00:50:47,417 [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-02-27 00:50:56,986 [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-02-27 00:50:59,533 [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-02-27 00:51:04,429 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-02-27 00:51:44,780 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts (hide)
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/316c2b55/images/svgs/logo.svg){kind=logo}
