Skipping 183 KB..
Full Log2025-02-28 00:47:33,010 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-28 00:47:33,053 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-28 00:47:33,063 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f66001d9c40> has no local changes
2025-02-28 00:47:33,063 [ 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#347 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/)'
2025-02-28 00:47:33,073 [ scc.git] DEBUG [detached HEAD e794fbc] merge master -Dorg -Ssuccess-only
2025-02-28 00:47:33,073 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:47:33,074 [ scc.repo] DEBUG ## PRs found:
2025-02-28 00:47:33,205 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:33,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-02-28 00:47:33,776 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:34,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/503 HTTP/1.1" 200 None
2025-02-28 00:47:34,273 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:34,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/503/comments HTTP/1.1" 200 None
2025-02-28 00:47:34,734 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:34,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502 HTTP/1.1" 200 None
2025-02-28 00:47:35,243 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:35,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502/comments HTTP/1.1" 200 None
2025-02-28 00:47:35,488 [ scc.repo] DEBUG # ... Include label: dependencies
2025-02-28 00:47:35,739 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:36,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-02-28 00:47:36,319 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:36,575 [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-28 00:47:36,829 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:37,059 [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-28 00:47:37,313 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:37,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-02-28 00:47:37,817 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:38,016 [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-28 00:47:38,018 [ scc.repo] DEBUG - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-02-28 00:47:38,269 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:38,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-02-28 00:47:38,521 [ scc.repo] DEBUG # ... Include label: dependencies
2025-02-28 00:47:38,772 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:39,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-02-28 00:47:39,347 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:39,596 [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-28 00:47:39,852 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:40,165 [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-28 00:47:40,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:40,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-02-28 00:47:41,014 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:41,192 [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-28 00:47:41,193 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-02-28 00:47:41,445 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:41,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-02-28 00:47:41,929 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:42,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-02-28 00:47:42,394 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:42,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-02-28 00:47:42,884 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:43,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-02-28 00:47:43,371 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:43,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-02-28 00:47:43,934 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:44,210 [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-28 00:47:44,463 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:44,729 [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-28 00:47:44,983 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:45,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-02-28 00:47:45,479 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:45,669 [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-28 00:47:45,670 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-02-28 00:47:45,922 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:46,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-02-28 00:47:46,413 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:46,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-02-28 00:47:46,927 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:47,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-02-28 00:47:47,437 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:47,687 [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-28 00:47:47,943 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:48,202 [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-28 00:47:48,457 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:48,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-02-28 00:47:48,972 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:49,157 [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-28 00:47:49,158 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-02-28 00:47:49,410 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:49,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-02-28 00:47:49,872 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:50,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-02-28 00:47:50,375 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:50,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-02-28 00:47:50,885 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:51,120 [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-28 00:47:51,373 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:51,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-02-28 00:47:51,816 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:52,005 [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-28 00:47:52,006 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-02-28 00:47:52,006 [ scc.repo] DEBUG ## Branches found:
2025-02-28 00:47:52,007 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-02-28 00:47:52,007 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:47:52,007 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:47:52,014 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-28 00:47:52,019 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-28 00:47:52,020 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-28 00:47:52,026 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-28 00:47:52,032 [ scc.git] DEBUG Already up to date.
2025-02-28 00:47:52,033 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-02-28 00:47:54,386 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-28 00:47:54,386 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-02-28 00:47:54,391 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-02-28 00:47:56,184 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-28 00:47:56,184 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-02-28 00:47:56,189 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-02-28 00:47:56,571 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-28 00:47:56,571 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-02-28 00:47:56,577 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-02-28 00:47:56,885 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-28 00:47:56,886 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-02-28 00:47:56,891 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-02-28 00:47:57,208 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-28 00:47:57,209 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-02-28 00:47:57,216 [ scc.git] DEBUG ## Unique users: []
2025-02-28 00:47:57,216 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:47:57,216 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:47:57,224 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-02-28 00:47:57,233 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:47:57,239 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-02-28 00:47:57,459 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-02-28 00:47:57,459 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-02-28 00:47:57,460 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-28 00:47:57,465 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-02-28 00:47:57,465 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-02-28 00:47:57,465 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-02-28 00:47:57,468 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:57,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:47:57,634 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-02-28 00:47:57,644 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:47:57,650 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-02-28 00:47:58,176 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-02-28 00:47:58,176 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-02-28 00:47:58,176 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-02-28 00:47:58,176 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-02-28 00:47:58,177 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-28 00:47:58,182 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-02-28 00:47:58,182 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-02-28 00:47:58,182 [ scc.git] DEBUG src/app/header.html | 5 +
2025-02-28 00:47:58,182 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-02-28 00:47:58,182 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-02-28 00:47:58,182 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-02-28 00:47:58,182 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-02-28 00:47:58,182 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-02-28 00:47:58,186 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:58,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:47:58,344 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-02-28 00:47:58,354 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:47:58,360 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-02-28 00:47:58,479 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-02-28 00:47:58,480 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-28 00:47:58,484 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-02-28 00:47:58,484 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-02-28 00:47:58,484 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-02-28 00:47:58,597 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:58,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:47:58,761 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-02-28 00:47:58,781 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:47:58,788 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-02-28 00:47:58,832 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-28 00:47:58,842 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-02-28 00:47:58,842 [ scc.git] DEBUG package.json | 2 +-
2025-02-28 00:47:58,843 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-02-28 00:47:59,013 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:59,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:47:59,176 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-02-28 00:47:59,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:47:59,205 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-02-28 00:47:59,337 [ scc.git] DEBUG Auto-merging package-lock.json
2025-02-28 00:47:59,337 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-02-28 00:47:59,337 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-28 00:47:59,338 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-28 00:47:59,344 [ scc.git] DEBUG Calling 'git reset --hard 462fee2d35f656d67a97af6dd6d764e17f76aff3'
2025-02-28 00:47:59,354 [ scc.git] DEBUG HEAD is now at 462fee2 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-02-28 00:47:59,428 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:47:59,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:47:59,604 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-02-28 00:47:59,611 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-02-28 00:47:59,619 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#347](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-02-28 00:47:59,627 [ scc.config] DEBUG Found github.token
2025-02-28 00:47:59,628 [ scc.git] DEBUG Adding comment to issue #502.
2025-02-28 00:47:59,857 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:00,420 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-iviewer/issues/502/comments HTTP/1.1" 201 2017
2025-02-28 00:48:00,421 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-28 00:48:00,476 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:00,477 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:00,484 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-28 00:48:00,539 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-28 00:48:00,550 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6600175520> has no local changes
2025-02-28 00:48:00,550 [ 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#347 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/)'
2025-02-28 00:48:00,563 [ scc.git] DEBUG [detached HEAD 013ac26] merge master -Dorg -Ssuccess-only
2025-02-28 00:48:00,564 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:48:00,564 [ scc.repo] DEBUG ## PRs found:
2025-02-28 00:48:00,673 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:00,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-02-28 00:48:01,192 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:01,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-02-28 00:48:01,673 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:01,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-02-28 00:48:02,237 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:02,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-02-28 00:48:02,804 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:03,052 [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-28 00:48:03,305 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:03,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-02-28 00:48:03,754 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:03,940 [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-28 00:48:03,941 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-02-28 00:48:03,941 [ scc.repo] DEBUG ## Branches found:
2025-02-28 00:48:03,941 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-02-28 00:48:03,941 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:03,942 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:03,949 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-28 00:48:03,956 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-28 00:48:03,956 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-28 00:48:03,962 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-28 00:48:03,970 [ scc.git] DEBUG Already up to date.
2025-02-28 00:48:03,970 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-02-28 00:48:04,877 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-02-28 00:48:04,878 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-02-28 00:48:04,882 [ scc.git] DEBUG ## Unique users: []
2025-02-28 00:48:04,882 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:04,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:04,888 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-02-28 00:48:04,896 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:04,903 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-02-28 00:48:04,914 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-28 00:48:04,917 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-02-28 00:48:04,917 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-02-28 00:48:04,917 [ scc.git] DEBUG requirements.txt | 2 +-
2025-02-28 00:48:04,917 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-02-28 00:48:04,917 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-02-28 00:48:04,917 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-02-28 00:48:04,921 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:05,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:48:05,077 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-28 00:48:05,123 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:05,123 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:05,130 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-28 00:48:05,174 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-28 00:48:05,182 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f66001fc8e0> has no local changes
2025-02-28 00:48:05,182 [ 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#347 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/)'
2025-02-28 00:48:05,191 [ scc.git] DEBUG [detached HEAD e175bfa] merge master -Dorg -Ssuccess-only
2025-02-28 00:48:05,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:48:05,192 [ scc.repo] DEBUG ## PRs found:
2025-02-28 00:48:05,329 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:05,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-02-28 00:48:05,851 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:06,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-02-28 00:48:06,324 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:06,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-02-28 00:48:06,908 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:07,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-02-28 00:48:07,460 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:07,731 [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-28 00:48:07,984 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:08,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-02-28 00:48:08,443 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:08,655 [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-28 00:48:08,656 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-02-28 00:48:08,907 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:09,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-02-28 00:48:09,406 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:09,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-02-28 00:48:09,918 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:10,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-02-28 00:48:10,550 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:10,768 [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-28 00:48:11,022 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:11,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-02-28 00:48:11,571 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:11,752 [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-28 00:48:11,753 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-02-28 00:48:11,753 [ scc.repo] DEBUG ## Branches found:
2025-02-28 00:48:11,753 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-02-28 00:48:11,753 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:11,753 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:11,760 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-28 00:48:11,765 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-28 00:48:11,766 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-28 00:48:11,771 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-28 00:48:11,777 [ scc.git] DEBUG Already up to date.
2025-02-28 00:48:11,777 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-02-28 00:48:12,508 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-02-28 00:48:12,508 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-02-28 00:48:12,514 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-02-28 00:48:12,904 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-02-28 00:48:12,904 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-02-28 00:48:12,910 [ scc.git] DEBUG ## Unique users: []
2025-02-28 00:48:12,910 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:12,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:12,916 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-02-28 00:48:12,924 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:12,930 [ 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-28 00:48:13,001 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-02-28 00:48:13,001 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-02-28 00:48:13,001 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-02-28 00:48:13,001 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-02-28 00:48:13,002 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-28 00:48:13,002 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-28 00:48:13,008 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-28 00:48:13,016 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-02-28 00:48:13,019 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:13,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:48:13,170 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-02-28 00:48:13,178 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-28 00:48:13,198 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#347](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-02-28 00:48:13,204 [ scc.config] DEBUG Found github.token
2025-02-28 00:48:13,204 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-02-28 00:48:13,204 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-02-28 00:48:13,211 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:13,217 [ 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-28 00:48:13,379 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-02-28 00:48:13,379 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-02-28 00:48:13,379 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-02-28 00:48:13,379 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-28 00:48:13,380 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-28 00:48:13,387 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-28 00:48:13,396 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-02-28 00:48:13,422 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:13,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:48:13,593 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-02-28 00:48:13,601 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-28 00:48:13,607 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#347](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/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-28 00:48:13,611 [ scc.config] DEBUG Found github.token
2025-02-28 00:48:13,611 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-02-28 00:48:13,612 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-28 00:48:13,654 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:13,654 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:13,660 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-28 00:48:13,702 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-28 00:48:13,711 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6600161250> has no local changes
2025-02-28 00:48:13,711 [ 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#347 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/)'
2025-02-28 00:48:13,721 [ scc.git] DEBUG [detached HEAD 49612b4] merge master -Dorg -Ssuccess-only
2025-02-28 00:48:13,721 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:48:13,721 [ scc.repo] DEBUG ## PRs found:
2025-02-28 00:48:13,846 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:14,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-02-28 00:48:14,383 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:14,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-02-28 00:48:14,614 [ scc.repo] DEBUG # ... Include label: dependencies
2025-02-28 00:48:14,865 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:15,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-02-28 00:48:15,492 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:15,761 [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-28 00:48:16,013 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:16,331 [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-28 00:48:16,583 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:16,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-02-28 00:48:17,130 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:17,304 [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-28 00:48:17,304 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-02-28 00:48:17,556 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:17,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-02-28 00:48:18,060 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:18,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-02-28 00:48:18,544 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:18,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-02-28 00:48:19,060 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:19,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-02-28 00:48:19,553 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:19,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-02-28 00:48:20,081 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:20,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-02-28 00:48:20,571 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:20,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-02-28 00:48:20,863 [ scc.repo] DEBUG ## Branches found:
2025-02-28 00:48:20,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-02-28 00:48:20,864 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:20,864 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:20,872 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-28 00:48:20,878 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-28 00:48:20,878 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-28 00:48:20,884 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-28 00:48:20,891 [ scc.git] DEBUG Already up to date.
2025-02-28 00:48:20,892 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-02-28 00:48:21,206 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-02-28 00:48:21,206 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-02-28 00:48:21,211 [ scc.git] DEBUG ## Unique users: []
2025-02-28 00:48:21,212 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:21,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:21,218 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-02-28 00:48:21,225 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:21,231 [ 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-28 00:48:21,368 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-28 00:48:21,372 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-02-28 00:48:21,373 [ scc.git] DEBUG package.json | 2 +-
2025-02-28 00:48:21,373 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-02-28 00:48:21,376 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:21,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:48:21,544 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-28 00:48:21,589 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:21,590 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:21,596 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-28 00:48:21,638 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-28 00:48:21,647 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f66001b4f10> has no local changes
2025-02-28 00:48:21,647 [ 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#347 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/)'
2025-02-28 00:48:21,657 [ scc.git] DEBUG [detached HEAD ccd965f] merge master -Dorg -Ssuccess-only
2025-02-28 00:48:21,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:48:21,658 [ scc.repo] DEBUG ## PRs found:
2025-02-28 00:48:21,796 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:21,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-02-28 00:48:21,992 [ scc.repo] DEBUG ## Branches found:
2025-02-28 00:48:21,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-02-28 00:48:21,993 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:21,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:21,999 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-28 00:48:22,005 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-28 00:48:22,005 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-28 00:48:22,012 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-28 00:48:22,023 [ scc.git] DEBUG Already up to date.
2025-02-28 00:48:22,023 [ scc.git] DEBUG ## Unique users: []
2025-02-28 00:48:22,023 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:22,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:22,030 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-28 00:48:22,077 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:22,077 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:22,084 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-28 00:48:22,130 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-28 00:48:22,138 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f66001b28e0> has no local changes
2025-02-28 00:48:22,139 [ 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#347 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/)'
2025-02-28 00:48:22,149 [ scc.git] DEBUG [detached HEAD ff08620] merge master -Dorg -Ssuccess-only
2025-02-28 00:48:22,150 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:48:22,150 [ scc.repo] DEBUG ## PRs found:
2025-02-28 00:48:22,245 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:22,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-02-28 00:48:22,756 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:22,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-02-28 00:48:22,997 [ scc.repo] DEBUG ## Branches found:
2025-02-28 00:48:22,997 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-02-28 00:48:22,997 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:22,997 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:23,006 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-28 00:48:23,012 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-28 00:48:23,012 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-28 00:48:23,020 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-28 00:48:23,028 [ scc.git] DEBUG Already up to date.
2025-02-28 00:48:23,028 [ scc.git] DEBUG ## Unique users: []
2025-02-28 00:48:23,028 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:23,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:23,034 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-28 00:48:23,077 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:23,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:23,086 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-28 00:48:23,130 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-28 00:48:23,138 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f66001654c0> has no local changes
2025-02-28 00:48:23,139 [ 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#347 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/)'
2025-02-28 00:48:23,150 [ scc.git] DEBUG [detached HEAD 6a33ca6] merge master -Dorg -Ssuccess-only
2025-02-28 00:48:23,150 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:48:23,151 [ scc.repo] DEBUG ## PRs found:
2025-02-28 00:48:23,249 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:23,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-02-28 00:48:23,829 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:24,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-02-28 00:48:24,334 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:24,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-02-28 00:48:24,804 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:25,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-02-28 00:48:25,371 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:25,588 [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-28 00:48:25,841 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:26,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-02-28 00:48:26,398 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:26,608 [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-28 00:48:26,609 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-02-28 00:48:26,609 [ scc.repo] DEBUG ## Branches found:
2025-02-28 00:48:26,610 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-02-28 00:48:26,610 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:26,610 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:26,617 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-28 00:48:26,624 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-28 00:48:26,624 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-28 00:48:26,632 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-28 00:48:26,639 [ scc.git] DEBUG Already up to date.
2025-02-28 00:48:26,640 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-02-28 00:48:27,067 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-02-28 00:48:27,067 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-02-28 00:48:27,073 [ scc.git] DEBUG ## Unique users: []
2025-02-28 00:48:27,073 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:27,073 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:27,080 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-02-28 00:48:27,087 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:27,093 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-02-28 00:48:27,277 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-02-28 00:48:27,277 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-02-28 00:48:27,277 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-02-28 00:48:27,277 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-02-28 00:48:27,277 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-02-28 00:48:27,277 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-02-28 00:48:27,277 [ scc.git] DEBUG Auto-merging setup.py
2025-02-28 00:48:27,278 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-02-28 00:48:27,278 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-28 00:48:27,278 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-28 00:48:27,286 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-02-28 00:48:27,295 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-02-28 00:48:27,299 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:27,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:48:27,462 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-02-28 00:48:27,469 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-02-28 00:48:27,583 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#347](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
- setup.py
--conflicts
2025-02-28 00:48:27,590 [ scc.config] DEBUG Found github.token
2025-02-28 00:48:27,591 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-02-28 00:48:27,591 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-28 00:48:27,640 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:27,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:27,647 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-28 00:48:27,699 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-28 00:48:27,707 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6600151880> has no local changes
2025-02-28 00:48:27,707 [ 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#347 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/)'
2025-02-28 00:48:27,719 [ scc.git] DEBUG [detached HEAD 85f8d98] merge master -Dorg -Ssuccess-only
2025-02-28 00:48:27,719 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:48:27,719 [ scc.repo] DEBUG ## PRs found:
2025-02-28 00:48:27,722 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:28,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-02-28 00:48:28,275 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:28,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-02-28 00:48:28,796 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:29,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-02-28 00:48:29,312 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:29,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-02-28 00:48:29,874 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:30,148 [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-28 00:48:30,402 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:30,628 [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-28 00:48:30,881 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:31,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-02-28 00:48:31,357 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:31,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-02-28 00:48:31,819 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:32,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-02-28 00:48:32,289 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:32,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-02-28 00:48:32,741 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:33,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-02-28 00:48:33,275 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:33,495 [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-28 00:48:33,748 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:34,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-02-28 00:48:34,266 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:34,435 [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-28 00:48:34,436 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-02-28 00:48:34,436 [ scc.repo] DEBUG ## Branches found:
2025-02-28 00:48:34,436 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-02-28 00:48:34,436 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:34,436 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:34,442 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-28 00:48:34,447 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-28 00:48:34,447 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-28 00:48:34,453 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-28 00:48:34,458 [ scc.git] DEBUG Already up to date.
2025-02-28 00:48:34,458 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-02-28 00:48:34,851 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-02-28 00:48:34,851 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-02-28 00:48:34,856 [ scc.git] DEBUG ## Unique users: []
2025-02-28 00:48:34,856 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:34,856 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:34,862 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-02-28 00:48:34,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:34,876 [ 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-28 00:48:34,896 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-28 00:48:34,899 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-02-28 00:48:34,899 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-02-28 00:48:34,899 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-02-28 00:48:34,899 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-02-28 00:48:34,900 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-02-28 00:48:34,900 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-02-28 00:48:34,900 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-02-28 00:48:34,901 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-02-28 00:48:34,902 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:34,902 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-02-28 00:48:34,903 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-02-28 00:48:34,903 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-02-28 00:48:34,903 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-02-28 00:48:34,903 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-02-28 00:48:34,903 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-02-28 00:48:34,903 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-02-28 00:48:34,903 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-02-28 00:48:34,903 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-02-28 00:48:34,903 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-02-28 00:48:34,903 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-02-28 00:48:34,903 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-02-28 00:48:34,903 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-02-28 00:48:34,903 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-02-28 00:48:34,903 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-02-28 00:48:34,903 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-02-28 00:48:34,904 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-02-28 00:48:34,904 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-02-28 00:48:34,904 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-02-28 00:48:34,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-02-28 00:48:34,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-02-28 00:48:34,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-02-28 00:48:34,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-02-28 00:48:34,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-02-28 00:48:34,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-02-28 00:48:34,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-02-28 00:48:34,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-02-28 00:48:34,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-02-28 00:48:34,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-02-28 00:48:34,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-02-28 00:48:34,904 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-02-28 00:48:34,904 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-02-28 00:48:34,904 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-02-28 00:48:34,904 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-02-28 00:48:34,905 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-02-28 00:48:34,905 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-02-28 00:48:34,905 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-02-28 00:48:35,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:48:35,082 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-28 00:48:35,126 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:35,126 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:35,132 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-28 00:48:35,176 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-28 00:48:35,183 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f660016aac0> has no local changes
2025-02-28 00:48:35,183 [ 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#347 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/)'
2025-02-28 00:48:35,194 [ scc.git] DEBUG [detached HEAD 9054f74] merge master -Dorg -Ssuccess-only
2025-02-28 00:48:35,194 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:48:35,195 [ scc.repo] DEBUG ## PRs found:
2025-02-28 00:48:35,334 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:35,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-02-28 00:48:35,517 [ scc.repo] DEBUG ## Branches found:
2025-02-28 00:48:35,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-02-28 00:48:35,517 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:35,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:35,523 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-28 00:48:35,528 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-28 00:48:35,528 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-28 00:48:35,535 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-28 00:48:35,541 [ scc.git] DEBUG Already up to date.
2025-02-28 00:48:35,541 [ scc.git] DEBUG ## Unique users: []
2025-02-28 00:48:35,541 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:35,541 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:35,547 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-28 00:48:35,600 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:35,601 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:35,610 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-28 00:48:35,663 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-28 00:48:35,671 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f660018a160> has no local changes
2025-02-28 00:48:35,671 [ 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#347 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/)'
2025-02-28 00:48:35,680 [ scc.git] DEBUG [detached HEAD 68c7650] merge master -Dorg -Ssuccess-only
2025-02-28 00:48:35,681 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:48:35,681 [ scc.repo] DEBUG ## PRs found:
2025-02-28 00:48:35,769 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:36,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-02-28 00:48:36,276 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:36,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-02-28 00:48:36,738 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:37,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-02-28 00:48:37,253 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:37,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-02-28 00:48:37,782 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:38,073 [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-28 00:48:38,326 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:38,542 [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-28 00:48:38,796 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:39,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-02-28 00:48:39,318 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:39,516 [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-28 00:48:39,517 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-02-28 00:48:39,517 [ scc.repo] DEBUG ## Branches found:
2025-02-28 00:48:39,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-02-28 00:48:39,517 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:39,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:39,524 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-28 00:48:39,529 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-28 00:48:39,529 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-28 00:48:39,534 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-28 00:48:39,541 [ scc.git] DEBUG Already up to date.
2025-02-28 00:48:39,542 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-02-28 00:48:39,915 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-02-28 00:48:39,916 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-02-28 00:48:39,920 [ scc.git] DEBUG ## Unique users: []
2025-02-28 00:48:39,920 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:39,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:39,926 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-02-28 00:48:39,932 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:39,938 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-02-28 00:48:39,948 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-28 00:48:39,953 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-02-28 00:48:39,953 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-02-28 00:48:39,953 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-02-28 00:48:39,953 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-02-28 00:48:39,953 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-02-28 00:48:39,956 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:40,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:48:40,135 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-28 00:48:40,179 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:40,179 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:40,185 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-28 00:48:40,226 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-28 00:48:40,233 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f660016afa0> has no local changes
2025-02-28 00:48:40,233 [ 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#347 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/)'
2025-02-28 00:48:40,242 [ scc.git] DEBUG [detached HEAD e1ec585] merge master -Dorg -Ssuccess-only
2025-02-28 00:48:40,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:48:40,243 [ scc.git] INFO Overriding base-branch from master to main
2025-02-28 00:48:40,243 [ scc.repo] DEBUG ## PRs found:
2025-02-28 00:48:40,387 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:40,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-02-28 00:48:40,963 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:41,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-02-28 00:48:41,465 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:41,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-02-28 00:48:41,964 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:42,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-02-28 00:48:42,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:42,730 [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-28 00:48:42,983 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:43,264 [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-28 00:48:43,517 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:43,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-02-28 00:48:44,009 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:44,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-02-28 00:48:44,483 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:44,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-02-28 00:48:44,956 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:45,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-02-28 00:48:45,470 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:45,689 [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-28 00:48:45,942 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:46,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-02-28 00:48:46,377 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:46,588 [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-28 00:48:46,589 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-02-28 00:48:46,590 [ scc.repo] DEBUG ## Branches found:
2025-02-28 00:48:46,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-02-28 00:48:46,590 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:46,590 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:46,597 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-02-28 00:48:46,603 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-28 00:48:46,603 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-02-28 00:48:46,610 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-02-28 00:48:46,616 [ scc.git] DEBUG Already up to date.
2025-02-28 00:48:46,617 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-02-28 00:48:47,035 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-02-28 00:48:47,035 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-02-28 00:48:47,040 [ scc.git] DEBUG ## Unique users: []
2025-02-28 00:48:47,040 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:47,040 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:47,047 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-02-28 00:48:47,052 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:47,058 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-02-28 00:48:47,220 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-02-28 00:48:47,220 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-02-28 00:48:47,220 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-28 00:48:47,221 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-28 00:48:47,228 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-02-28 00:48:47,235 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-02-28 00:48:47,238 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:47,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:48:47,401 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-02-28 00:48:47,408 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-02-28 00:48:47,415 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#347](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-02-28 00:48:47,421 [ scc.config] DEBUG Found github.token
2025-02-28 00:48:47,422 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-02-28 00:48:47,422 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-28 00:48:47,461 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:47,462 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:47,468 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-28 00:48:47,508 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-28 00:48:47,514 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6600113550> has no local changes
2025-02-28 00:48:47,515 [ 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#347 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/)'
2025-02-28 00:48:47,523 [ scc.git] DEBUG [detached HEAD 2170e05] merge master -Dorg -Ssuccess-only
2025-02-28 00:48:47,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:48:47,524 [ scc.repo] DEBUG ## PRs found:
2025-02-28 00:48:47,653 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:47,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-02-28 00:48:47,857 [ scc.repo] DEBUG ## Branches found:
2025-02-28 00:48:47,857 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-02-28 00:48:47,857 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:47,857 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:47,863 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-28 00:48:47,868 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-28 00:48:47,868 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-28 00:48:47,873 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-28 00:48:47,879 [ scc.git] DEBUG Already up to date.
2025-02-28 00:48:47,879 [ scc.git] DEBUG ## Unique users: []
2025-02-28 00:48:47,879 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:47,879 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:47,883 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-28 00:48:47,922 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:47,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:47,929 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-28 00:48:47,971 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-28 00:48:47,979 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f66000595b0> has no local changes
2025-02-28 00:48:47,980 [ 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#347 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/)'
2025-02-28 00:48:47,990 [ scc.git] DEBUG [detached HEAD 70a1d19] merge master -Dorg -Ssuccess-only
2025-02-28 00:48:47,990 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:48:47,991 [ scc.repo] DEBUG ## PRs found:
2025-02-28 00:48:48,109 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:48,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-02-28 00:48:48,292 [ scc.repo] DEBUG ## Branches found:
2025-02-28 00:48:48,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-02-28 00:48:48,293 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:48,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:48,300 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-28 00:48:48,305 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-28 00:48:48,305 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-28 00:48:48,310 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-28 00:48:48,316 [ scc.git] DEBUG Already up to date.
2025-02-28 00:48:48,316 [ scc.git] DEBUG ## Unique users: []
2025-02-28 00:48:48,316 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:48,316 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:48,321 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-28 00:48:48,360 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:48,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:48,366 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-28 00:48:48,407 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-28 00:48:48,414 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6600113700> has no local changes
2025-02-28 00:48:48,414 [ 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#347 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/)'
2025-02-28 00:48:48,424 [ scc.git] DEBUG [detached HEAD 4ba8be2] merge master -Dorg -Ssuccess-only
2025-02-28 00:48:48,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:48:48,425 [ scc.repo] DEBUG ## PRs found:
2025-02-28 00:48:48,545 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:48,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-02-28 00:48:49,055 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:49,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-02-28 00:48:49,536 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:49,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-02-28 00:48:50,018 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:50,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-02-28 00:48:50,673 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:50,863 [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-28 00:48:51,116 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:51,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-02-28 00:48:51,580 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:51,761 [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-28 00:48:51,762 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-02-28 00:48:51,762 [ scc.repo] DEBUG ## Branches found:
2025-02-28 00:48:51,762 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-02-28 00:48:51,763 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:51,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:51,770 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-28 00:48:51,775 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-28 00:48:51,775 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-28 00:48:51,780 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-28 00:48:51,785 [ scc.git] DEBUG Already up to date.
2025-02-28 00:48:51,786 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-02-28 00:48:52,162 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-02-28 00:48:52,162 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-02-28 00:48:52,167 [ scc.git] DEBUG ## Unique users: []
2025-02-28 00:48:52,167 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:52,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:52,172 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-02-28 00:48:52,177 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:52,182 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-02-28 00:48:52,238 [ scc.git] DEBUG Auto-merging Dockerfile
2025-02-28 00:48:52,238 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-02-28 00:48:52,238 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-28 00:48:52,238 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-28 00:48:52,245 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-02-28 00:48:52,251 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-02-28 00:48:52,254 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:52,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:48:52,436 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-02-28 00:48:52,442 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-02-28 00:48:52,448 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#347](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-02-28 00:48:52,453 [ scc.config] DEBUG Found github.token
2025-02-28 00:48:52,453 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-02-28 00:48:52,453 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-28 00:48:52,490 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:48:52,491 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:48:52,496 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-28 00:48:52,535 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-28 00:48:52,542 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6600059610> has no local changes
2025-02-28 00:48:52,542 [ 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#347 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/)'
2025-02-28 00:48:52,550 [ scc.git] DEBUG [detached HEAD 6afcb08] merge master -Dorg -Ssuccess-only
2025-02-28 00:48:52,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:48:52,551 [ scc.git] INFO Overriding base-branch from master to develop
2025-02-28 00:48:52,551 [ scc.repo] DEBUG ## PRs found:
2025-02-28 00:48:52,688 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:52,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-02-28 00:48:53,246 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:53,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-02-28 00:48:53,716 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:53,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-02-28 00:48:54,190 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:54,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-02-28 00:48:54,700 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:54,918 [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-28 00:48:55,171 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:55,458 [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-28 00:48:55,711 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:55,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-02-28 00:48:56,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:56,400 [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-28 00:48:56,400 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-02-28 00:48:56,652 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:56,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-02-28 00:48:57,123 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:57,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-02-28 00:48:57,620 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:57,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-02-28 00:48:58,078 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:58,271 [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-28 00:48:58,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:58,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-02-28 00:48:58,963 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:59,169 [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-28 00:48:59,169 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-02-28 00:48:59,422 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:48:59,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-02-28 00:48:59,892 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:00,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-02-28 00:49:00,407 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:00,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-02-28 00:49:00,913 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:01,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-02-28 00:49:01,200 [ scc.repo] DEBUG ## Branches found:
2025-02-28 00:49:01,200 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-02-28 00:49:01,200 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:49:01,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:49:01,208 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-02-28 00:49:01,215 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-28 00:49:01,215 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-02-28 00:49:01,222 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-02-28 00:49:01,228 [ scc.git] DEBUG Already up to date.
2025-02-28 00:49:01,228 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-02-28 00:49:02,027 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-02-28 00:49:02,028 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-02-28 00:49:02,033 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-02-28 00:49:02,698 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-02-28 00:49:02,698 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-02-28 00:49:02,703 [ scc.git] DEBUG ## Unique users: []
2025-02-28 00:49:02,703 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:49:02,703 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:49:02,709 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-02-28 00:49:02,717 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:49:02,722 [ 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-28 00:49:02,811 [ 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-28 00:49:02,811 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-28 00:49:02,812 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-28 00:49:02,821 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-02-28 00:49:02,828 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-02-28 00:49:02,831 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:03,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:03,001 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-02-28 00:49:03,010 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-02-28 00:49:03,018 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#347](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-02-28 00:49:03,024 [ scc.config] DEBUG Found github.token
2025-02-28 00:49:03,025 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-02-28 00:49:03,025 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-02-28 00:49:03,032 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:49:03,038 [ 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-28 00:49:03,061 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-28 00:49:03,064 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-02-28 00:49:03,065 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-02-28 00:49:03,253 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:03,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:03,412 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-28 00:49:03,459 [ scc.git] DEBUG Get sha1 of %s
2025-02-28 00:49:03,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-28 00:49:03,466 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-28 00:49:03,516 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-28 00:49:03,522 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f66000fa580> has no local changes
2025-02-28 00:49:03,523 [ 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#347 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/)'
2025-02-28 00:49:03,533 [ scc.git] DEBUG [detached HEAD 26ec1ef] merge master -Dorg -Ssuccess-only
2025-02-28 00:49:03,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:49:03,534 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-28 00:49:03,617 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-02-28 00:49:03,664 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:03,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:03,845 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-02-28 00:49:03,850 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-02-28 00:49:04,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:04,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:04,261 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-02-28 00:49:04,265 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-02-28 00:49:04,503 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:04,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:04,678 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-02-28 00:49:04,682 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-02-28 00:49:04,918 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:05,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:05,104 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-02-28 00:49:05,342 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:05,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:05,521 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-02-28 00:49:05,526 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-02-28 00:49:05,760 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:05,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:05,935 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-02-28 00:49:05,941 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-02-28 00:49:06,175 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:06,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:06,366 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-02-28 00:49:06,371 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-02-28 00:49:06,604 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:06,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:06,781 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-02-28 00:49:06,786 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-02-28 00:49:07,020 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:07,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:07,217 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-02-28 00:49:07,222 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-02-28 00:49:07,455 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:07,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:07,628 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-02-28 00:49:07,633 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-02-28 00:49:07,866 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:08,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:08,035 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-02-28 00:49:08,039 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-02-28 00:49:08,275 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:08,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:08,453 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-02-28 00:49:08,459 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-02-28 00:49:08,695 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:08,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:08,912 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-02-28 00:49:09,149 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:09,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:09,322 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-02-28 00:49:09,554 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:09,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:09,732 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-02-28 00:49:09,737 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-02-28 00:49:09,971 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:10,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:10,149 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-02-28 00:49:10,384 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:10,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:10,568 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-02-28 00:49:10,801 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:10,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:10,971 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-02-28 00:49:10,977 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-02-28 00:49:11,213 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:11,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:11,390 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-02-28 00:49:11,397 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-02-28 00:49:11,630 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:11,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:11,816 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-02-28 00:49:11,821 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-02-28 00:49:12,058 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:12,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:12,264 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-02-28 00:49:12,271 [ scc.config] DEBUG Found submodule.scripts.url
2025-02-28 00:49:12,507 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-28 00:49:12,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-28 00:49:12,680 [ scc.config] DEBUG Found submodule.scripts.branch
2025-02-28 00:49:12,680 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-28 00:49:12,758 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6602f7ef10> has local changes
2025-02-28 00:49:12,758 [ 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#347 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/347/)'
2025-02-28 00:49:12,773 [ scc.git] DEBUG [detached HEAD 9bb93e0] merge master -Dorg -Ssuccess-only
2025-02-28 00:49:12,773 [ scc.merge] INFO Repository: ome/omero-plugins
2025-02-28 00:49:12,773 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-02-28 00:49:12,773 [ scc.merge] INFO Already up to date.
2025-02-28 00:49:12,773 [ scc.merge] INFO
2025-02-28 00:49:12,773 [ scc.merge] INFO Merged PRs:
2025-02-28 00:49:12,773 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-02-28 00:49:12,773 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-02-28 00:49:12,774 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-02-28 00:49:12,774 [ scc.merge] INFO
2025-02-28 00:49:12,774 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-02-28 00:49:12,774 [ scc.merge] INFO Already up to date.
2025-02-28 00:49:12,774 [ scc.merge] INFO
2025-02-28 00:49:12,774 [ scc.merge] INFO
2025-02-28 00:49:12,774 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-02-28 00:49:12,774 [ scc.merge] INFO Excluded PRs:
2025-02-28 00:49:12,774 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-02-28 00:49:12,774 [ scc.merge] INFO Already up to date.
2025-02-28 00:49:12,774 [ scc.merge] INFO
2025-02-28 00:49:12,774 [ scc.merge] INFO
2025-02-28 00:49:12,774 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-02-28 00:49:12,774 [ scc.merge] INFO Excluded PRs:
2025-02-28 00:49:12,774 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-02-28 00:49:12,774 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-02-28 00:49:12,774 [ scc.merge] INFO Already up to date.
2025-02-28 00:49:12,774 [ scc.merge] INFO
2025-02-28 00:49:12,774 [ scc.merge] INFO Merged PRs:
2025-02-28 00:49:12,774 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-02-28 00:49:12,774 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-02-28 00:49:12,774 [ scc.merge] INFO
2025-02-28 00:49:12,774 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-02-28 00:49:12,774 [ scc.merge] INFO Excluded PRs:
2025-02-28 00:49:12,774 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-02-28 00:49:12,774 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-02-28 00:49:12,774 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-02-28 00:49:12,774 [ scc.merge] INFO Already up to date.
2025-02-28 00:49:12,774 [ scc.merge] INFO
2025-02-28 00:49:12,774 [ scc.merge] INFO Merged PRs:
2025-02-28 00:49:12,774 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-02-28 00:49:12,774 [ scc.merge] INFO
2025-02-28 00:49:12,774 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-28 00:49:12,774 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-02-28 00:49:12,774 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-02-28 00:49:12,774 [ scc.merge] INFO
2025-02-28 00:49:12,774 [ scc.merge] INFO Repository: ome/omero-figure
2025-02-28 00:49:12,774 [ scc.merge] INFO Excluded PRs:
2025-02-28 00:49:12,775 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-02-28 00:49:12,775 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (stage: draft)
2025-02-28 00:49:12,775 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-02-28 00:49:12,775 [ scc.merge] INFO Already up to date.
2025-02-28 00:49:12,775 [ scc.merge] INFO
2025-02-28 00:49:12,775 [ scc.merge] INFO Merged PRs:
2025-02-28 00:49:12,775 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-02-28 00:49:12,775 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-02-28 00:49:12,775 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-02-28 00:49:12,775 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-02-28 00:49:12,775 [ scc.merge] INFO
2025-02-28 00:49:12,775 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-28 00:49:12,775 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-02-28 00:49:12,775 [ scc.merge] INFO
2025-02-28 00:49:12,775 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-02-28 00:49:12,775 [ scc.merge] INFO Already up to date.
2025-02-28 00:49:12,775 [ scc.merge] INFO
2025-02-28 00:49:12,775 [ scc.merge] INFO Merged PRs:
2025-02-28 00:49:12,775 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-02-28 00:49:12,775 [ scc.merge] INFO
2025-02-28 00:49:12,775 [ scc.merge] INFO Repository: ome/omero-gallery
2025-02-28 00:49:12,775 [ scc.merge] INFO Already up to date.
2025-02-28 00:49:12,775 [ scc.merge] INFO
2025-02-28 00:49:12,775 [ scc.merge] INFO Merged PRs:
2025-02-28 00:49:12,775 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-02-28 00:49:12,775 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-02-28 00:49:12,775 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-02-28 00:49:12,775 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-02-28 00:49:12,775 [ scc.merge] INFO
2025-02-28 00:49:12,775 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-28 00:49:12,775 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-02-28 00:49:12,775 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-02-28 00:49:12,775 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-02-28 00:49:12,775 [ scc.merge] INFO
2025-02-28 00:49:12,775 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-02-28 00:49:12,775 [ scc.merge] INFO Excluded PRs:
2025-02-28 00:49:12,775 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-02-28 00:49:12,775 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-02-28 00:49:12,776 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-02-28 00:49:12,776 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-02-28 00:49:12,776 [ scc.merge] INFO Already up to date.
2025-02-28 00:49:12,776 [ scc.merge] INFO
2025-02-28 00:49:12,776 [ scc.merge] INFO Merged PRs:
2025-02-28 00:49:12,776 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-02-28 00:49:12,776 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-02-28 00:49:12,776 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-02-28 00:49:12,776 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-02-28 00:49:12,776 [ scc.merge] INFO
2025-02-28 00:49:12,776 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-28 00:49:12,776 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-02-28 00:49:12,776 [ scc.merge] INFO
2025-02-28 00:49:12,776 [ scc.merge] INFO Repository: ome/omero-mapr
2025-02-28 00:49:12,776 [ scc.merge] INFO Excluded PRs:
2025-02-28 00:49:12,776 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-02-28 00:49:12,776 [ scc.merge] INFO Already up to date.
2025-02-28 00:49:12,776 [ scc.merge] INFO
2025-02-28 00:49:12,776 [ scc.merge] INFO Merged PRs:
2025-02-28 00:49:12,776 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-02-28 00:49:12,776 [ scc.merge] INFO
2025-02-28 00:49:12,776 [ scc.merge] INFO Repository: ome/omero-metadata
2025-02-28 00:49:12,776 [ scc.merge] INFO Already up to date.
2025-02-28 00:49:12,776 [ scc.merge] INFO
2025-02-28 00:49:12,776 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-28 00:49:12,776 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-02-28 00:49:12,776 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-02-28 00:49:12,776 [ scc.merge] INFO
2025-02-28 00:49:12,776 [ scc.merge] INFO Repository: ome/omero-parade
2025-02-28 00:49:12,776 [ scc.merge] INFO Excluded PRs:
2025-02-28 00:49:12,776 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-02-28 00:49:12,776 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-02-28 00:49:12,776 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-02-28 00:49:12,776 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-02-28 00:49:12,776 [ scc.merge] INFO Already up to date.
2025-02-28 00:49:12,776 [ scc.merge] INFO
2025-02-28 00:49:12,776 [ scc.merge] INFO Merged PRs:
2025-02-28 00:49:12,776 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-02-28 00:49:12,777 [ scc.merge] INFO
2025-02-28 00:49:12,777 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-02-28 00:49:12,777 [ scc.merge] INFO Already up to date.
2025-02-28 00:49:12,777 [ scc.merge] INFO
2025-02-28 00:49:12,777 [ scc.merge] INFO
2025-02-28 00:49:12,777 [ scc.merge] INFO Repository: ome/omero-rois
2025-02-28 00:49:12,777 [ scc.merge] INFO Excluded PRs:
2025-02-28 00:49:12,777 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-02-28 00:49:12,777 [ scc.merge] INFO Already up to date.
2025-02-28 00:49:12,777 [ scc.merge] INFO
2025-02-28 00:49:12,777 [ scc.merge] INFO
2025-02-28 00:49:12,777 [ scc.merge] INFO Repository: ome/omero-signup
2025-02-28 00:49:12,777 [ scc.merge] INFO Already up to date.
2025-02-28 00:49:12,777 [ scc.merge] INFO
2025-02-28 00:49:12,777 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-28 00:49:12,777 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-02-28 00:49:12,777 [ scc.merge] INFO
2025-02-28 00:49:12,777 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-02-28 00:49:12,777 [ scc.merge] INFO Excluded PRs:
2025-02-28 00:49:12,777 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-02-28 00:49:12,777 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-02-28 00:49:12,777 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-02-28 00:49:12,777 [ scc.merge] INFO Already up to date.
2025-02-28 00:49:12,777 [ scc.merge] INFO
2025-02-28 00:49:12,777 [ scc.merge] INFO Merged PRs:
2025-02-28 00:49:12,777 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-02-28 00:49:12,777 [ scc.merge] INFO
2025-02-28 00:49:12,777 [ scc.merge] INFO Repository: ome/omero-upload
2025-02-28 00:49:12,777 [ scc.merge] INFO Already up to date.
2025-02-28 00:49:12,777 [ scc.merge] INFO
2025-02-28 00:49:12,777 [ scc.merge] INFO
2025-02-28 00:49:12,777 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-02-28 00:49:12,777 [ scc.merge] INFO Already up to date.
2025-02-28 00:49:12,777 [ scc.merge] INFO
2025-02-28 00:49:12,777 [ scc.merge] INFO Merged PRs:
2025-02-28 00:49:12,777 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-02-28 00:49:12,777 [ scc.merge] INFO
2025-02-28 00:49:12,777 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-02-28 00:49:12,778 [ scc.merge] INFO Excluded PRs:
2025-02-28 00:49:12,778 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-02-28 00:49:12,778 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-02-28 00:49:12,778 [ scc.merge] INFO Already up to date.
2025-02-28 00:49:12,778 [ scc.merge] INFO
2025-02-28 00:49:12,778 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-28 00:49:12,778 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-02-28 00:49:12,778 [ scc.merge] INFO
2025-02-28 00:49:12,778 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-02-28 00:49:12,778 [ scc.merge] INFO Already up to date.
2025-02-28 00:49:12,778 [ scc.merge] INFO
2025-02-28 00:49:12,778 [ scc.merge] INFO
2025-02-28 00:49:12,778 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-02-28 00:49:12,778 [ scc.merge] INFO Already up to date.
2025-02-28 00:49:12,778 [ scc.merge] INFO
2025-02-28 00:49:12,778 [ scc.merge] INFO
2025-02-28 00:49:12,778 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-02-28 00:49:12,778 [ scc.merge] INFO Already up to date.
2025-02-28 00:49:12,778 [ scc.merge] INFO
2025-02-28 00:49:12,778 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-28 00:49:12,778 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-02-28 00:49:12,778 [ scc.merge] INFO
2025-02-28 00:49:12,778 [ scc.merge] INFO Repository: ome/scripts
2025-02-28 00:49:12,778 [ scc.merge] INFO Excluded PRs:
2025-02-28 00:49:12,778 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-02-28 00:49:12,778 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-02-28 00:49:12,778 [ scc.merge] INFO Already up to date.
2025-02-28 00:49:12,778 [ scc.merge] INFO
2025-02-28 00:49:12,778 [ scc.merge] INFO Merged PRs:
2025-02-28 00:49:12,778 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-02-28 00:49:12,778 [ scc.merge] INFO
2025-02-28 00:49:12,778 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-28 00:49:12,778 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-02-28 00:49:12,778 [ scc.merge] INFO
2025-02-28 00:49:12,778 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-02-28 00:49:12,779 [ scc.git] DEBUG Calling 'git remote'
2025-02-28 00:49:12,784 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-02-28 00:49:12,784 [ scc.git] DEBUG Calling 'git remote'
2025-02-28 00:49:12,788 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:49:12,789 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-02-28 00:49:12,789 [ scc.git] DEBUG Calling 'git remote'
2025-02-28 00:49:12,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:49:12,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-02-28 00:49:12,793 [ scc.git] DEBUG Calling 'git remote'
2025-02-28 00:49:12,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:49:12,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-02-28 00:49:12,798 [ scc.git] DEBUG Calling 'git remote'
2025-02-28 00:49:12,802 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:49:12,803 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-02-28 00:49:12,803 [ scc.git] DEBUG Calling 'git remote'
2025-02-28 00:49:12,807 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:49:12,807 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-02-28 00:49:12,807 [ scc.git] DEBUG Calling 'git remote'
2025-02-28 00:49:12,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:49:12,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-02-28 00:49:12,812 [ scc.git] DEBUG Calling 'git remote'
2025-02-28 00:49:12,817 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:49:12,817 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-02-28 00:49:12,817 [ scc.git] DEBUG Calling 'git remote'
2025-02-28 00:49:12,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:49:12,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-02-28 00:49:12,822 [ scc.git] DEBUG Calling 'git remote'
2025-02-28 00:49:12,826 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:49:12,826 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-02-28 00:49:12,826 [ scc.git] DEBUG Calling 'git remote'
2025-02-28 00:49:12,831 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:49:12,831 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-02-28 00:49:12,831 [ scc.git] DEBUG Calling 'git remote'
2025-02-28 00:49:12,835 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:49:12,836 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-02-28 00:49:12,836 [ scc.git] DEBUG Calling 'git remote'
2025-02-28 00:49:12,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:49:12,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-02-28 00:49:12,840 [ scc.git] DEBUG Calling 'git remote'
2025-02-28 00:49:12,845 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:49:12,845 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-02-28 00:49:12,845 [ scc.git] DEBUG Calling 'git remote'
2025-02-28 00:49:12,850 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:49:12,850 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-02-28 00:49:12,850 [ scc.git] DEBUG Calling 'git remote'
2025-02-28 00:49:12,854 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:49:12,855 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-02-28 00:49:12,855 [ scc.git] DEBUG Calling 'git remote'
2025-02-28 00:49:12,860 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:49:12,860 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-02-28 00:49:12,860 [ scc.git] DEBUG Calling 'git remote'
2025-02-28 00:49:12,865 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:49:12,865 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-02-28 00:49:12,865 [ scc.git] DEBUG Calling 'git remote'
2025-02-28 00:49:12,872 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:49:12,872 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-02-28 00:49:12,872 [ scc.git] DEBUG Calling 'git remote'
2025-02-28 00:49:12,877 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:49:12,877 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-02-28 00:49:12,877 [ scc.git] DEBUG Calling 'git remote'
2025-02-28 00:49:12,881 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:49:12,882 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-02-28 00:49:12,882 [ scc.git] DEBUG Calling 'git remote'
2025-02-28 00:49:12,886 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-28 00:49:12,886 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-02-28 00:49:12,886 [ scc.git] DEBUG Calling 'git remote'
2025-02-28 00:49:12,891 [ 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 d1ebfb7] 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 1ae0fd5] 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-28 00:50:03,424 [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-28 00:50:13,105 [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-28 00:50:15,679 [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-28 00:50:20,647 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-02-28 00:51:01,115 [ 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}
