Skipping 208 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-03-30 14:41:22,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 14:41:22,336 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:22,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-30 14:41:22,848 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:23,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2025-03-30 14:41:23,019 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-03-30 14:41:23,270 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:23,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/227 HTTP/1.1" 200 None
2025-03-30 14:41:23,767 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:23,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/227/comments HTTP/1.1" 200 None
2025-03-30 14:41:24,238 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:24,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/a081a9f2892763bd49a7ad7ba425965150e76f97 HTTP/1.1" 200 None
2025-03-30 14:41:24,802 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:25,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/a081a9f2892763bd49a7ad7ba425965150e76f97/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 14:41:25,284 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:25,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/a081a9f2892763bd49a7ad7ba425965150e76f97/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-30 14:41:25,542 [ scc.repo] DEBUG ## Branches found:
2025-03-30 14:41:25,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-30 14:41:25,543 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:41:25,543 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:25,545 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 14:41:25,548 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 14:41:25,548 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 14:41:25,551 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 14:41:25,554 [ scc.git] DEBUG Already up to date.
2025-03-30 14:41:25,554 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-03-30 14:41:25,844 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-30 14:41:25,844 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-03-30 14:41:25,848 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-03-30 14:41:26,147 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-30 14:41:26,147 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-03-30 14:41:26,151 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-03-30 14:41:26,408 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-30 14:41:26,408 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-03-30 14:41:26,412 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-03-30 14:41:26,674 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-30 14:41:26,674 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-03-30 14:41:26,678 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-03-30 14:41:26,971 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-30 14:41:26,971 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-03-30 14:41:26,975 [ scc.git] DEBUG ## Unique users: []
2025-03-30 14:41:26,975 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:41:26,975 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:26,977 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-30 14:41:26,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:26,985 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-30 14:41:26,999 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-03-30 14:41:26,999 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-03-30 14:41:27,001 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-30 14:41:27,004 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-03-30 14:41:27,004 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-03-30 14:41:27,004 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-03-30 14:41:27,006 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:27,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:41:27,176 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-30 14:41:27,183 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:27,185 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-30 14:41:27,204 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-03-30 14:41:27,205 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-03-30 14:41:27,205 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-03-30 14:41:27,205 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-03-30 14:41:27,206 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-30 14:41:27,210 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-03-30 14:41:27,210 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-03-30 14:41:27,210 [ scc.git] DEBUG src/app/header.html | 5 +
2025-03-30 14:41:27,210 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-03-30 14:41:27,210 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-03-30 14:41:27,211 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-03-30 14:41:27,211 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-03-30 14:41:27,211 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-03-30 14:41:27,427 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:27,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:41:27,605 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-30 14:41:27,611 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:27,613 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-30 14:41:27,627 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-03-30 14:41:27,628 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-30 14:41:27,631 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-03-30 14:41:27,631 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-03-30 14:41:27,631 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-03-30 14:41:27,856 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:28,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:41:28,026 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-30 14:41:28,032 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:28,035 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-30 14:41:28,051 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-30 14:41:28,060 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-03-30 14:41:28,061 [ scc.git] DEBUG package.json | 2 +-
2025-03-30 14:41:28,061 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-03-30 14:41:28,277 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:28,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:41:28,439 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-30 14:41:28,446 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:28,448 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-30 14:41:28,485 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-30 14:41:28,485 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-03-30 14:41:28,486 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-30 14:41:28,486 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-30 14:41:28,489 [ scc.git] DEBUG Calling 'git reset --hard a3ccab036c3d40e366f5fe8ad361a1b15208fa18'
2025-03-30 14:41:28,497 [ scc.git] DEBUG HEAD is now at a3ccab0 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-03-30 14:41:28,690 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:28,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:41:28,858 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-30 14:41:28,861 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-03-30 14:41:28,864 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#372](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-03-30 14:41:28,866 [ scc.config] DEBUG Found github.token
2025-03-30 14:41:28,866 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-03-30 14:41:28,866 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 14:41:28,905 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:41:28,905 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:28,907 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 14:41:28,944 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 14:41:28,951 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f39c2cf3610> has no local changes
2025-03-30 14:41:28,951 [ 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)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
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#372 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/)'
2025-03-30 14:41:28,960 [ scc.git] DEBUG [detached HEAD dd89903] merge master -Dorg -Ssuccess-only
2025-03-30 14:41:28,961 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:41:28,961 [ scc.repo] DEBUG ## PRs found:
2025-03-30 14:41:29,109 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:29,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-03-30 14:41:29,667 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:29,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-03-30 14:41:30,199 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:30,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-03-30 14:41:30,734 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:31,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-30 14:41:31,278 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:31,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 14:41:31,748 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:32,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-30 14:41:32,313 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:32,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-03-30 14:41:32,483 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-03-30 14:41:32,483 [ scc.repo] DEBUG ## Branches found:
2025-03-30 14:41:32,483 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-30 14:41:32,483 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:41:32,483 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:32,486 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 14:41:32,488 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 14:41:32,488 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 14:41:32,491 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 14:41:32,494 [ scc.git] DEBUG Already up to date.
2025-03-30 14:41:32,495 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-03-30 14:41:32,788 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-03-30 14:41:32,788 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-03-30 14:41:32,792 [ scc.git] DEBUG ## Unique users: []
2025-03-30 14:41:32,792 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:41:32,792 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:32,794 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-30 14:41:32,799 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:32,801 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-30 14:41:32,809 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-30 14:41:32,813 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-03-30 14:41:32,813 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-03-30 14:41:32,813 [ scc.git] DEBUG requirements.txt | 2 +-
2025-03-30 14:41:32,813 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-03-30 14:41:32,813 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-03-30 14:41:32,813 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-03-30 14:41:32,814 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:32,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:41:32,980 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 14:41:33,019 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:41:33,019 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:33,022 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 14:41:33,059 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 14:41:33,063 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f39c2c48690> has no local changes
2025-03-30 14:41:33,063 [ 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#372 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/)'
2025-03-30 14:41:33,069 [ scc.git] DEBUG [detached HEAD bac967b] merge master -Dorg -Ssuccess-only
2025-03-30 14:41:33,070 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:41:33,070 [ scc.repo] DEBUG ## PRs found:
2025-03-30 14:41:33,231 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:33,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-03-30 14:41:33,858 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:34,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-03-30 14:41:34,441 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:34,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-03-30 14:41:34,952 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:35,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-30 14:41:35,448 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:35,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 14:41:35,910 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:36,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-30 14:41:36,424 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:36,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-03-30 14:41:36,599 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-30 14:41:36,850 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:37,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-03-30 14:41:37,360 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:37,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-03-30 14:41:37,851 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:38,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-30 14:41:38,395 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:38,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 14:41:38,852 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:39,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-30 14:41:39,381 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:39,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-03-30 14:41:39,548 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-30 14:41:39,548 [ scc.repo] DEBUG ## Branches found:
2025-03-30 14:41:39,548 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-30 14:41:39,549 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:41:39,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:39,552 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 14:41:39,554 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 14:41:39,554 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 14:41:39,557 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 14:41:39,560 [ scc.git] DEBUG Already up to date.
2025-03-30 14:41:39,560 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-03-30 14:41:39,834 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-30 14:41:39,834 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-03-30 14:41:39,838 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-03-30 14:41:40,122 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-30 14:41:40,122 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-03-30 14:41:40,126 [ scc.git] DEBUG ## Unique users: []
2025-03-30 14:41:40,126 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:41:40,126 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:40,129 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-30 14:41:40,133 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:40,135 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-30 14:41:40,149 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-03-30 14:41:40,149 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-03-30 14:41:40,149 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-30 14:41:40,149 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-30 14:41:40,149 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-30 14:41:40,149 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-30 14:41:40,152 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-30 14:41:40,157 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-30 14:41:40,158 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:40,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:41:40,319 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-30 14:41:40,324 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-30 14:41:40,327 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#372](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-03-30 14:41:40,329 [ scc.config] DEBUG Found github.token
2025-03-30 14:41:40,329 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-03-30 14:41:40,329 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-30 14:41:40,333 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:40,335 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-30 14:41:40,350 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-30 14:41:40,350 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-30 14:41:40,350 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-03-30 14:41:40,351 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-30 14:41:40,351 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-30 14:41:40,354 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-30 14:41:40,359 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-30 14:41:40,570 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:40,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:41:40,727 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-30 14:41:40,731 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-30 14:41:40,734 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#372](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2025-03-30 14:41:40,736 [ scc.config] DEBUG Found github.token
2025-03-30 14:41:40,736 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-03-30 14:41:40,737 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 14:41:40,776 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:41:40,776 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:40,778 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 14:41:40,815 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 14:41:40,820 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f39c2d1d090> has no local changes
2025-03-30 14:41:40,820 [ 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#372 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/)'
2025-03-30 14:41:40,827 [ scc.git] DEBUG [detached HEAD 09b112f] merge master -Dorg -Ssuccess-only
2025-03-30 14:41:40,828 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:41:40,828 [ scc.repo] DEBUG ## PRs found:
2025-03-30 14:41:40,978 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:41,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-03-30 14:41:41,578 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:41,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-03-30 14:41:41,816 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-30 14:41:42,067 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:42,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-30 14:41:42,593 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:42,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 14:41:43,127 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:43,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-30 14:41:43,616 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:43,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-30 14:41:44,174 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:44,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-03-30 14:41:44,344 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-30 14:41:44,595 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:44,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-03-30 14:41:44,833 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-30 14:41:45,083 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:45,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-30 14:41:45,645 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:45,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 14:41:46,135 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:46,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-30 14:41:46,662 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:46,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-30 14:41:47,134 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:47,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-03-30 14:41:47,320 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-30 14:41:47,571 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:47,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-03-30 14:41:48,041 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:48,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-03-30 14:41:48,533 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:48,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-03-30 14:41:49,018 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:49,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-03-30 14:41:49,485 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:49,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-03-30 14:41:49,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:50,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-03-30 14:41:50,449 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:50,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-03-30 14:41:50,763 [ scc.repo] DEBUG ## Branches found:
2025-03-30 14:41:50,763 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-30 14:41:50,763 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:41:50,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:50,766 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 14:41:50,768 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 14:41:50,768 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 14:41:50,771 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 14:41:50,774 [ scc.git] DEBUG Already up to date.
2025-03-30 14:41:50,774 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-03-30 14:41:51,075 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-30 14:41:51,075 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-03-30 14:41:51,080 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-03-30 14:41:51,350 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-30 14:41:51,350 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-03-30 14:41:51,354 [ scc.git] DEBUG ## Unique users: []
2025-03-30 14:41:51,354 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:41:51,355 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:51,357 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-30 14:41:51,360 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:51,362 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 140 (Bump vite from 4.2.3 to 4.5.9) 6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-30 14:41:51,370 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-30 14:41:51,373 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-03-30 14:41:51,373 [ scc.git] DEBUG package.json | 2 +-
2025-03-30 14:41:51,373 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-03-30 14:41:51,375 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:51,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:41:51,546 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-03-30 14:41:51,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:51,551 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 141 (Bump axios from 1.6.0 to 1.8.2) de7db17cd62b498179713df276cff151a1f36d80'
2025-03-30 14:41:51,561 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-30 14:41:51,561 [ scc.git] DEBUG Auto-merging package.json
2025-03-30 14:41:51,562 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-30 14:41:51,565 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-03-30 14:41:51,565 [ scc.git] DEBUG package.json | 2 +-
2025-03-30 14:41:51,565 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-03-30 14:41:51,797 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:51,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:41:51,969 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 14:41:52,009 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:41:52,009 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:52,011 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 14:41:52,050 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 14:41:52,054 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f39c2c40910> has no local changes
2025-03-30 14:41:52,054 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
Generated by OMERO-plugins-push#372 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/)'
2025-03-30 14:41:52,060 [ scc.git] DEBUG [detached HEAD 7cc0407] merge master -Dorg -Ssuccess-only
2025-03-30 14:41:52,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:41:52,061 [ scc.repo] DEBUG ## PRs found:
2025-03-30 14:41:52,220 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:52,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-03-30 14:41:52,406 [ scc.repo] DEBUG ## Branches found:
2025-03-30 14:41:52,406 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-30 14:41:52,406 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:41:52,406 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:52,408 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 14:41:52,411 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 14:41:52,411 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 14:41:52,414 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 14:41:52,416 [ scc.git] DEBUG Already up to date.
2025-03-30 14:41:52,417 [ scc.git] DEBUG ## Unique users: []
2025-03-30 14:41:52,417 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:41:52,417 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:52,419 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 14:41:52,457 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:41:52,457 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:52,460 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 14:41:52,498 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 14:41:52,501 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f39c2d335d0> has no local changes
2025-03-30 14:41:52,501 [ 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#372 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/)'
2025-03-30 14:41:52,507 [ scc.git] DEBUG [detached HEAD 29ac0e1] merge master -Dorg -Ssuccess-only
2025-03-30 14:41:52,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:41:52,508 [ scc.repo] DEBUG ## PRs found:
2025-03-30 14:41:52,657 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:52,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-03-30 14:41:53,156 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:53,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-03-30 14:41:53,669 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:53,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-03-30 14:41:54,157 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:54,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-03-30 14:41:54,403 [ scc.repo] DEBUG ## Branches found:
2025-03-30 14:41:54,404 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-30 14:41:54,404 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:41:54,404 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:54,406 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 14:41:54,409 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 14:41:54,409 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 14:41:54,412 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 14:41:54,415 [ scc.git] DEBUG Already up to date.
2025-03-30 14:41:54,415 [ scc.git] DEBUG ## Unique users: []
2025-03-30 14:41:54,415 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:41:54,415 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:54,417 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 14:41:54,455 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:41:54,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:54,457 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 14:41:54,497 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 14:41:54,500 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f39c2df1c10> has no local changes
2025-03-30 14:41:54,500 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Generated by OMERO-plugins-push#372 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/)'
2025-03-30 14:41:54,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:41:54,507 [ scc.git] DEBUG [detached HEAD 27ecb59] merge master -Dorg -Ssuccess-only
2025-03-30 14:41:54,507 [ scc.repo] DEBUG ## PRs found:
2025-03-30 14:41:54,654 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:55,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-03-30 14:41:55,290 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:55,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-03-30 14:41:55,779 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:55,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-03-30 14:41:56,248 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:56,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-30 14:41:56,792 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:56,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 14:41:57,239 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:57,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-30 14:41:57,801 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:57,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-03-30 14:41:57,982 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-30 14:41:57,982 [ scc.repo] DEBUG ## Branches found:
2025-03-30 14:41:57,982 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-30 14:41:57,982 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:41:57,982 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:57,985 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 14:41:57,987 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 14:41:57,987 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 14:41:57,990 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 14:41:57,993 [ scc.git] DEBUG Already up to date.
2025-03-30 14:41:57,993 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-03-30 14:41:58,271 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-03-30 14:41:58,271 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-03-30 14:41:58,275 [ scc.git] DEBUG ## Unique users: []
2025-03-30 14:41:58,275 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:41:58,275 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:58,278 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-30 14:41:58,281 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:58,283 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-30 14:41:58,292 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-03-30 14:41:58,292 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-03-30 14:41:58,292 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-03-30 14:41:58,292 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-03-30 14:41:58,292 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-03-30 14:41:58,292 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-03-30 14:41:58,292 [ scc.git] DEBUG Auto-merging setup.py
2025-03-30 14:41:58,292 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-03-30 14:41:58,292 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-30 14:41:58,293 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-30 14:41:58,295 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-30 14:41:58,299 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-03-30 14:41:58,301 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:58,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:41:58,459 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-30 14:41:58,462 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-30 14:41:58,466 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#372](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/views.py
- omero_signup/signup_settings.py
- setup.py
--conflicts
2025-03-30 14:41:58,468 [ scc.config] DEBUG Found github.token
2025-03-30 14:41:58,468 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-03-30 14:41:58,468 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 14:41:58,506 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:41:58,506 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:41:58,508 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 14:41:58,547 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 14:41:58,550 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f39c033d010> has no local changes
2025-03-30 14:41:58,550 [ 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#372 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/)'
2025-03-30 14:41:58,557 [ scc.git] DEBUG [detached HEAD bf161bf] merge master -Dorg -Ssuccess-only
2025-03-30 14:41:58,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:41:58,557 [ scc.repo] DEBUG ## PRs found:
2025-03-30 14:41:58,710 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:58,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-03-30 14:41:59,212 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:59,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-03-30 14:41:59,713 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:41:59,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-03-30 14:42:00,251 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:00,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-03-30 14:42:00,764 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:01,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 14:42:01,280 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:01,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-30 14:42:01,758 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:02,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-03-30 14:42:02,253 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:02,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-03-30 14:42:02,709 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:02,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-03-30 14:42:03,210 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:03,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-03-30 14:42:03,673 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:03,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-30 14:42:04,223 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:04,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 14:42:04,692 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:04,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-30 14:42:05,140 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:05,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-03-30 14:42:05,307 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-30 14:42:05,307 [ scc.repo] DEBUG ## Branches found:
2025-03-30 14:42:05,307 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-30 14:42:05,307 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:05,307 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:05,310 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 14:42:05,312 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 14:42:05,312 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 14:42:05,315 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 14:42:05,319 [ scc.git] DEBUG Already up to date.
2025-03-30 14:42:05,319 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-03-30 14:42:05,620 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-03-30 14:42:05,620 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-03-30 14:42:05,624 [ scc.git] DEBUG ## Unique users: []
2025-03-30 14:42:05,624 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:05,624 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:05,626 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-03-30 14:42:05,631 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:05,633 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2025-03-30 14:42:05,645 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-30 14:42:05,649 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-03-30 14:42:05,649 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-03-30 14:42:05,649 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-03-30 14:42:05,649 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-03-30 14:42:05,649 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-03-30 14:42:05,649 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-03-30 14:42:05,649 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-03-30 14:42:05,650 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:05,650 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-03-30 14:42:05,650 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-03-30 14:42:05,650 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-03-30 14:42:05,650 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-03-30 14:42:05,650 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-03-30 14:42:05,650 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-03-30 14:42:05,650 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-03-30 14:42:05,650 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-03-30 14:42:05,651 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-03-30 14:42:05,651 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-03-30 14:42:05,651 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-03-30 14:42:05,651 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-03-30 14:42:05,651 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-03-30 14:42:05,651 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-03-30 14:42:05,651 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-03-30 14:42:05,651 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-03-30 14:42:05,651 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-03-30 14:42:05,651 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-03-30 14:42:05,651 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-03-30 14:42:05,651 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-03-30 14:42:05,651 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-03-30 14:42:05,651 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-03-30 14:42:05,651 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-03-30 14:42:05,651 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-03-30 14:42:05,651 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-03-30 14:42:05,651 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-03-30 14:42:05,651 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-03-30 14:42:05,651 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-03-30 14:42:05,651 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-03-30 14:42:05,651 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-03-30 14:42:05,651 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-03-30 14:42:05,651 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-03-30 14:42:05,651 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-03-30 14:42:05,651 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-03-30 14:42:05,651 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-03-30 14:42:05,651 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-03-30 14:42:05,651 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-03-30 14:42:05,651 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-03-30 14:42:05,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:05,818 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 14:42:05,856 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:05,856 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:05,858 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 14:42:05,898 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 14:42:05,902 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f39c2d1c750> has no local changes
2025-03-30 14:42:05,902 [ 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#372 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/)'
2025-03-30 14:42:05,909 [ scc.git] DEBUG [detached HEAD 56eed7d] merge master -Dorg -Ssuccess-only
2025-03-30 14:42:05,910 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:05,910 [ scc.repo] DEBUG ## PRs found:
2025-03-30 14:42:06,069 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:06,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-03-30 14:42:06,295 [ scc.repo] DEBUG ## Branches found:
2025-03-30 14:42:06,295 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-30 14:42:06,295 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:06,295 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:06,297 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 14:42:06,300 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 14:42:06,300 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 14:42:06,303 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 14:42:06,305 [ scc.git] DEBUG Already up to date.
2025-03-30 14:42:06,306 [ scc.git] DEBUG ## Unique users: []
2025-03-30 14:42:06,306 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:06,306 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:06,308 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 14:42:06,347 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:06,347 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:06,349 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 14:42:06,386 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 14:42:06,389 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f39c2d1c710> has no local changes
2025-03-30 14:42:06,389 [ 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#372 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/)'
2025-03-30 14:42:06,396 [ scc.git] DEBUG [detached HEAD 9fcd66b] merge master -Dorg -Ssuccess-only
2025-03-30 14:42:06,396 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:06,396 [ scc.repo] DEBUG ## PRs found:
2025-03-30 14:42:06,546 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:06,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-03-30 14:42:07,074 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:07,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-03-30 14:42:07,617 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:07,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-03-30 14:42:08,068 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:08,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-30 14:42:08,511 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:08,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 14:42:09,004 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:09,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-30 14:42:09,518 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:09,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-30 14:42:10,040 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:10,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-03-30 14:42:10,206 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-03-30 14:42:10,206 [ scc.repo] DEBUG ## Branches found:
2025-03-30 14:42:10,206 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-30 14:42:10,206 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:10,206 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:10,208 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 14:42:10,211 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 14:42:10,211 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 14:42:10,214 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 14:42:10,217 [ scc.git] DEBUG Already up to date.
2025-03-30 14:42:10,217 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-03-30 14:42:10,513 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-03-30 14:42:10,513 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-03-30 14:42:10,517 [ scc.git] DEBUG ## Unique users: []
2025-03-30 14:42:10,517 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:10,518 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:10,520 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-03-30 14:42:10,523 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:10,525 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-03-30 14:42:10,533 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-30 14:42:10,536 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-03-30 14:42:10,536 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-03-30 14:42:10,536 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-03-30 14:42:10,536 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-03-30 14:42:10,536 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-03-30 14:42:10,537 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:10,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:10,701 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 14:42:10,739 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:10,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:10,742 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 14:42:10,779 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 14:42:10,783 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f39c0379c10> has no local changes
2025-03-30 14:42:10,783 [ 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#372 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/)'
2025-03-30 14:42:10,789 [ scc.git] DEBUG [detached HEAD 9ce262a] merge master -Dorg -Ssuccess-only
2025-03-30 14:42:10,789 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:10,789 [ scc.git] INFO Overriding base-branch from master to main
2025-03-30 14:42:10,790 [ scc.repo] DEBUG ## PRs found:
2025-03-30 14:42:10,952 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:11,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-03-30 14:42:11,498 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:11,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-03-30 14:42:12,001 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:12,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-03-30 14:42:12,508 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:12,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-03-30 14:42:13,081 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:13,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 14:42:13,585 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:13,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-30 14:42:14,066 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:14,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-03-30 14:42:14,546 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:14,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-03-30 14:42:15,022 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:15,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-03-30 14:42:15,482 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:15,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-30 14:42:16,006 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:16,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 14:42:16,518 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:16,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-30 14:42:17,060 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:17,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-03-30 14:42:17,232 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-30 14:42:17,232 [ scc.repo] DEBUG ## Branches found:
2025-03-30 14:42:17,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-30 14:42:17,232 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:17,232 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:17,235 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-03-30 14:42:17,237 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 14:42:17,237 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-03-30 14:42:17,240 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-03-30 14:42:17,243 [ scc.git] DEBUG Already up to date.
2025-03-30 14:42:17,243 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-03-30 14:42:17,519 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-03-30 14:42:17,519 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-03-30 14:42:17,523 [ scc.git] DEBUG ## Unique users: []
2025-03-30 14:42:17,523 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:17,523 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:17,525 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-30 14:42:17,528 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:17,531 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-30 14:42:17,538 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-03-30 14:42:17,539 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-03-30 14:42:17,539 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-30 14:42:17,539 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-30 14:42:17,542 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-30 14:42:17,546 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-03-30 14:42:17,547 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:17,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:17,708 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-30 14:42:17,711 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-30 14:42:17,714 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#372](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-03-30 14:42:17,716 [ scc.config] DEBUG Found github.token
2025-03-30 14:42:17,716 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-03-30 14:42:17,716 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 14:42:17,754 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:17,754 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:17,756 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 14:42:17,793 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 14:42:17,797 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f39c0379890> has no local changes
2025-03-30 14:42:17,797 [ 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#372 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/)'
2025-03-30 14:42:17,803 [ scc.git] DEBUG [detached HEAD 4558897] merge master -Dorg -Ssuccess-only
2025-03-30 14:42:17,804 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:17,804 [ scc.repo] DEBUG ## PRs found:
2025-03-30 14:42:17,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:18,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-03-30 14:42:18,139 [ scc.repo] DEBUG ## Branches found:
2025-03-30 14:42:18,139 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-30 14:42:18,139 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:18,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:18,142 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 14:42:18,144 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 14:42:18,144 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 14:42:18,147 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 14:42:18,150 [ scc.git] DEBUG Already up to date.
2025-03-30 14:42:18,150 [ scc.git] DEBUG ## Unique users: []
2025-03-30 14:42:18,150 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:18,150 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:18,152 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 14:42:18,190 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:18,190 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:18,192 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 14:42:18,229 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 14:42:18,233 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f39c038bf10> has no local changes
2025-03-30 14:42:18,233 [ 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#372 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/)'
2025-03-30 14:42:18,239 [ scc.git] DEBUG [detached HEAD ec0170e] merge master -Dorg -Ssuccess-only
2025-03-30 14:42:18,239 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:18,239 [ scc.repo] DEBUG ## PRs found:
2025-03-30 14:42:18,390 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:18,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-03-30 14:42:18,600 [ scc.repo] DEBUG ## Branches found:
2025-03-30 14:42:18,601 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-30 14:42:18,601 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:18,601 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:18,603 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 14:42:18,605 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 14:42:18,605 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 14:42:18,608 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 14:42:18,611 [ scc.git] DEBUG Already up to date.
2025-03-30 14:42:18,611 [ scc.git] DEBUG ## Unique users: []
2025-03-30 14:42:18,611 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:18,611 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:18,614 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 14:42:18,651 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:18,651 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:18,653 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 14:42:18,690 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 14:42:18,694 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f39c03d3390> has no local changes
2025-03-30 14:42:18,694 [ 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#372 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/)'
2025-03-30 14:42:18,700 [ scc.git] DEBUG [detached HEAD fd67142] merge master -Dorg -Ssuccess-only
2025-03-30 14:42:18,700 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:18,701 [ scc.repo] DEBUG ## PRs found:
2025-03-30 14:42:18,852 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:19,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-03-30 14:42:19,350 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:19,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-03-30 14:42:19,868 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:20,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-03-30 14:42:20,337 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:20,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-30 14:42:20,860 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:21,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 14:42:21,401 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:21,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-30 14:42:21,844 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:22,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-03-30 14:42:22,019 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-03-30 14:42:22,019 [ scc.repo] DEBUG ## Branches found:
2025-03-30 14:42:22,019 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-30 14:42:22,019 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:22,019 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:22,022 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 14:42:22,024 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 14:42:22,025 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 14:42:22,027 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 14:42:22,030 [ scc.git] DEBUG Already up to date.
2025-03-30 14:42:22,030 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-03-30 14:42:22,320 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-03-30 14:42:22,320 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-03-30 14:42:22,325 [ scc.git] DEBUG ## Unique users: []
2025-03-30 14:42:22,325 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:22,325 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:22,327 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-30 14:42:22,331 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:22,333 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-30 14:42:22,341 [ scc.git] DEBUG Auto-merging Dockerfile
2025-03-30 14:42:22,341 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-03-30 14:42:22,342 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-30 14:42:22,342 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-30 14:42:22,345 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-30 14:42:22,350 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-03-30 14:42:22,351 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:22,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:22,508 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-30 14:42:22,511 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-30 14:42:22,514 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#372](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-03-30 14:42:22,516 [ scc.config] DEBUG Found github.token
2025-03-30 14:42:22,516 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-03-30 14:42:22,516 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 14:42:22,556 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:22,556 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:22,558 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 14:42:22,597 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 14:42:22,601 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f39c0344310> has no local changes
2025-03-30 14:42:22,602 [ 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#372 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/)'
2025-03-30 14:42:22,648 [ scc.git] DEBUG [detached HEAD f5b94cf] merge master -Dorg -Ssuccess-only
2025-03-30 14:42:22,649 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:22,649 [ scc.git] INFO Overriding base-branch from master to develop
2025-03-30 14:42:22,649 [ scc.repo] DEBUG ## PRs found:
2025-03-30 14:42:22,759 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:23,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-03-30 14:42:23,354 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:23,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-03-30 14:42:23,866 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:24,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-03-30 14:42:24,346 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:24,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-30 14:42:24,836 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:25,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 14:42:25,397 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:25,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-30 14:42:25,894 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:26,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-30 14:42:26,352 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:26,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-03-30 14:42:26,521 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-30 14:42:26,772 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:27,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-03-30 14:42:27,303 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:27,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-03-30 14:42:27,785 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:27,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-30 14:42:28,237 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:28,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 14:42:28,683 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:28,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-30 14:42:29,203 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:29,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-03-30 14:42:29,368 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-30 14:42:29,620 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:29,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-03-30 14:42:30,098 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:30,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-03-30 14:42:30,608 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:30,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-03-30 14:42:31,109 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:31,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-03-30 14:42:31,378 [ scc.repo] DEBUG ## Branches found:
2025-03-30 14:42:31,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-30 14:42:31,379 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:31,379 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:31,381 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-03-30 14:42:31,384 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 14:42:31,384 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-03-30 14:42:31,387 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-03-30 14:42:31,395 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-03-30 14:42:31,627 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:31,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-03-30 14:42:31,999 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-03-30 14:42:32,320 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-30 14:42:32,320 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-03-30 14:42:32,324 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-03-30 14:42:32,604 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-30 14:42:32,604 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-03-30 14:42:32,608 [ scc.git] DEBUG ## Unique users: []
2025-03-30 14:42:32,608 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:32,608 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:32,611 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-30 14:42:32,616 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:32,619 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-30 14:42:32,630 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-03-30 14:42:32,630 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-30 14:42:32,630 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-30 14:42:32,633 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-03-30 14:42:32,637 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-03-30 14:42:32,638 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:32,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:32,831 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-30 14:42:32,836 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-03-30 14:42:32,840 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#372](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-03-30 14:42:32,842 [ scc.config] DEBUG Found github.token
2025-03-30 14:42:32,842 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-03-30 14:42:32,842 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-30 14:42:32,847 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:32,849 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-30 14:42:32,858 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-30 14:42:32,861 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-03-30 14:42:32,861 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-03-30 14:42:33,082 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:33,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:33,257 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 14:42:33,296 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 14:42:33,296 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 14:42:33,298 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 14:42:33,335 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 14:42:33,338 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f39c039b810> has no local changes
2025-03-30 14:42:33,338 [ 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)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
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#372 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/)'
2025-03-30 14:42:33,345 [ scc.git] DEBUG [detached HEAD 351c8b9] merge master -Dorg -Ssuccess-only
2025-03-30 14:42:33,345 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:33,345 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 14:42:33,418 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-03-30 14:42:33,508 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:33,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:33,680 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-03-30 14:42:33,682 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-03-30 14:42:33,927 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:34,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:34,091 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-03-30 14:42:34,093 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-03-30 14:42:34,338 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:34,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:34,504 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-03-30 14:42:34,506 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-03-30 14:42:34,750 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:34,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:34,915 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-03-30 14:42:35,160 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:35,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:35,321 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-03-30 14:42:35,323 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-03-30 14:42:35,568 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:35,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:35,769 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-03-30 14:42:35,771 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-03-30 14:42:36,016 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:36,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:36,204 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-03-30 14:42:36,205 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-03-30 14:42:36,450 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:36,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:36,650 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-03-30 14:42:36,652 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-03-30 14:42:36,896 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:37,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:37,069 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-03-30 14:42:37,071 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-03-30 14:42:37,316 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:37,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:37,486 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-03-30 14:42:37,488 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-03-30 14:42:37,732 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:37,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:37,901 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-03-30 14:42:37,903 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-03-30 14:42:38,148 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:38,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:38,324 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-03-30 14:42:38,326 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-03-30 14:42:38,571 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:38,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:38,752 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-03-30 14:42:38,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:39,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:39,162 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-03-30 14:42:39,407 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:39,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:39,572 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-03-30 14:42:39,574 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-03-30 14:42:39,819 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:39,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:40,000 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-03-30 14:42:40,244 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:40,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:40,404 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-03-30 14:42:40,649 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:40,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:40,847 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-03-30 14:42:40,849 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-03-30 14:42:41,094 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:41,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:41,255 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-03-30 14:42:41,258 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-03-30 14:42:41,502 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:41,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:41,667 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-03-30 14:42:41,669 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-03-30 14:42:41,914 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:42,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:42,075 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-03-30 14:42:42,077 [ scc.config] DEBUG Found submodule.scripts.url
2025-03-30 14:42:42,322 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 14:42:42,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 14:42:42,487 [ scc.config] DEBUG Found submodule.scripts.branch
2025-03-30 14:42:42,487 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 14:42:42,581 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f39c2d46b50> has local changes
2025-03-30 14:42:42,581 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
- PR 167 dominikl 'Add extinfo command'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- 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'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
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)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
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#372 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/372/)'
2025-03-30 14:42:42,595 [ scc.git] DEBUG [detached HEAD 6e98d17] merge master -Dorg -Ssuccess-only
2025-03-30 14:42:42,595 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-03-30 14:42:42,595 [ scc.merge] INFO Repository: ome/omero-plugins
2025-03-30 14:42:42,595 [ scc.merge] INFO Already up to date.
2025-03-30 14:42:42,595 [ scc.merge] INFO
2025-03-30 14:42:42,595 [ scc.merge] INFO Merged PRs:
2025-03-30 14:42:42,596 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-03-30 14:42:42,596 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-03-30 14:42:42,596 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-03-30 14:42:42,596 [ scc.merge] INFO
2025-03-30 14:42:42,596 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-03-30 14:42:42,596 [ scc.merge] INFO Already up to date.
2025-03-30 14:42:42,596 [ scc.merge] INFO
2025-03-30 14:42:42,596 [ scc.merge] INFO
2025-03-30 14:42:42,596 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-03-30 14:42:42,596 [ scc.merge] INFO Excluded PRs:
2025-03-30 14:42:42,596 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-03-30 14:42:42,596 [ scc.merge] INFO Already up to date.
2025-03-30 14:42:42,596 [ scc.merge] INFO
2025-03-30 14:42:42,596 [ scc.merge] INFO
2025-03-30 14:42:42,596 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-03-30 14:42:42,596 [ scc.merge] INFO Excluded PRs:
2025-03-30 14:42:42,596 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-03-30 14:42:42,596 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-03-30 14:42:42,596 [ scc.merge] INFO Already up to date.
2025-03-30 14:42:42,596 [ scc.merge] INFO
2025-03-30 14:42:42,596 [ scc.merge] INFO Merged PRs:
2025-03-30 14:42:42,596 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-03-30 14:42:42,596 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-03-30 14:42:42,596 [ scc.merge] INFO
2025-03-30 14:42:42,596 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-03-30 14:42:42,596 [ scc.merge] INFO Excluded PRs:
2025-03-30 14:42:42,596 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-03-30 14:42:42,596 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-30 14:42:42,596 [ scc.merge] INFO Already up to date.
2025-03-30 14:42:42,596 [ scc.merge] INFO
2025-03-30 14:42:42,596 [ scc.merge] INFO Merged PRs:
2025-03-30 14:42:42,596 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-03-30 14:42:42,596 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-03-30 14:42:42,596 [ scc.merge] INFO
2025-03-30 14:42:42,596 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-30 14:42:42,596 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-03-30 14:42:42,596 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-03-30 14:42:42,596 [ scc.merge] INFO
2025-03-30 14:42:42,596 [ scc.merge] INFO Repository: ome/omero-figure
2025-03-30 14:42:42,597 [ scc.merge] INFO Excluded PRs:
2025-03-30 14:42:42,597 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-03-30 14:42:42,597 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-03-30 14:42:42,597 [ scc.merge] INFO Already up to date.
2025-03-30 14:42:42,597 [ scc.merge] INFO
2025-03-30 14:42:42,597 [ scc.merge] INFO Merged PRs:
2025-03-30 14:42:42,597 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-03-30 14:42:42,597 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-03-30 14:42:42,597 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-03-30 14:42:42,597 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-03-30 14:42:42,597 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-03-30 14:42:42,597 [ scc.merge] INFO
2025-03-30 14:42:42,597 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-30 14:42:42,597 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-03-30 14:42:42,597 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-03-30 14:42:42,597 [ scc.merge] INFO
2025-03-30 14:42:42,597 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-03-30 14:42:42,597 [ scc.merge] INFO Already up to date.
2025-03-30 14:42:42,597 [ scc.merge] INFO
2025-03-30 14:42:42,597 [ scc.merge] INFO Merged PRs:
2025-03-30 14:42:42,597 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-03-30 14:42:42,597 [ scc.merge] INFO
2025-03-30 14:42:42,597 [ scc.merge] INFO Repository: ome/omero-gallery
2025-03-30 14:42:42,597 [ scc.merge] INFO Already up to date.
2025-03-30 14:42:42,597 [ scc.merge] INFO
2025-03-30 14:42:42,597 [ scc.merge] INFO Merged PRs:
2025-03-30 14:42:42,597 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-03-30 14:42:42,597 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-03-30 14:42:42,597 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-03-30 14:42:42,597 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-03-30 14:42:42,597 [ scc.merge] INFO
2025-03-30 14:42:42,597 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-30 14:42:42,597 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-03-30 14:42:42,597 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-03-30 14:42:42,597 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-03-30 14:42:42,597 [ scc.merge] INFO
2025-03-30 14:42:42,597 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-03-30 14:42:42,597 [ scc.merge] INFO Excluded PRs:
2025-03-30 14:42:42,597 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-03-30 14:42:42,598 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-03-30 14:42:42,598 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-03-30 14:42:42,598 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-03-30 14:42:42,598 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-03-30 14:42:42,598 [ scc.merge] INFO Already up to date.
2025-03-30 14:42:42,598 [ scc.merge] INFO
2025-03-30 14:42:42,598 [ scc.merge] INFO Merged PRs:
2025-03-30 14:42:42,598 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-03-30 14:42:42,598 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-03-30 14:42:42,598 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-30 14:42:42,598 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-30 14:42:42,598 [ scc.merge] INFO
2025-03-30 14:42:42,598 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-30 14:42:42,598 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-30 14:42:42,598 [ scc.merge] INFO
2025-03-30 14:42:42,598 [ scc.merge] INFO Repository: ome/omero-mapr
2025-03-30 14:42:42,598 [ scc.merge] INFO Excluded PRs:
2025-03-30 14:42:42,598 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-03-30 14:42:42,598 [ scc.merge] INFO Already up to date.
2025-03-30 14:42:42,598 [ scc.merge] INFO
2025-03-30 14:42:42,598 [ scc.merge] INFO Merged PRs:
2025-03-30 14:42:42,598 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-03-30 14:42:42,598 [ scc.merge] INFO
2025-03-30 14:42:42,598 [ scc.merge] INFO Repository: ome/omero-metadata
2025-03-30 14:42:42,598 [ scc.merge] INFO Already up to date.
2025-03-30 14:42:42,598 [ scc.merge] INFO
2025-03-30 14:42:42,598 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-30 14:42:42,598 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-30 14:42:42,598 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-30 14:42:42,598 [ scc.merge] INFO
2025-03-30 14:42:42,598 [ scc.merge] INFO Repository: ome/omero-parade
2025-03-30 14:42:42,598 [ scc.merge] INFO Excluded PRs:
2025-03-30 14:42:42,598 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-03-30 14:42:42,598 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-03-30 14:42:42,598 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-03-30 14:42:42,598 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-03-30 14:42:42,598 [ scc.merge] INFO Already up to date.
2025-03-30 14:42:42,598 [ scc.merge] INFO
2025-03-30 14:42:42,598 [ scc.merge] INFO Merged PRs:
2025-03-30 14:42:42,598 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-30 14:42:42,599 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-30 14:42:42,599 [ scc.merge] INFO
2025-03-30 14:42:42,599 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-03-30 14:42:42,599 [ scc.merge] INFO Already up to date.
2025-03-30 14:42:42,599 [ scc.merge] INFO
2025-03-30 14:42:42,599 [ scc.merge] INFO
2025-03-30 14:42:42,599 [ scc.merge] INFO Repository: ome/omero-rois
2025-03-30 14:42:42,599 [ scc.merge] INFO Excluded PRs:
2025-03-30 14:42:42,599 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-03-30 14:42:42,599 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-30 14:42:42,599 [ scc.merge] INFO Already up to date.
2025-03-30 14:42:42,599 [ scc.merge] INFO
2025-03-30 14:42:42,599 [ scc.merge] INFO
2025-03-30 14:42:42,599 [ scc.merge] INFO Repository: ome/omero-signup
2025-03-30 14:42:42,599 [ scc.merge] INFO Already up to date.
2025-03-30 14:42:42,599 [ scc.merge] INFO
2025-03-30 14:42:42,599 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-30 14:42:42,599 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-30 14:42:42,599 [ scc.merge] INFO
2025-03-30 14:42:42,599 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-03-30 14:42:42,599 [ scc.merge] INFO Excluded PRs:
2025-03-30 14:42:42,599 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-03-30 14:42:42,599 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-03-30 14:42:42,599 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-03-30 14:42:42,599 [ scc.merge] INFO Already up to date.
2025-03-30 14:42:42,599 [ scc.merge] INFO
2025-03-30 14:42:42,599 [ scc.merge] INFO Merged PRs:
2025-03-30 14:42:42,599 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-30 14:42:42,599 [ scc.merge] INFO
2025-03-30 14:42:42,599 [ scc.merge] INFO Repository: ome/omero-upload
2025-03-30 14:42:42,599 [ scc.merge] INFO Already up to date.
2025-03-30 14:42:42,599 [ scc.merge] INFO
2025-03-30 14:42:42,599 [ scc.merge] INFO
2025-03-30 14:42:42,599 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-03-30 14:42:42,599 [ scc.merge] INFO Already up to date.
2025-03-30 14:42:42,599 [ scc.merge] INFO
2025-03-30 14:42:42,599 [ scc.merge] INFO Merged PRs:
2025-03-30 14:42:42,599 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-03-30 14:42:42,599 [ scc.merge] INFO
2025-03-30 14:42:42,600 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-03-30 14:42:42,600 [ scc.merge] INFO Excluded PRs:
2025-03-30 14:42:42,600 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-03-30 14:42:42,600 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-03-30 14:42:42,600 [ scc.merge] INFO Already up to date.
2025-03-30 14:42:42,600 [ scc.merge] INFO
2025-03-30 14:42:42,600 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-30 14:42:42,600 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-30 14:42:42,600 [ scc.merge] INFO
2025-03-30 14:42:42,600 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-03-30 14:42:42,600 [ scc.merge] INFO Already up to date.
2025-03-30 14:42:42,600 [ scc.merge] INFO
2025-03-30 14:42:42,600 [ scc.merge] INFO
2025-03-30 14:42:42,600 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-03-30 14:42:42,600 [ scc.merge] INFO Already up to date.
2025-03-30 14:42:42,600 [ scc.merge] INFO
2025-03-30 14:42:42,600 [ scc.merge] INFO
2025-03-30 14:42:42,600 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-03-30 14:42:42,600 [ scc.merge] INFO Already up to date.
2025-03-30 14:42:42,600 [ scc.merge] INFO
2025-03-30 14:42:42,600 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-30 14:42:42,600 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-03-30 14:42:42,600 [ scc.merge] INFO
2025-03-30 14:42:42,600 [ scc.merge] INFO Repository: ome/scripts
2025-03-30 14:42:42,600 [ scc.merge] INFO Excluded PRs:
2025-03-30 14:42:42,600 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-03-30 14:42:42,600 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-03-30 14:42:42,600 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-03-30 14:42:42,600 [ scc.merge] INFO Previously merged:
2025-03-30 14:42:42,600 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-03-30 14:42:42,600 [ scc.merge] INFO
2025-03-30 14:42:42,600 [ scc.merge] INFO Merged PRs:
2025-03-30 14:42:42,600 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-30 14:42:42,600 [ scc.merge] INFO
2025-03-30 14:42:42,600 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-30 14:42:42,600 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-30 14:42:42,600 [ scc.merge] INFO
2025-03-30 14:42:42,600 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-03-30 14:42:42,601 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 14:42:42,603 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-03-30 14:42:42,603 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 14:42:42,605 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:42,605 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-03-30 14:42:42,605 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 14:42:42,607 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:42,607 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-03-30 14:42:42,607 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 14:42:42,609 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:42,610 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-03-30 14:42:42,610 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 14:42:42,612 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:42,612 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-03-30 14:42:42,612 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 14:42:42,614 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:42,614 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-03-30 14:42:42,614 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 14:42:42,616 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:42,616 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-03-30 14:42:42,616 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 14:42:42,618 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:42,619 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-30 14:42:42,619 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 14:42:42,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:42,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-30 14:42:42,621 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 14:42:42,623 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:42,623 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-30 14:42:42,623 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 14:42:42,625 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:42,625 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-30 14:42:42,625 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 14:42:42,627 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:42,627 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-30 14:42:42,627 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 14:42:42,630 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:42,630 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-30 14:42:42,630 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 14:42:42,632 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:42,632 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-30 14:42:42,632 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 14:42:42,634 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:42,634 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-30 14:42:42,634 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 14:42:42,636 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:42,636 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-30 14:42:42,636 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 14:42:42,638 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:42,638 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-30 14:42:42,638 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 14:42:42,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:42,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-30 14:42:42,641 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 14:42:42,643 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:42,643 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-30 14:42:42,643 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 14:42:42,645 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:42,645 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-30 14:42:42,645 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 14:42:42,647 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:42,647 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-30 14:42:42,648 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 14:42:42,650 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 14:42:42,650 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-30 14:42:42,650 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 14:42:42,652 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: 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.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: 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.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
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
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3.11: 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
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3.11: 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.3-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 7b28107] 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 621a978] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-03-30 14:43:29,866 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2025-03-30 14:43:39,324 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2025-03-30 14:43:42,103 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-30 14:43:46,808 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-30 14:44:28,288 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/9bac06d9/images/svgs/logo.svg){kind=logo}
