Skipping 187 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-03-11 00:48:15,196 [ scc.repo] DEBUG - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-11 00:48:15,450 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:15,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-03-11 00:48:15,690 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-11 00:48:15,941 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:16,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-11 00:48:16,525 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:16,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-11 00:48:17,066 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:17,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-11 00:48:17,600 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:17,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-11 00:48:18,136 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:18,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2025-03-11 00:48:18,315 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-11 00:48:18,566 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:18,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-03-11 00:48:19,046 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:19,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-03-11 00:48:19,503 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:19,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-03-11 00:48:19,995 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:20,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-03-11 00:48:20,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:20,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-11 00:48:21,017 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:21,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-11 00:48:21,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:21,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-11 00:48:22,018 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:22,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-11 00:48:22,706 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:22,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2025-03-11 00:48:22,876 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-11 00:48:23,128 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:23,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-03-11 00:48:23,603 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:23,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-03-11 00:48:24,164 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:24,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-11 00:48:24,700 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:24,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-11 00:48:25,238 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:25,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-11 00:48:25,743 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:26,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-11 00:48:26,384 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:26,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2025-03-11 00:48:26,558 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-03-11 00:48:26,810 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:27,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-03-11 00:48:27,298 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:27,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-03-11 00:48:27,770 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:28,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-11 00:48:28,285 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:28,524 [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-11 00:48:28,777 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:29,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-11 00:48:29,286 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:29,468 [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-11 00:48:29,469 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-03-11 00:48:29,469 [ scc.repo] DEBUG ## Branches found:
2025-03-11 00:48:29,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-11 00:48:29,470 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:48:29,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:48:29,476 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-11 00:48:29,482 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-11 00:48:29,482 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-11 00:48:29,488 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-11 00:48:29,494 [ scc.git] DEBUG Already up to date.
2025-03-11 00:48:29,494 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-03-11 00:48:32,065 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-11 00:48:32,065 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-03-11 00:48:32,071 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-03-11 00:48:33,741 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-11 00:48:33,741 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-03-11 00:48:33,747 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-03-11 00:48:34,097 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-11 00:48:34,097 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-03-11 00:48:34,104 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-03-11 00:48:34,431 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-11 00:48:34,431 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-03-11 00:48:34,437 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-03-11 00:48:34,743 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-11 00:48:34,743 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-03-11 00:48:34,748 [ scc.git] DEBUG ## Unique users: []
2025-03-11 00:48:34,748 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:48:34,748 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:48:34,754 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-11 00:48:34,765 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:48:34,771 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-11 00:48:34,910 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-03-11 00:48:34,910 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-03-11 00:48:34,911 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-11 00:48:34,916 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-03-11 00:48:34,916 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-03-11 00:48:34,916 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-03-11 00:48:34,919 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:35,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:48:35,094 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-11 00:48:35,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:48:35,112 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-11 00:48:35,299 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-03-11 00:48:35,299 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-03-11 00:48:35,299 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-03-11 00:48:35,299 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-03-11 00:48:35,300 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-11 00:48:35,305 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-03-11 00:48:35,305 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-03-11 00:48:35,305 [ scc.git] DEBUG src/app/header.html | 5 +
2025-03-11 00:48:35,305 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-03-11 00:48:35,305 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-03-11 00:48:35,306 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-03-11 00:48:35,306 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-03-11 00:48:35,306 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-03-11 00:48:35,346 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:35,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:48:35,504 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-11 00:48:35,515 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:48:35,522 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-11 00:48:35,642 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-03-11 00:48:35,644 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-11 00:48:35,648 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-03-11 00:48:35,648 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-03-11 00:48:35,648 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-03-11 00:48:35,756 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:35,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:48:35,923 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-11 00:48:35,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:48:35,990 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-11 00:48:36,012 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-11 00:48:36,022 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-03-11 00:48:36,023 [ scc.git] DEBUG package.json | 2 +-
2025-03-11 00:48:36,023 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-03-11 00:48:36,175 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:36,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:48:36,348 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-11 00:48:36,369 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:48:36,375 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-11 00:48:36,614 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-11 00:48:36,615 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-03-11 00:48:36,615 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-11 00:48:36,616 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-11 00:48:36,623 [ scc.git] DEBUG Calling 'git reset --hard c78f3526a07ca10d25395b49d54edf0364319f79'
2025-03-11 00:48:36,635 [ scc.git] DEBUG HEAD is now at c78f352 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-03-11 00:48:36,638 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:36,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:48:36,816 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-11 00:48:36,823 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-03-11 00:48:36,833 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#358](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-03-11 00:48:36,844 [ scc.config] DEBUG Found github.token
2025-03-11 00:48:36,844 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-03-11 00:48:36,844 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-11 00:48:36,892 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:48:36,893 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:48:36,899 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-11 00:48:36,948 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-11 00:48:36,960 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f76ec261520> has no local changes
2025-03-11 00:48:36,960 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#358 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/)'
2025-03-11 00:48:36,974 [ scc.git] DEBUG [detached HEAD cecf40b] merge master -Dorg -Ssuccess-only
2025-03-11 00:48:36,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:48:36,975 [ scc.repo] DEBUG ## PRs found:
2025-03-11 00:48:37,068 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:37,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-03-11 00:48:37,648 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:37,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-03-11 00:48:38,157 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:38,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-03-11 00:48:38,671 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:38,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-11 00:48:39,211 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:39,478 [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-11 00:48:39,731 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:39,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-11 00:48:40,244 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:40,415 [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-11 00:48:40,416 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-03-11 00:48:40,416 [ scc.repo] DEBUG ## Branches found:
2025-03-11 00:48:40,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-11 00:48:40,417 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:48:40,417 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:48:40,423 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-11 00:48:40,428 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-11 00:48:40,428 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-11 00:48:40,434 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-11 00:48:40,441 [ scc.git] DEBUG Already up to date.
2025-03-11 00:48:40,441 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-03-11 00:48:41,401 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-03-11 00:48:41,401 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-03-11 00:48:41,407 [ scc.git] DEBUG ## Unique users: []
2025-03-11 00:48:41,407 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:48:41,407 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:48:41,414 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-11 00:48:41,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:48:41,428 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-11 00:48:41,441 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-11 00:48:41,444 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-03-11 00:48:41,444 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-03-11 00:48:41,445 [ scc.git] DEBUG requirements.txt | 2 +-
2025-03-11 00:48:41,445 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-03-11 00:48:41,445 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-03-11 00:48:41,445 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-03-11 00:48:41,448 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:41,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:48:41,617 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-11 00:48:41,665 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:48:41,665 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:48:41,672 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-11 00:48:41,721 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-11 00:48:41,729 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f76edabcaf0> has no local changes
2025-03-11 00:48:41,729 [ 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#358 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/)'
2025-03-11 00:48:41,740 [ scc.git] DEBUG [detached HEAD 9932684] merge master -Dorg -Ssuccess-only
2025-03-11 00:48:41,740 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:48:41,741 [ scc.repo] DEBUG ## PRs found:
2025-03-11 00:48:41,869 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:42,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-03-11 00:48:42,403 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:42,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-03-11 00:48:42,928 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:43,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-03-11 00:48:43,463 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:43,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-11 00:48:44,003 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:44,227 [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-11 00:48:44,480 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:44,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-11 00:48:45,085 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:45,263 [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-11 00:48:45,264 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-11 00:48:45,516 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:45,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-03-11 00:48:46,022 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:46,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-03-11 00:48:46,515 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:46,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-11 00:48:47,062 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:47,362 [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-11 00:48:47,614 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:47,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-11 00:48:48,246 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:48,432 [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-11 00:48:48,433 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-11 00:48:48,433 [ scc.repo] DEBUG ## Branches found:
2025-03-11 00:48:48,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-11 00:48:48,433 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:48:48,433 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:48:48,439 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-11 00:48:48,445 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-11 00:48:48,446 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-11 00:48:48,452 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-11 00:48:48,459 [ scc.git] DEBUG Already up to date.
2025-03-11 00:48:48,459 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-03-11 00:48:49,351 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-11 00:48:49,352 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-03-11 00:48:49,357 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-03-11 00:48:49,846 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-11 00:48:49,847 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-03-11 00:48:49,852 [ scc.git] DEBUG ## Unique users: []
2025-03-11 00:48:49,852 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:48:49,853 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:48:49,859 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-11 00:48:49,867 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:48:49,873 [ 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-11 00:48:49,978 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-03-11 00:48:49,978 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-03-11 00:48:49,979 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-11 00:48:49,979 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-11 00:48:49,979 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-11 00:48:49,980 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-11 00:48:49,987 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-11 00:48:49,996 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-11 00:48:49,999 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:50,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:48:50,160 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-11 00:48:50,169 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-11 00:48:50,176 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#358](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-03-11 00:48:50,182 [ scc.config] DEBUG Found github.token
2025-03-11 00:48:50,183 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-03-11 00:48:50,183 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-11 00:48:50,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:48:50,198 [ 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-11 00:48:50,304 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-11 00:48:50,304 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-11 00:48:50,304 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-03-11 00:48:50,304 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-11 00:48:50,305 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-11 00:48:50,312 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-11 00:48:50,320 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-11 00:48:50,412 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:50,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:48:50,578 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-11 00:48:50,587 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-11 00:48:50,593 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#358](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/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-11 00:48:50,598 [ scc.config] DEBUG Found github.token
2025-03-11 00:48:50,598 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-03-11 00:48:50,599 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-11 00:48:50,646 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:48:50,647 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:48:50,653 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-11 00:48:50,703 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-11 00:48:50,712 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f76eca88fd0> has no local changes
2025-03-11 00:48:50,712 [ 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#358 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/)'
2025-03-11 00:48:50,723 [ scc.git] DEBUG [detached HEAD 22dda66] merge master -Dorg -Ssuccess-only
2025-03-11 00:48:50,723 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:48:50,724 [ scc.repo] DEBUG ## PRs found:
2025-03-11 00:48:50,830 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:51,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-03-11 00:48:51,402 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:51,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-03-11 00:48:51,683 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-11 00:48:51,934 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:52,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-11 00:48:52,587 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:52,837 [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-11 00:48:53,089 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:53,370 [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-11 00:48:53,622 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:53,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-11 00:48:54,192 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:54,383 [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-11 00:48:54,384 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-11 00:48:54,636 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:54,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-03-11 00:48:54,875 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-11 00:48:55,126 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:55,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-11 00:48:55,717 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:56,027 [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-11 00:48:56,280 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:56,574 [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-11 00:48:56,827 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:57,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-11 00:48:57,373 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:57,569 [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-11 00:48:57,570 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-11 00:48:57,823 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:58,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-03-11 00:48:58,318 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:58,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-03-11 00:48:58,816 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:59,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-03-11 00:48:59,298 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:48:59,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-03-11 00:48:59,771 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:00,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-03-11 00:49:00,270 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:00,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-03-11 00:49:00,796 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:01,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-03-11 00:49:01,128 [ scc.repo] DEBUG ## Branches found:
2025-03-11 00:49:01,129 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-11 00:49:01,129 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:01,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:01,135 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-11 00:49:01,140 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-11 00:49:01,140 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-11 00:49:01,146 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-11 00:49:01,152 [ scc.git] DEBUG Already up to date.
2025-03-11 00:49:01,153 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-03-11 00:49:01,501 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-11 00:49:01,501 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-03-11 00:49:01,506 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-03-11 00:49:01,784 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-11 00:49:01,784 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-03-11 00:49:01,789 [ scc.git] DEBUG ## Unique users: []
2025-03-11 00:49:01,789 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:01,789 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:01,795 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-11 00:49:01,842 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:01,847 [ 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-11 00:49:01,914 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-11 00:49:01,917 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-03-11 00:49:01,917 [ scc.git] DEBUG package.json | 2 +-
2025-03-11 00:49:01,917 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-03-11 00:49:01,920 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:02,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:02,088 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-03-11 00:49:02,146 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:02,152 [ 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-11 00:49:02,262 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-11 00:49:02,262 [ scc.git] DEBUG Auto-merging package.json
2025-03-11 00:49:02,263 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-11 00:49:02,267 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-03-11 00:49:02,267 [ scc.git] DEBUG package.json | 2 +-
2025-03-11 00:49:02,267 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-03-11 00:49:02,340 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:02,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:02,520 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-11 00:49:02,567 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:02,567 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:02,573 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-11 00:49:02,617 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-11 00:49:02,627 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f76ecaa6880> has no local changes
2025-03-11 00:49:02,627 [ 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#358 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/)'
2025-03-11 00:49:02,638 [ scc.git] DEBUG [detached HEAD 1532dbd] merge master -Dorg -Ssuccess-only
2025-03-11 00:49:02,638 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:02,639 [ scc.repo] DEBUG ## PRs found:
2025-03-11 00:49:02,773 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:02,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-03-11 00:49:02,974 [ scc.repo] DEBUG ## Branches found:
2025-03-11 00:49:02,974 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-11 00:49:02,974 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:02,975 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:02,982 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-11 00:49:02,988 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-11 00:49:02,988 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-11 00:49:02,996 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-11 00:49:03,004 [ scc.git] DEBUG Already up to date.
2025-03-11 00:49:03,004 [ scc.git] DEBUG ## Unique users: []
2025-03-11 00:49:03,004 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:03,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:03,010 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-11 00:49:03,061 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:03,062 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:03,070 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-11 00:49:03,125 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-11 00:49:03,134 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f76ecab7220> has no local changes
2025-03-11 00:49:03,135 [ 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#358 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/)'
2025-03-11 00:49:03,146 [ scc.git] DEBUG [detached HEAD 9ee3cfb] merge master -Dorg -Ssuccess-only
2025-03-11 00:49:03,147 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:03,147 [ scc.repo] DEBUG ## PRs found:
2025-03-11 00:49:03,228 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:03,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-03-11 00:49:03,810 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:04,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-03-11 00:49:04,308 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:04,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-03-11 00:49:04,778 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:05,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-03-11 00:49:05,050 [ scc.repo] DEBUG ## Branches found:
2025-03-11 00:49:05,050 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-11 00:49:05,050 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:05,050 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:05,057 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-11 00:49:05,062 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-11 00:49:05,062 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-11 00:49:05,070 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-11 00:49:05,077 [ scc.git] DEBUG Already up to date.
2025-03-11 00:49:05,077 [ scc.git] DEBUG ## Unique users: []
2025-03-11 00:49:05,077 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:05,077 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:05,082 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-11 00:49:05,131 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:05,131 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:05,137 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-11 00:49:05,183 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-11 00:49:05,191 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f76eca88c70> has no local changes
2025-03-11 00:49:05,191 [ 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#358 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/)'
2025-03-11 00:49:05,201 [ scc.git] DEBUG [detached HEAD 4471ed1] merge master -Dorg -Ssuccess-only
2025-03-11 00:49:05,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:05,201 [ scc.repo] DEBUG ## PRs found:
2025-03-11 00:49:05,302 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:05,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-03-11 00:49:05,923 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:06,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-03-11 00:49:06,469 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:06,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-03-11 00:49:06,931 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:07,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-11 00:49:07,481 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:07,707 [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-11 00:49:07,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:08,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-11 00:49:08,512 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:08,680 [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-11 00:49:08,680 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-11 00:49:08,681 [ scc.repo] DEBUG ## Branches found:
2025-03-11 00:49:08,681 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-11 00:49:08,681 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:08,681 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:08,690 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-11 00:49:08,697 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-11 00:49:08,697 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-11 00:49:08,704 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-11 00:49:08,711 [ scc.git] DEBUG Already up to date.
2025-03-11 00:49:08,712 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-03-11 00:49:09,288 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-03-11 00:49:09,289 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-03-11 00:49:09,294 [ scc.git] DEBUG ## Unique users: []
2025-03-11 00:49:09,295 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:09,295 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:09,301 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-11 00:49:09,308 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:09,314 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-11 00:49:09,656 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-03-11 00:49:09,657 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-03-11 00:49:09,657 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-03-11 00:49:09,657 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-03-11 00:49:09,657 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-03-11 00:49:09,657 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-03-11 00:49:09,657 [ scc.git] DEBUG Auto-merging setup.py
2025-03-11 00:49:09,657 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-03-11 00:49:09,657 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-11 00:49:09,657 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-11 00:49:09,664 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-11 00:49:09,672 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-03-11 00:49:09,675 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:09,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:09,840 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-11 00:49:09,847 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-11 00:49:09,854 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#358](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
--conflicts
2025-03-11 00:49:09,860 [ scc.config] DEBUG Found github.token
2025-03-11 00:49:09,861 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-03-11 00:49:09,861 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-11 00:49:09,909 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:09,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:09,916 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-11 00:49:09,963 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-11 00:49:09,972 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f76ec265fd0> has no local changes
2025-03-11 00:49:09,973 [ 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#358 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/)'
2025-03-11 00:49:09,987 [ scc.git] DEBUG [detached HEAD 4df435a] merge master -Dorg -Ssuccess-only
2025-03-11 00:49:09,987 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:09,988 [ scc.repo] DEBUG ## PRs found:
2025-03-11 00:49:10,093 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:10,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-03-11 00:49:10,679 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:10,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-03-11 00:49:11,179 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:11,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-03-11 00:49:11,653 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:11,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-03-11 00:49:12,191 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:12,486 [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-11 00:49:12,738 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:12,982 [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-11 00:49:13,234 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:13,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-03-11 00:49:13,716 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:13,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-03-11 00:49:14,184 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:14,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-03-11 00:49:14,660 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:14,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-03-11 00:49:15,145 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:15,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-11 00:49:15,686 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:15,898 [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-11 00:49:16,150 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:16,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-11 00:49:16,595 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:16,771 [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-11 00:49:16,772 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-11 00:49:16,772 [ scc.repo] DEBUG ## Branches found:
2025-03-11 00:49:16,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-11 00:49:16,773 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:16,773 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:16,779 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-11 00:49:16,785 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-11 00:49:16,785 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-11 00:49:16,791 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-11 00:49:16,797 [ scc.git] DEBUG Already up to date.
2025-03-11 00:49:16,798 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-03-11 00:49:17,172 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-03-11 00:49:17,172 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-03-11 00:49:17,178 [ scc.git] DEBUG ## Unique users: []
2025-03-11 00:49:17,178 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:17,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:17,185 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-03-11 00:49:17,193 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:17,199 [ 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-11 00:49:17,217 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-11 00:49:17,221 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-03-11 00:49:17,221 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-03-11 00:49:17,221 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-03-11 00:49:17,221 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-03-11 00:49:17,222 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-03-11 00:49:17,222 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-03-11 00:49:17,222 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-03-11 00:49:17,222 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-03-11 00:49:17,222 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-03-11 00:49:17,223 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-03-11 00:49:17,224 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:17,224 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-03-11 00:49:17,225 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-03-11 00:49:17,225 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-03-11 00:49:17,225 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-03-11 00:49:17,225 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-03-11 00:49:17,225 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-03-11 00:49:17,225 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-03-11 00:49:17,225 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-03-11 00:49:17,225 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-03-11 00:49:17,225 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-03-11 00:49:17,225 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-03-11 00:49:17,225 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-03-11 00:49:17,225 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-03-11 00:49:17,225 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-03-11 00:49:17,225 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-03-11 00:49:17,225 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-03-11 00:49:17,225 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-03-11 00:49:17,225 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-03-11 00:49:17,225 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-03-11 00:49:17,225 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-03-11 00:49:17,225 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-03-11 00:49:17,225 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-03-11 00:49:17,225 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-03-11 00:49:17,225 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-03-11 00:49:17,226 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-03-11 00:49:17,226 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-03-11 00:49:17,226 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-03-11 00:49:17,226 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-03-11 00:49:17,226 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-03-11 00:49:17,226 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-03-11 00:49:17,226 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-03-11 00:49:17,226 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-03-11 00:49:17,226 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-03-11 00:49:17,226 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-03-11 00:49:17,226 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-03-11 00:49:17,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:17,393 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-11 00:49:17,445 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:17,445 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:17,452 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-11 00:49:17,503 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-11 00:49:17,512 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f76eca88a60> has no local changes
2025-03-11 00:49:17,513 [ 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#358 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/)'
2025-03-11 00:49:17,526 [ scc.git] DEBUG [detached HEAD fce45a2] merge master -Dorg -Ssuccess-only
2025-03-11 00:49:17,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:17,527 [ scc.repo] DEBUG ## PRs found:
2025-03-11 00:49:17,646 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:17,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-03-11 00:49:17,835 [ scc.repo] DEBUG ## Branches found:
2025-03-11 00:49:17,836 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-11 00:49:17,836 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:17,836 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:17,842 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-11 00:49:17,849 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-11 00:49:17,850 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-11 00:49:17,857 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-11 00:49:17,865 [ scc.git] DEBUG Already up to date.
2025-03-11 00:49:17,866 [ scc.git] DEBUG ## Unique users: []
2025-03-11 00:49:17,866 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:17,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:17,872 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-11 00:49:17,922 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:17,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:17,929 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-11 00:49:17,979 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-11 00:49:17,986 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f76ec22e250> has no local changes
2025-03-11 00:49:17,986 [ 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#358 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/)'
2025-03-11 00:49:17,996 [ scc.git] DEBUG [detached HEAD e21d630] merge master -Dorg -Ssuccess-only
2025-03-11 00:49:17,997 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:17,997 [ scc.repo] DEBUG ## PRs found:
2025-03-11 00:49:18,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:18,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-03-11 00:49:18,631 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:18,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-03-11 00:49:19,103 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:19,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-03-11 00:49:19,581 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:19,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-11 00:49:20,186 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:20,425 [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-11 00:49:20,678 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:20,927 [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-11 00:49:21,180 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:21,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-11 00:49:21,648 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:21,833 [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-11 00:49:21,834 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-03-11 00:49:21,834 [ scc.repo] DEBUG ## Branches found:
2025-03-11 00:49:21,834 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-11 00:49:21,834 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:21,834 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:21,842 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-11 00:49:21,849 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-11 00:49:21,849 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-11 00:49:21,857 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-11 00:49:21,865 [ scc.git] DEBUG Already up to date.
2025-03-11 00:49:21,866 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-03-11 00:49:22,520 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-03-11 00:49:22,521 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-03-11 00:49:22,526 [ scc.git] DEBUG ## Unique users: []
2025-03-11 00:49:22,526 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:22,526 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:22,532 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-03-11 00:49:22,538 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:22,544 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-03-11 00:49:22,558 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-11 00:49:22,561 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-03-11 00:49:22,561 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-03-11 00:49:22,561 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-03-11 00:49:22,561 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-03-11 00:49:22,561 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-03-11 00:49:22,564 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:22,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:22,728 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-11 00:49:22,775 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:22,775 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:22,781 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-11 00:49:22,830 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-11 00:49:22,837 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f76eca88a30> has no local changes
2025-03-11 00:49:22,837 [ 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#358 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/)'
2025-03-11 00:49:22,848 [ scc.git] DEBUG [detached HEAD 3d7613f] merge master -Dorg -Ssuccess-only
2025-03-11 00:49:22,848 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:22,849 [ scc.git] INFO Overriding base-branch from master to main
2025-03-11 00:49:22,849 [ scc.repo] DEBUG ## PRs found:
2025-03-11 00:49:22,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:23,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-03-11 00:49:23,517 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:23,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-03-11 00:49:23,993 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:24,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-03-11 00:49:24,472 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:24,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-03-11 00:49:25,010 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:25,288 [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-11 00:49:25,541 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:25,759 [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-11 00:49:26,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:26,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-03-11 00:49:26,501 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:26,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-03-11 00:49:26,986 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:27,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-03-11 00:49:27,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:27,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-11 00:49:28,029 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:28,233 [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-11 00:49:28,485 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:28,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-11 00:49:29,022 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:29,223 [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-11 00:49:29,225 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-11 00:49:29,225 [ scc.repo] DEBUG ## Branches found:
2025-03-11 00:49:29,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-11 00:49:29,225 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:29,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:29,233 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-03-11 00:49:29,238 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-11 00:49:29,238 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-03-11 00:49:29,244 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-03-11 00:49:29,250 [ scc.git] DEBUG Already up to date.
2025-03-11 00:49:29,250 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-03-11 00:49:29,763 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-03-11 00:49:29,764 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-03-11 00:49:29,770 [ scc.git] DEBUG ## Unique users: []
2025-03-11 00:49:29,770 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:29,770 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:29,776 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-11 00:49:29,783 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:29,789 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-11 00:49:29,941 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-03-11 00:49:29,942 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-03-11 00:49:29,942 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-11 00:49:29,942 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-11 00:49:29,949 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-11 00:49:29,956 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-03-11 00:49:29,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:30,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:30,129 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-11 00:49:30,137 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-11 00:49:30,144 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#358](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-03-11 00:49:30,151 [ scc.config] DEBUG Found github.token
2025-03-11 00:49:30,151 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-03-11 00:49:30,151 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-11 00:49:30,199 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:30,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:30,205 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-11 00:49:30,251 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-11 00:49:30,258 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f76ec1fe100> has no local changes
2025-03-11 00:49:30,258 [ 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#358 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/)'
2025-03-11 00:49:30,268 [ scc.git] DEBUG [detached HEAD 3666c9f] merge master -Dorg -Ssuccess-only
2025-03-11 00:49:30,268 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:30,269 [ scc.repo] DEBUG ## PRs found:
2025-03-11 00:49:30,381 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:30,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-03-11 00:49:30,570 [ scc.repo] DEBUG ## Branches found:
2025-03-11 00:49:30,570 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-11 00:49:30,570 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:30,570 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:30,576 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-11 00:49:30,583 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-11 00:49:30,583 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-11 00:49:30,591 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-11 00:49:30,598 [ scc.git] DEBUG Already up to date.
2025-03-11 00:49:30,598 [ scc.git] DEBUG ## Unique users: []
2025-03-11 00:49:30,598 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:30,599 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:30,606 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-11 00:49:30,654 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:30,655 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:30,661 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-11 00:49:30,709 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-11 00:49:30,717 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f76ec1435b0> has no local changes
2025-03-11 00:49:30,717 [ 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#358 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/)'
2025-03-11 00:49:30,728 [ scc.git] DEBUG [detached HEAD dfd955a] merge master -Dorg -Ssuccess-only
2025-03-11 00:49:30,728 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:30,728 [ scc.repo] DEBUG ## PRs found:
2025-03-11 00:49:30,823 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:31,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-03-11 00:49:31,004 [ scc.repo] DEBUG ## Branches found:
2025-03-11 00:49:31,004 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-11 00:49:31,004 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:31,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:31,010 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-11 00:49:31,016 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-11 00:49:31,016 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-11 00:49:31,023 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-11 00:49:31,031 [ scc.git] DEBUG Already up to date.
2025-03-11 00:49:31,032 [ scc.git] DEBUG ## Unique users: []
2025-03-11 00:49:31,032 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:31,032 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:31,038 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-11 00:49:31,084 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:31,085 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:31,091 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-11 00:49:31,138 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-11 00:49:31,146 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f76ec22d520> has no local changes
2025-03-11 00:49:31,146 [ 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#358 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/)'
2025-03-11 00:49:31,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:31,158 [ scc.git] DEBUG [detached HEAD d0c11b8] merge master -Dorg -Ssuccess-only
2025-03-11 00:49:31,158 [ scc.repo] DEBUG ## PRs found:
2025-03-11 00:49:31,256 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:31,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-03-11 00:49:31,764 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:31,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-03-11 00:49:32,234 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:32,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-03-11 00:49:32,712 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:33,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-11 00:49:33,254 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:33,498 [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-11 00:49:33,752 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:34,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-11 00:49:34,290 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:34,479 [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-11 00:49:34,479 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-03-11 00:49:34,480 [ scc.repo] DEBUG ## Branches found:
2025-03-11 00:49:34,480 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-11 00:49:34,480 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:34,480 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:34,486 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-11 00:49:34,493 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-11 00:49:34,493 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-11 00:49:34,500 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-11 00:49:34,507 [ scc.git] DEBUG Already up to date.
2025-03-11 00:49:34,507 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-03-11 00:49:35,012 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-03-11 00:49:35,013 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-03-11 00:49:35,018 [ scc.git] DEBUG ## Unique users: []
2025-03-11 00:49:35,018 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:35,019 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:35,027 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-11 00:49:35,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:35,041 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-11 00:49:35,155 [ scc.git] DEBUG Auto-merging Dockerfile
2025-03-11 00:49:35,155 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-03-11 00:49:35,155 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-11 00:49:35,156 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-11 00:49:35,166 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-11 00:49:35,175 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-03-11 00:49:35,180 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:35,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:35,361 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-11 00:49:35,369 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-11 00:49:35,376 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#358](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-03-11 00:49:35,383 [ scc.config] DEBUG Found github.token
2025-03-11 00:49:35,384 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-03-11 00:49:35,384 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-11 00:49:35,437 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:35,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:35,444 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-11 00:49:35,494 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-11 00:49:35,503 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f76ec143610> has no local changes
2025-03-11 00:49:35,503 [ 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#358 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/)'
2025-03-11 00:49:35,514 [ scc.git] DEBUG [detached HEAD 169a469] merge master -Dorg -Ssuccess-only
2025-03-11 00:49:35,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:35,515 [ scc.git] INFO Overriding base-branch from master to develop
2025-03-11 00:49:35,515 [ scc.repo] DEBUG ## PRs found:
2025-03-11 00:49:35,613 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:35,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-03-11 00:49:36,207 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:36,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-03-11 00:49:36,690 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:36,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-03-11 00:49:37,175 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:37,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-11 00:49:37,644 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:37,904 [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-11 00:49:38,156 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:38,366 [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-11 00:49:38,618 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:38,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-11 00:49:39,140 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:39,328 [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-11 00:49:39,328 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-11 00:49:39,580 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:39,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-03-11 00:49:40,067 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:40,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-03-11 00:49:40,545 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:40,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-11 00:49:41,123 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:41,322 [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-11 00:49:41,575 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:41,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-11 00:49:42,026 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:42,205 [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-11 00:49:42,205 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-11 00:49:42,457 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:42,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-03-11 00:49:42,953 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:43,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-03-11 00:49:43,463 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:43,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-03-11 00:49:43,931 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:44,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-03-11 00:49:44,191 [ scc.repo] DEBUG ## Branches found:
2025-03-11 00:49:44,191 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-11 00:49:44,192 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:44,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:44,198 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-03-11 00:49:44,204 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-11 00:49:44,205 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-03-11 00:49:44,211 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-03-11 00:49:44,218 [ scc.git] DEBUG Already up to date.
2025-03-11 00:49:44,218 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-03-11 00:49:44,942 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-11 00:49:44,943 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-03-11 00:49:44,948 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-03-11 00:49:45,501 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-11 00:49:45,501 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-03-11 00:49:45,507 [ scc.git] DEBUG ## Unique users: []
2025-03-11 00:49:45,508 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:45,508 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:45,514 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-11 00:49:45,525 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:45,531 [ 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-11 00:49:45,571 [ 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-11 00:49:45,571 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-11 00:49:45,572 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-11 00:49:45,579 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-11 00:49:45,586 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-03-11 00:49:45,589 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:45,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:45,755 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-11 00:49:45,765 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-11 00:49:45,773 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#358](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-03-11 00:49:45,779 [ scc.config] DEBUG Found github.token
2025-03-11 00:49:45,780 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-03-11 00:49:45,780 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-11 00:49:45,789 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:45,796 [ 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-11 00:49:45,810 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-11 00:49:45,814 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-03-11 00:49:45,814 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-03-11 00:49:46,008 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:46,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:46,180 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-11 00:49:46,228 [ scc.git] DEBUG Get sha1 of %s
2025-03-11 00:49:46,228 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-11 00:49:46,235 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-11 00:49:46,285 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-11 00:49:46,295 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f76ec198ac0> has no local changes
2025-03-11 00:49:46,295 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#358 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/)'
2025-03-11 00:49:46,308 [ scc.git] DEBUG [detached HEAD 9c85e8a] merge master -Dorg -Ssuccess-only
2025-03-11 00:49:46,308 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:46,309 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-11 00:49:46,404 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-03-11 00:49:46,432 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:46,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:46,613 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-03-11 00:49:46,618 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-03-11 00:49:46,853 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:47,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:47,123 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-03-11 00:49:47,129 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-03-11 00:49:47,363 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:47,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:47,550 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-03-11 00:49:47,557 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-03-11 00:49:47,790 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:47,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:47,984 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-03-11 00:49:48,213 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:48,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:48,400 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-03-11 00:49:48,405 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-03-11 00:49:48,641 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:48,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:48,835 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-03-11 00:49:48,841 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-03-11 00:49:49,074 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:49,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:49,256 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-03-11 00:49:49,261 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-03-11 00:49:49,496 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:49,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:49,692 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-03-11 00:49:49,697 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-03-11 00:49:49,932 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:50,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:50,107 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-03-11 00:49:50,113 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-03-11 00:49:50,345 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:50,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:50,520 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-03-11 00:49:50,526 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-03-11 00:49:50,758 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:50,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:50,936 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-03-11 00:49:50,943 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-03-11 00:49:51,173 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:51,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:51,357 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-03-11 00:49:51,364 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-03-11 00:49:51,595 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:51,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:51,784 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-03-11 00:49:52,020 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:52,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:52,205 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-03-11 00:49:52,440 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:52,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:52,616 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-03-11 00:49:52,622 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-03-11 00:49:52,854 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:53,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:53,042 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-03-11 00:49:53,275 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:53,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:53,460 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-03-11 00:49:53,694 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:53,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:53,865 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-03-11 00:49:53,872 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-03-11 00:49:54,103 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:54,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:54,275 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-03-11 00:49:54,281 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-03-11 00:49:54,515 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:54,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:54,688 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-03-11 00:49:54,694 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-03-11 00:49:54,928 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:55,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:55,109 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-03-11 00:49:55,114 [ scc.config] DEBUG Found submodule.scripts.url
2025-03-11 00:49:55,348 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-11 00:49:55,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-11 00:49:55,525 [ scc.config] DEBUG Found submodule.scripts.branch
2025-03-11 00:49:55,526 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-11 00:49:55,645 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f76eee85ca0> has local changes
2025-03-11 00:49:55,646 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 167 dominikl 'Add extinfo command' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 600 Rdornier 'Label on rois' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#358 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/358/)'
2025-03-11 00:49:55,666 [ scc.git] DEBUG [detached HEAD 51a24d7] merge master -Dorg -Ssuccess-only
2025-03-11 00:49:55,666 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-03-11 00:49:55,666 [ scc.merge] INFO Repository: ome/omero-plugins
2025-03-11 00:49:55,666 [ scc.merge] INFO Already up to date.
2025-03-11 00:49:55,666 [ scc.merge] INFO
2025-03-11 00:49:55,666 [ scc.merge] INFO Merged PRs:
2025-03-11 00:49:55,666 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-03-11 00:49:55,666 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-03-11 00:49:55,666 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-03-11 00:49:55,667 [ scc.merge] INFO
2025-03-11 00:49:55,667 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-03-11 00:49:55,667 [ scc.merge] INFO Already up to date.
2025-03-11 00:49:55,667 [ scc.merge] INFO
2025-03-11 00:49:55,667 [ scc.merge] INFO
2025-03-11 00:49:55,667 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-03-11 00:49:55,667 [ scc.merge] INFO Excluded PRs:
2025-03-11 00:49:55,667 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-03-11 00:49:55,667 [ scc.merge] INFO Already up to date.
2025-03-11 00:49:55,667 [ scc.merge] INFO
2025-03-11 00:49:55,667 [ scc.merge] INFO
2025-03-11 00:49:55,667 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-03-11 00:49:55,667 [ scc.merge] INFO Excluded PRs:
2025-03-11 00:49:55,667 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-03-11 00:49:55,667 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-03-11 00:49:55,667 [ scc.merge] INFO Already up to date.
2025-03-11 00:49:55,667 [ scc.merge] INFO
2025-03-11 00:49:55,667 [ scc.merge] INFO Merged PRs:
2025-03-11 00:49:55,667 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-03-11 00:49:55,667 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-03-11 00:49:55,667 [ scc.merge] INFO
2025-03-11 00:49:55,667 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-03-11 00:49:55,667 [ scc.merge] INFO Excluded PRs:
2025-03-11 00:49:55,667 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-03-11 00:49:55,667 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-03-11 00:49:55,667 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-11 00:49:55,667 [ scc.merge] INFO Already up to date.
2025-03-11 00:49:55,667 [ scc.merge] INFO
2025-03-11 00:49:55,667 [ scc.merge] INFO Merged PRs:
2025-03-11 00:49:55,667 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-03-11 00:49:55,668 [ scc.merge] INFO
2025-03-11 00:49:55,668 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-11 00:49:55,668 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-03-11 00:49:55,668 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-03-11 00:49:55,668 [ scc.merge] INFO
2025-03-11 00:49:55,668 [ scc.merge] INFO Repository: ome/omero-figure
2025-03-11 00:49:55,668 [ scc.merge] INFO Excluded PRs:
2025-03-11 00:49:55,668 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-03-11 00:49:55,668 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (stage: draft)
2025-03-11 00:49:55,668 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-03-11 00:49:55,668 [ scc.merge] INFO Already up to date.
2025-03-11 00:49:55,668 [ scc.merge] INFO
2025-03-11 00:49:55,668 [ scc.merge] INFO Merged PRs:
2025-03-11 00:49:55,668 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-03-11 00:49:55,668 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-03-11 00:49:55,668 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-03-11 00:49:55,668 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-03-11 00:49:55,668 [ scc.merge] INFO
2025-03-11 00:49:55,668 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-11 00:49:55,668 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-03-11 00:49:55,668 [ scc.merge] INFO
2025-03-11 00:49:55,668 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-03-11 00:49:55,668 [ scc.merge] INFO Already up to date.
2025-03-11 00:49:55,668 [ scc.merge] INFO
2025-03-11 00:49:55,668 [ scc.merge] INFO Merged PRs:
2025-03-11 00:49:55,668 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-03-11 00:49:55,668 [ scc.merge] INFO
2025-03-11 00:49:55,668 [ scc.merge] INFO Repository: ome/omero-gallery
2025-03-11 00:49:55,668 [ scc.merge] INFO Already up to date.
2025-03-11 00:49:55,668 [ scc.merge] INFO
2025-03-11 00:49:55,668 [ scc.merge] INFO Merged PRs:
2025-03-11 00:49:55,669 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-03-11 00:49:55,669 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-03-11 00:49:55,669 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-03-11 00:49:55,669 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-03-11 00:49:55,669 [ scc.merge] INFO
2025-03-11 00:49:55,669 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-11 00:49:55,669 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-03-11 00:49:55,669 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-03-11 00:49:55,669 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-03-11 00:49:55,669 [ scc.merge] INFO
2025-03-11 00:49:55,669 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-03-11 00:49:55,669 [ scc.merge] INFO Excluded PRs:
2025-03-11 00:49:55,669 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-03-11 00:49:55,669 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-03-11 00:49:55,669 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-03-11 00:49:55,669 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-03-11 00:49:55,669 [ scc.merge] INFO Already up to date.
2025-03-11 00:49:55,669 [ scc.merge] INFO
2025-03-11 00:49:55,669 [ scc.merge] INFO Merged PRs:
2025-03-11 00:49:55,669 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-03-11 00:49:55,669 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-03-11 00:49:55,669 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-11 00:49:55,669 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-11 00:49:55,669 [ scc.merge] INFO
2025-03-11 00:49:55,669 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-11 00:49:55,669 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-11 00:49:55,669 [ scc.merge] INFO
2025-03-11 00:49:55,669 [ scc.merge] INFO Repository: ome/omero-mapr
2025-03-11 00:49:55,669 [ scc.merge] INFO Excluded PRs:
2025-03-11 00:49:55,669 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-03-11 00:49:55,669 [ scc.merge] INFO Already up to date.
2025-03-11 00:49:55,669 [ scc.merge] INFO
2025-03-11 00:49:55,670 [ scc.merge] INFO Merged PRs:
2025-03-11 00:49:55,670 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-03-11 00:49:55,670 [ scc.merge] INFO
2025-03-11 00:49:55,670 [ scc.merge] INFO Repository: ome/omero-metadata
2025-03-11 00:49:55,670 [ scc.merge] INFO Already up to date.
2025-03-11 00:49:55,670 [ scc.merge] INFO
2025-03-11 00:49:55,670 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-11 00:49:55,670 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-11 00:49:55,670 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-11 00:49:55,670 [ scc.merge] INFO
2025-03-11 00:49:55,670 [ scc.merge] INFO Repository: ome/omero-parade
2025-03-11 00:49:55,670 [ scc.merge] INFO Excluded PRs:
2025-03-11 00:49:55,670 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-03-11 00:49:55,670 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-03-11 00:49:55,670 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-03-11 00:49:55,670 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-03-11 00:49:55,670 [ scc.merge] INFO Already up to date.
2025-03-11 00:49:55,670 [ scc.merge] INFO
2025-03-11 00:49:55,670 [ scc.merge] INFO Merged PRs:
2025-03-11 00:49:55,670 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-11 00:49:55,670 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-11 00:49:55,670 [ scc.merge] INFO
2025-03-11 00:49:55,670 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-03-11 00:49:55,670 [ scc.merge] INFO Already up to date.
2025-03-11 00:49:55,670 [ scc.merge] INFO
2025-03-11 00:49:55,670 [ scc.merge] INFO
2025-03-11 00:49:55,670 [ scc.merge] INFO Repository: ome/omero-rois
2025-03-11 00:49:55,670 [ scc.merge] INFO Excluded PRs:
2025-03-11 00:49:55,670 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-03-11 00:49:55,670 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-11 00:49:55,670 [ scc.merge] INFO Already up to date.
2025-03-11 00:49:55,670 [ scc.merge] INFO
2025-03-11 00:49:55,671 [ scc.merge] INFO
2025-03-11 00:49:55,671 [ scc.merge] INFO Repository: ome/omero-signup
2025-03-11 00:49:55,671 [ scc.merge] INFO Already up to date.
2025-03-11 00:49:55,671 [ scc.merge] INFO
2025-03-11 00:49:55,671 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-11 00:49:55,671 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-11 00:49:55,671 [ scc.merge] INFO
2025-03-11 00:49:55,671 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-03-11 00:49:55,671 [ scc.merge] INFO Excluded PRs:
2025-03-11 00:49:55,671 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-03-11 00:49:55,671 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-03-11 00:49:55,671 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-03-11 00:49:55,671 [ scc.merge] INFO Already up to date.
2025-03-11 00:49:55,671 [ scc.merge] INFO
2025-03-11 00:49:55,671 [ scc.merge] INFO Merged PRs:
2025-03-11 00:49:55,671 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-11 00:49:55,671 [ scc.merge] INFO
2025-03-11 00:49:55,671 [ scc.merge] INFO Repository: ome/omero-upload
2025-03-11 00:49:55,671 [ scc.merge] INFO Already up to date.
2025-03-11 00:49:55,671 [ scc.merge] INFO
2025-03-11 00:49:55,671 [ scc.merge] INFO
2025-03-11 00:49:55,671 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-03-11 00:49:55,671 [ scc.merge] INFO Already up to date.
2025-03-11 00:49:55,671 [ scc.merge] INFO
2025-03-11 00:49:55,671 [ scc.merge] INFO Merged PRs:
2025-03-11 00:49:55,671 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-03-11 00:49:55,671 [ scc.merge] INFO
2025-03-11 00:49:55,671 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-03-11 00:49:55,671 [ scc.merge] INFO Excluded PRs:
2025-03-11 00:49:55,671 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-03-11 00:49:55,671 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-03-11 00:49:55,671 [ scc.merge] INFO Already up to date.
2025-03-11 00:49:55,672 [ scc.merge] INFO
2025-03-11 00:49:55,672 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-11 00:49:55,672 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-11 00:49:55,672 [ scc.merge] INFO
2025-03-11 00:49:55,672 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-03-11 00:49:55,672 [ scc.merge] INFO Already up to date.
2025-03-11 00:49:55,672 [ scc.merge] INFO
2025-03-11 00:49:55,672 [ scc.merge] INFO
2025-03-11 00:49:55,672 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-03-11 00:49:55,672 [ scc.merge] INFO Already up to date.
2025-03-11 00:49:55,672 [ scc.merge] INFO
2025-03-11 00:49:55,672 [ scc.merge] INFO
2025-03-11 00:49:55,672 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-03-11 00:49:55,672 [ scc.merge] INFO Already up to date.
2025-03-11 00:49:55,672 [ scc.merge] INFO
2025-03-11 00:49:55,672 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-11 00:49:55,672 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-03-11 00:49:55,672 [ scc.merge] INFO
2025-03-11 00:49:55,672 [ scc.merge] INFO Repository: ome/scripts
2025-03-11 00:49:55,672 [ scc.merge] INFO Excluded PRs:
2025-03-11 00:49:55,672 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-03-11 00:49:55,672 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-03-11 00:49:55,672 [ scc.merge] INFO Already up to date.
2025-03-11 00:49:55,672 [ scc.merge] INFO
2025-03-11 00:49:55,672 [ scc.merge] INFO Merged PRs:
2025-03-11 00:49:55,672 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-11 00:49:55,672 [ scc.merge] INFO
2025-03-11 00:49:55,672 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-11 00:49:55,672 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-11 00:49:55,672 [ scc.merge] INFO
2025-03-11 00:49:55,673 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-03-11 00:49:55,673 [ scc.git] DEBUG Calling 'git remote'
2025-03-11 00:49:55,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-03-11 00:49:55,679 [ scc.git] DEBUG Calling 'git remote'
2025-03-11 00:49:55,684 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:55,684 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-03-11 00:49:55,685 [ scc.git] DEBUG Calling 'git remote'
2025-03-11 00:49:55,690 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:55,691 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-03-11 00:49:55,691 [ scc.git] DEBUG Calling 'git remote'
2025-03-11 00:49:55,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:55,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-03-11 00:49:55,697 [ scc.git] DEBUG Calling 'git remote'
2025-03-11 00:49:55,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:55,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-03-11 00:49:55,703 [ scc.git] DEBUG Calling 'git remote'
2025-03-11 00:49:55,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:55,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-03-11 00:49:55,711 [ scc.git] DEBUG Calling 'git remote'
2025-03-11 00:49:55,718 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:55,718 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-03-11 00:49:55,718 [ scc.git] DEBUG Calling 'git remote'
2025-03-11 00:49:55,724 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:55,724 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-11 00:49:55,725 [ scc.git] DEBUG Calling 'git remote'
2025-03-11 00:49:55,731 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:55,731 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-11 00:49:55,731 [ scc.git] DEBUG Calling 'git remote'
2025-03-11 00:49:55,737 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:55,737 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-11 00:49:55,738 [ scc.git] DEBUG Calling 'git remote'
2025-03-11 00:49:55,744 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:55,744 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-11 00:49:55,744 [ scc.git] DEBUG Calling 'git remote'
2025-03-11 00:49:55,750 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:55,750 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-11 00:49:55,750 [ scc.git] DEBUG Calling 'git remote'
2025-03-11 00:49:55,756 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:55,756 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-11 00:49:55,756 [ scc.git] DEBUG Calling 'git remote'
2025-03-11 00:49:55,762 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:55,763 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-11 00:49:55,763 [ scc.git] DEBUG Calling 'git remote'
2025-03-11 00:49:55,769 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:55,770 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-11 00:49:55,770 [ scc.git] DEBUG Calling 'git remote'
2025-03-11 00:49:55,775 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:55,776 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-11 00:49:55,776 [ scc.git] DEBUG Calling 'git remote'
2025-03-11 00:49:55,781 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:55,781 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-11 00:49:55,781 [ scc.git] DEBUG Calling 'git remote'
2025-03-11 00:49:55,788 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:55,788 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-11 00:49:55,788 [ scc.git] DEBUG Calling 'git remote'
2025-03-11 00:49:55,794 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:55,794 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-11 00:49:55,794 [ scc.git] DEBUG Calling 'git remote'
2025-03-11 00:49:55,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:55,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-11 00:49:55,800 [ scc.git] DEBUG Calling 'git remote'
2025-03-11 00:49:55,806 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:55,806 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-11 00:49:55,806 [ scc.git] DEBUG Calling 'git remote'
2025-03-11 00:49:55,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-11 00:49:55,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-11 00:49:55,812 [ scc.git] DEBUG Calling 'git remote'
2025-03-11 00:49:55,817 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.10.0 to 5.10.1-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD 3cc5cf3] 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 395dc17] 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-11 00:50:45,177 [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-11 00:50:54,639 [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-11 00:50:57,232 [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-11 00:51:02,018 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-11 00:51:42,507 [ 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/8dc2a4ee/images/svgs/logo.svg){kind=logo}
