Skipping 187 KB..
Full Log2025-03-10 08:29:11,304 [ scc.repo] DEBUG - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-10 08:29:11,556 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:11,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-03-10 08:29:11,805 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-10 08:29:12,056 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:12,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-10 08:29:12,649 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:12,938 [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-10 08:29:13,191 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:13,488 [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-10 08:29:13,741 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:14,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-10 08:29:14,345 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:14,516 [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-10 08:29:14,517 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-10 08:29:14,769 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:15,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-03-10 08:29:15,273 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:15,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-03-10 08:29:15,739 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:15,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-03-10 08:29:16,251 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:16,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-03-10 08:29:16,736 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:17,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-10 08:29:17,261 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:17,583 [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-10 08:29:17,835 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:18,061 [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-10 08:29:18,314 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:18,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-10 08:29:18,861 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:19,044 [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-10 08:29:19,044 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-10 08:29:19,296 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:19,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-03-10 08:29:19,770 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:20,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-03-10 08:29:20,287 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:20,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-10 08:29:20,836 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:21,130 [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-10 08:29:21,382 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:21,604 [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-10 08:29:21,856 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:22,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-10 08:29:22,319 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:22,510 [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-10 08:29:22,510 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-03-10 08:29:22,762 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:23,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-03-10 08:29:23,255 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:23,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-03-10 08:29:23,754 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:24,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-10 08:29:24,316 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:24,572 [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-10 08:29:24,825 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:25,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-10 08:29:25,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:25,589 [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-10 08:29:25,589 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-03-10 08:29:25,590 [ scc.repo] DEBUG ## Branches found:
2025-03-10 08:29:25,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-10 08:29:25,591 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:29:25,591 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:25,597 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-10 08:29:25,602 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-10 08:29:25,603 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-10 08:29:25,609 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-10 08:29:25,615 [ scc.git] DEBUG Already up to date.
2025-03-10 08:29:25,615 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-03-10 08:29:27,369 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-10 08:29:27,369 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-03-10 08:29:27,375 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-03-10 08:29:28,403 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-10 08:29:28,403 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-03-10 08:29:28,409 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-03-10 08:29:28,747 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-10 08:29:28,748 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-03-10 08:29:28,753 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-03-10 08:29:29,045 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-10 08:29:29,045 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-03-10 08:29:29,050 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-03-10 08:29:29,340 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-10 08:29:29,341 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-03-10 08:29:29,346 [ scc.git] DEBUG ## Unique users: []
2025-03-10 08:29:29,346 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:29:29,346 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:29,352 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-10 08:29:29,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:29,367 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-10 08:29:29,639 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-03-10 08:29:29,639 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-03-10 08:29:29,640 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-10 08:29:29,645 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-03-10 08:29:29,645 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-03-10 08:29:29,645 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-03-10 08:29:29,648 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:29,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:29:29,811 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-10 08:29:29,822 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:29,827 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-10 08:29:30,221 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-03-10 08:29:30,221 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-03-10 08:29:30,222 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-03-10 08:29:30,222 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-03-10 08:29:30,222 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-10 08:29:30,228 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-03-10 08:29:30,228 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-03-10 08:29:30,228 [ scc.git] DEBUG src/app/header.html | 5 +
2025-03-10 08:29:30,228 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-03-10 08:29:30,228 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-03-10 08:29:30,228 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-03-10 08:29:30,228 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-03-10 08:29:30,228 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-03-10 08:29:30,231 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:30,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:29:30,387 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-10 08:29:30,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:30,402 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-10 08:29:30,525 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-03-10 08:29:30,526 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-10 08:29:30,530 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-03-10 08:29:30,530 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-03-10 08:29:30,530 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-03-10 08:29:30,639 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:30,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:29:30,804 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-10 08:29:30,815 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:30,820 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-10 08:29:30,854 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-10 08:29:30,864 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-03-10 08:29:30,864 [ scc.git] DEBUG package.json | 2 +-
2025-03-10 08:29:30,864 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-03-10 08:29:31,056 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:31,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:29:31,228 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-10 08:29:31,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:31,250 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-10 08:29:31,428 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-10 08:29:31,428 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-03-10 08:29:31,428 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-10 08:29:31,429 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-10 08:29:31,435 [ scc.git] DEBUG Calling 'git reset --hard a19198514e5d688cb2e400d3182f1317f58fd8bc'
2025-03-10 08:29:31,445 [ scc.git] DEBUG HEAD is now at a191985 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-03-10 08:29:31,480 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:31,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:29:31,641 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-10 08:29:31,648 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-03-10 08:29:31,654 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#357](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-03-10 08:29:31,658 [ scc.config] DEBUG Found github.token
2025-03-10 08:29:31,659 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-03-10 08:29:31,659 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-10 08:29:31,701 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:29:31,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:31,706 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-10 08:29:31,748 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-10 08:29:31,758 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f75e4434520> has no local changes
2025-03-10 08:29:31,758 [ 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#357 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/)'
2025-03-10 08:29:31,770 [ scc.git] DEBUG [detached HEAD 351df30] merge master -Dorg -Ssuccess-only
2025-03-10 08:29:31,770 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:29:31,771 [ scc.repo] DEBUG ## PRs found:
2025-03-10 08:29:31,893 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:32,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-03-10 08:29:32,450 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:32,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-03-10 08:29:32,934 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:33,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-03-10 08:29:33,462 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:33,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-10 08:29:33,992 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:34,239 [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-10 08:29:34,492 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:34,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-10 08:29:34,946 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:35,134 [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-10 08:29:35,134 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-03-10 08:29:35,135 [ scc.repo] DEBUG ## Branches found:
2025-03-10 08:29:35,135 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-10 08:29:35,135 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:29:35,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:35,141 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-10 08:29:35,146 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-10 08:29:35,147 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-10 08:29:35,152 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-10 08:29:35,158 [ scc.git] DEBUG Already up to date.
2025-03-10 08:29:35,158 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-03-10 08:29:35,798 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-03-10 08:29:35,798 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-03-10 08:29:35,803 [ scc.git] DEBUG ## Unique users: []
2025-03-10 08:29:35,803 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:29:35,803 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:35,809 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-10 08:29:35,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:35,821 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-10 08:29:35,832 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-10 08:29:35,835 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-03-10 08:29:35,835 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-03-10 08:29:35,835 [ scc.git] DEBUG requirements.txt | 2 +-
2025-03-10 08:29:35,835 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-03-10 08:29:35,835 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-03-10 08:29:35,836 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-03-10 08:29:35,838 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:36,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:29:36,056 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-10 08:29:36,100 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:29:36,100 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:36,106 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-10 08:29:36,150 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-10 08:29:36,158 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f75e4ccaaf0> has no local changes
2025-03-10 08:29:36,158 [ 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#357 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/)'
2025-03-10 08:29:36,168 [ scc.git] DEBUG [detached HEAD 3ba46de] merge master -Dorg -Ssuccess-only
2025-03-10 08:29:36,168 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:29:36,169 [ scc.repo] DEBUG ## PRs found:
2025-03-10 08:29:36,308 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:36,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-03-10 08:29:36,897 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:37,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-03-10 08:29:37,390 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:37,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-03-10 08:29:37,987 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:38,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-10 08:29:38,616 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:38,836 [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-10 08:29:39,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:39,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-10 08:29:39,651 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:39,822 [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-10 08:29:39,823 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-10 08:29:40,074 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:40,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-03-10 08:29:40,573 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:40,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-03-10 08:29:41,068 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:41,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-10 08:29:41,594 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:41,827 [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-10 08:29:42,079 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:42,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-10 08:29:42,675 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:42,854 [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-10 08:29:42,855 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-10 08:29:42,855 [ scc.repo] DEBUG ## Branches found:
2025-03-10 08:29:42,855 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-10 08:29:42,855 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:29:42,856 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:42,862 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-10 08:29:42,867 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-10 08:29:42,867 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-10 08:29:42,873 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-10 08:29:42,878 [ scc.git] DEBUG Already up to date.
2025-03-10 08:29:42,878 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-03-10 08:29:43,535 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-10 08:29:43,536 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-03-10 08:29:43,541 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-03-10 08:29:44,074 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-10 08:29:44,074 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-03-10 08:29:44,080 [ scc.git] DEBUG ## Unique users: []
2025-03-10 08:29:44,080 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:29:44,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:44,086 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-10 08:29:44,093 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:44,098 [ 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-10 08:29:44,287 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-03-10 08:29:44,287 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-03-10 08:29:44,287 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-10 08:29:44,288 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-10 08:29:44,288 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-10 08:29:44,288 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-10 08:29:44,294 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-10 08:29:44,301 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-10 08:29:44,304 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:44,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:29:44,468 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-10 08:29:44,476 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-10 08:29:44,592 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#357](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-03-10 08:29:44,598 [ scc.config] DEBUG Found github.token
2025-03-10 08:29:44,598 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-03-10 08:29:44,599 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-10 08:29:44,606 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:44,611 [ 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-10 08:29:44,739 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-10 08:29:44,739 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-10 08:29:44,739 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-03-10 08:29:44,739 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-10 08:29:44,740 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-10 08:29:44,747 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-10 08:29:44,754 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-10 08:29:44,757 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:44,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:29:44,936 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-10 08:29:44,944 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-10 08:29:44,949 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#357](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/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-10 08:29:44,954 [ scc.config] DEBUG Found github.token
2025-03-10 08:29:44,954 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-03-10 08:29:44,955 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-10 08:29:44,998 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:29:44,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:45,003 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-10 08:29:45,046 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-10 08:29:45,054 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f75e44731f0> has no local changes
2025-03-10 08:29:45,054 [ 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#357 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/)'
2025-03-10 08:29:45,064 [ scc.git] DEBUG [detached HEAD 010bd91] merge master -Dorg -Ssuccess-only
2025-03-10 08:29:45,064 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:29:45,064 [ scc.repo] DEBUG ## PRs found:
2025-03-10 08:29:45,188 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:45,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-03-10 08:29:45,791 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:46,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-03-10 08:29:46,056 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-10 08:29:46,307 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:46,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-10 08:29:46,920 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:47,207 [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-10 08:29:47,460 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:47,759 [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-10 08:29:48,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:48,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-10 08:29:48,549 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:48,711 [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-10 08:29:48,712 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-10 08:29:48,964 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:49,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-03-10 08:29:49,228 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-10 08:29:49,480 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:49,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-10 08:29:50,059 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:50,378 [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-10 08:29:50,631 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:50,924 [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-10 08:29:51,177 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:51,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-10 08:29:51,647 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:51,819 [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-10 08:29:51,820 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-10 08:29:52,072 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:52,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-03-10 08:29:52,564 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:52,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-03-10 08:29:53,050 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:53,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-03-10 08:29:53,531 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:53,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-03-10 08:29:54,011 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:54,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-03-10 08:29:54,522 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:54,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-03-10 08:29:55,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:55,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-03-10 08:29:55,317 [ scc.repo] DEBUG ## Branches found:
2025-03-10 08:29:55,318 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-10 08:29:55,318 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:29:55,318 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:55,324 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-10 08:29:55,329 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-10 08:29:55,329 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-10 08:29:55,335 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-10 08:29:55,341 [ scc.git] DEBUG Already up to date.
2025-03-10 08:29:55,341 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-03-10 08:29:55,682 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-10 08:29:55,682 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-03-10 08:29:55,687 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-03-10 08:29:56,017 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-10 08:29:56,017 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-03-10 08:29:56,022 [ scc.git] DEBUG ## Unique users: []
2025-03-10 08:29:56,022 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:29:56,022 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:56,027 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-10 08:29:56,034 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:56,039 [ 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-10 08:29:56,156 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-10 08:29:56,159 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-03-10 08:29:56,159 [ scc.git] DEBUG package.json | 2 +-
2025-03-10 08:29:56,160 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-03-10 08:29:56,162 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:56,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:29:56,330 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-03-10 08:29:56,393 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:56,399 [ 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-10 08:29:56,530 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-10 08:29:56,530 [ scc.git] DEBUG Auto-merging package.json
2025-03-10 08:29:56,531 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-10 08:29:56,534 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-03-10 08:29:56,534 [ scc.git] DEBUG package.json | 2 +-
2025-03-10 08:29:56,534 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-03-10 08:29:56,582 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:56,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:29:56,742 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-10 08:29:56,787 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:29:56,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:56,793 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-10 08:29:56,833 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-10 08:29:56,842 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f75e4488880> has no local changes
2025-03-10 08:29:56,842 [ 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#357 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/)'
2025-03-10 08:29:56,852 [ scc.git] DEBUG [detached HEAD 7d3b96e] merge master -Dorg -Ssuccess-only
2025-03-10 08:29:56,852 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:29:56,853 [ scc.repo] DEBUG ## PRs found:
2025-03-10 08:29:56,994 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:57,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-03-10 08:29:57,178 [ scc.repo] DEBUG ## Branches found:
2025-03-10 08:29:57,178 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-10 08:29:57,178 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:29:57,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:57,185 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-10 08:29:57,189 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-10 08:29:57,189 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-10 08:29:57,195 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-10 08:29:57,200 [ scc.git] DEBUG Already up to date.
2025-03-10 08:29:57,201 [ scc.git] DEBUG ## Unique users: []
2025-03-10 08:29:57,201 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:29:57,201 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:57,205 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-10 08:29:57,248 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:29:57,248 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:57,253 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-10 08:29:57,294 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-10 08:29:57,301 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f75e4477220> has no local changes
2025-03-10 08:29:57,301 [ 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#357 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/)'
2025-03-10 08:29:57,310 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:29:57,311 [ scc.git] DEBUG [detached HEAD fba509a] merge master -Dorg -Ssuccess-only
2025-03-10 08:29:57,311 [ scc.repo] DEBUG ## PRs found:
2025-03-10 08:29:57,430 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:57,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-03-10 08:29:57,992 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:58,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-03-10 08:29:58,508 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:58,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-03-10 08:29:58,987 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:59,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-03-10 08:29:59,215 [ scc.repo] DEBUG ## Branches found:
2025-03-10 08:29:59,215 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-10 08:29:59,215 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:29:59,215 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:59,221 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-10 08:29:59,227 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-10 08:29:59,227 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-10 08:29:59,232 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-10 08:29:59,238 [ scc.git] DEBUG Already up to date.
2025-03-10 08:29:59,238 [ scc.git] DEBUG ## Unique users: []
2025-03-10 08:29:59,238 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:29:59,238 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:59,243 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-10 08:29:59,286 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:29:59,286 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:29:59,292 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-10 08:29:59,333 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-10 08:29:59,340 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f75e4473820> has no local changes
2025-03-10 08:29:59,340 [ 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#357 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/)'
2025-03-10 08:29:59,349 [ scc.git] DEBUG [detached HEAD bbe11c5] merge master -Dorg -Ssuccess-only
2025-03-10 08:29:59,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:29:59,350 [ scc.repo] DEBUG ## PRs found:
2025-03-10 08:29:59,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:29:59,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-03-10 08:29:59,990 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:00,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-03-10 08:30:00,511 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:00,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-03-10 08:30:01,036 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:01,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-10 08:30:01,622 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:01,886 [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-10 08:30:02,139 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:02,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-10 08:30:02,732 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:02,915 [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-10 08:30:02,916 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-10 08:30:02,916 [ scc.repo] DEBUG ## Branches found:
2025-03-10 08:30:02,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-10 08:30:02,916 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:02,917 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:02,923 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-10 08:30:02,928 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-10 08:30:02,928 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-10 08:30:02,934 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-10 08:30:02,939 [ scc.git] DEBUG Already up to date.
2025-03-10 08:30:02,939 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-03-10 08:30:03,364 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-03-10 08:30:03,364 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-03-10 08:30:03,369 [ scc.git] DEBUG ## Unique users: []
2025-03-10 08:30:03,369 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:03,369 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:03,375 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-10 08:30:03,381 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:03,386 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-10 08:30:03,537 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-03-10 08:30:03,537 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-03-10 08:30:03,537 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-03-10 08:30:03,538 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-03-10 08:30:03,538 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-03-10 08:30:03,538 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-03-10 08:30:03,538 [ scc.git] DEBUG Auto-merging setup.py
2025-03-10 08:30:03,538 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-03-10 08:30:03,538 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-10 08:30:03,538 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-10 08:30:03,543 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-10 08:30:03,550 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-03-10 08:30:03,553 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:03,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:03,729 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-10 08:30:03,735 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-10 08:30:03,763 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#357](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/signup_settings.py
- setup.py
- omero_signup/urls.py
--conflicts
2025-03-10 08:30:03,768 [ scc.config] DEBUG Found github.token
2025-03-10 08:30:03,769 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-03-10 08:30:03,769 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-10 08:30:03,811 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:03,811 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:03,817 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-10 08:30:03,857 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-10 08:30:03,866 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f75e4419fd0> has no local changes
2025-03-10 08:30:03,866 [ 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#357 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/)'
2025-03-10 08:30:03,877 [ scc.git] DEBUG [detached HEAD b0b5823] merge master -Dorg -Ssuccess-only
2025-03-10 08:30:03,878 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:03,878 [ scc.repo] DEBUG ## PRs found:
2025-03-10 08:30:03,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:04,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-03-10 08:30:04,539 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:04,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-03-10 08:30:05,080 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:05,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-03-10 08:30:05,605 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:05,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-03-10 08:30:06,163 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:06,408 [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-10 08:30:06,661 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:07,030 [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-10 08:30:07,282 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:07,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-03-10 08:30:07,829 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:08,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-03-10 08:30:08,349 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:08,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-03-10 08:30:08,854 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:09,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-03-10 08:30:09,355 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:09,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-10 08:30:09,922 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:10,163 [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-10 08:30:10,415 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:10,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-10 08:30:10,929 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:11,107 [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-10 08:30:11,107 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-10 08:30:11,108 [ scc.repo] DEBUG ## Branches found:
2025-03-10 08:30:11,108 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-10 08:30:11,108 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:11,108 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:11,115 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-10 08:30:11,120 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-10 08:30:11,120 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-10 08:30:11,126 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-10 08:30:11,133 [ scc.git] DEBUG Already up to date.
2025-03-10 08:30:11,134 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-03-10 08:30:11,551 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-03-10 08:30:11,551 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-03-10 08:30:11,556 [ scc.git] DEBUG ## Unique users: []
2025-03-10 08:30:11,556 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:11,557 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:11,563 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-03-10 08:30:11,570 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:11,575 [ 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-10 08:30:11,611 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-10 08:30:11,615 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-03-10 08:30:11,615 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-03-10 08:30:11,615 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-03-10 08:30:11,615 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-03-10 08:30:11,615 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-03-10 08:30:11,615 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-03-10 08:30:11,615 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-03-10 08:30:11,615 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-03-10 08:30:11,616 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-03-10 08:30:11,616 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-03-10 08:30:11,618 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:11,618 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-03-10 08:30:11,618 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-03-10 08:30:11,618 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-03-10 08:30:11,618 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-03-10 08:30:11,618 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-03-10 08:30:11,618 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-03-10 08:30:11,618 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-03-10 08:30:11,618 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-03-10 08:30:11,618 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-03-10 08:30:11,618 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-03-10 08:30:11,618 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-03-10 08:30:11,618 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-03-10 08:30:11,619 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-03-10 08:30:11,619 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-03-10 08:30:11,619 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-03-10 08:30:11,619 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-03-10 08:30:11,619 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-03-10 08:30:11,619 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-03-10 08:30:11,619 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-03-10 08:30:11,619 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-03-10 08:30:11,619 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-03-10 08:30:11,619 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-03-10 08:30:11,619 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-03-10 08:30:11,619 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-03-10 08:30:11,619 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-03-10 08:30:11,619 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-03-10 08:30:11,619 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-03-10 08:30:11,619 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-03-10 08:30:11,619 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-03-10 08:30:11,619 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-03-10 08:30:11,619 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-03-10 08:30:11,619 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-03-10 08:30:11,619 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-03-10 08:30:11,619 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-03-10 08:30:11,619 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-03-10 08:30:11,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:11,780 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-10 08:30:11,823 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:11,824 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:11,829 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-10 08:30:11,870 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-10 08:30:11,878 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f75e4473a90> has no local changes
2025-03-10 08:30:11,878 [ 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#357 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/)'
2025-03-10 08:30:11,888 [ scc.git] DEBUG [detached HEAD c51c1b6] merge master -Dorg -Ssuccess-only
2025-03-10 08:30:11,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:11,889 [ scc.repo] DEBUG ## PRs found:
2025-03-10 08:30:12,032 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:12,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-03-10 08:30:12,259 [ scc.repo] DEBUG ## Branches found:
2025-03-10 08:30:12,259 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-10 08:30:12,259 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:12,259 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:12,265 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-10 08:30:12,270 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-10 08:30:12,270 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-10 08:30:12,275 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-10 08:30:12,281 [ scc.git] DEBUG Already up to date.
2025-03-10 08:30:12,281 [ scc.git] DEBUG ## Unique users: []
2025-03-10 08:30:12,281 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:12,282 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:12,286 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-10 08:30:12,329 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:12,330 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:12,335 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-10 08:30:12,375 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-10 08:30:12,381 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f75e4403250> has no local changes
2025-03-10 08:30:12,381 [ 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#357 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/)'
2025-03-10 08:30:12,390 [ scc.git] DEBUG [detached HEAD 0588aa2] merge master -Dorg -Ssuccess-only
2025-03-10 08:30:12,390 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:12,390 [ scc.repo] DEBUG ## PRs found:
2025-03-10 08:30:12,511 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:12,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-03-10 08:30:13,051 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:13,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-03-10 08:30:13,570 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:13,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-03-10 08:30:14,081 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:14,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-10 08:30:14,683 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:14,924 [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-10 08:30:15,177 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:15,406 [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-10 08:30:15,659 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:15,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-10 08:30:16,183 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:16,360 [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-10 08:30:16,361 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-03-10 08:30:16,361 [ scc.repo] DEBUG ## Branches found:
2025-03-10 08:30:16,361 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-10 08:30:16,361 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:16,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:16,368 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-10 08:30:16,374 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-10 08:30:16,374 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-10 08:30:16,380 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-10 08:30:16,386 [ scc.git] DEBUG Already up to date.
2025-03-10 08:30:16,386 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-03-10 08:30:16,947 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-03-10 08:30:16,947 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-03-10 08:30:16,952 [ scc.git] DEBUG ## Unique users: []
2025-03-10 08:30:16,952 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:16,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:16,958 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-03-10 08:30:16,964 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:16,970 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-03-10 08:30:17,005 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-10 08:30:17,008 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-03-10 08:30:17,008 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-03-10 08:30:17,008 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-03-10 08:30:17,008 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-03-10 08:30:17,008 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-03-10 08:30:17,011 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:17,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:17,173 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-10 08:30:17,220 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:17,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:17,227 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-10 08:30:17,272 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-10 08:30:17,280 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f75e4473a60> has no local changes
2025-03-10 08:30:17,280 [ 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#357 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/)'
2025-03-10 08:30:17,290 [ scc.git] DEBUG [detached HEAD 090ec5f] merge master -Dorg -Ssuccess-only
2025-03-10 08:30:17,290 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:17,291 [ scc.git] INFO Overriding base-branch from master to main
2025-03-10 08:30:17,291 [ scc.repo] DEBUG ## PRs found:
2025-03-10 08:30:17,425 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:17,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-03-10 08:30:18,048 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:18,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-03-10 08:30:18,576 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:18,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-03-10 08:30:19,095 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:19,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-03-10 08:30:19,690 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:19,994 [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-10 08:30:20,247 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:20,473 [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-10 08:30:20,726 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:20,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-03-10 08:30:21,222 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:21,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-03-10 08:30:21,704 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:21,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-03-10 08:30:22,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:22,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-10 08:30:22,830 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:23,080 [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-10 08:30:23,333 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:23,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-10 08:30:23,841 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:24,030 [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-10 08:30:24,031 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-10 08:30:24,031 [ scc.repo] DEBUG ## Branches found:
2025-03-10 08:30:24,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-10 08:30:24,032 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:24,032 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:24,038 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-03-10 08:30:24,043 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-10 08:30:24,044 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-03-10 08:30:24,050 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-03-10 08:30:24,056 [ scc.git] DEBUG Already up to date.
2025-03-10 08:30:24,056 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-03-10 08:30:24,485 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-03-10 08:30:24,485 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-03-10 08:30:24,491 [ scc.git] DEBUG ## Unique users: []
2025-03-10 08:30:24,491 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:24,491 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:24,497 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-10 08:30:24,504 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:24,509 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-10 08:30:24,621 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-03-10 08:30:24,622 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-03-10 08:30:24,622 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-10 08:30:24,623 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-10 08:30:24,630 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-10 08:30:24,637 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-03-10 08:30:24,640 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:24,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:24,812 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-10 08:30:24,819 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-10 08:30:24,825 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#357](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-03-10 08:30:24,830 [ scc.config] DEBUG Found github.token
2025-03-10 08:30:24,830 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-03-10 08:30:24,830 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-10 08:30:24,876 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:24,876 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:24,882 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-10 08:30:24,926 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-10 08:30:24,934 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f75e43d9100> has no local changes
2025-03-10 08:30:24,934 [ 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#357 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/)'
2025-03-10 08:30:24,943 [ scc.git] DEBUG [detached HEAD 303cd8f] merge master -Dorg -Ssuccess-only
2025-03-10 08:30:24,944 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:24,944 [ scc.repo] DEBUG ## PRs found:
2025-03-10 08:30:25,064 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:25,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-03-10 08:30:25,273 [ scc.repo] DEBUG ## Branches found:
2025-03-10 08:30:25,273 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-10 08:30:25,273 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:25,273 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:25,280 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-10 08:30:25,285 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-10 08:30:25,286 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-10 08:30:25,291 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-10 08:30:25,297 [ scc.git] DEBUG Already up to date.
2025-03-10 08:30:25,297 [ scc.git] DEBUG ## Unique users: []
2025-03-10 08:30:25,297 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:25,297 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:25,302 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-10 08:30:25,346 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:25,347 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:25,352 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-10 08:30:25,396 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-10 08:30:25,403 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f75e43185b0> has no local changes
2025-03-10 08:30:25,403 [ 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#357 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/)'
2025-03-10 08:30:25,412 [ scc.git] DEBUG [detached HEAD 2b7f9cf] merge master -Dorg -Ssuccess-only
2025-03-10 08:30:25,412 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:25,413 [ scc.repo] DEBUG ## PRs found:
2025-03-10 08:30:25,525 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:25,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-03-10 08:30:25,723 [ scc.repo] DEBUG ## Branches found:
2025-03-10 08:30:25,723 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-10 08:30:25,723 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:25,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:25,730 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-10 08:30:25,735 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-10 08:30:25,735 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-10 08:30:25,741 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-10 08:30:25,747 [ scc.git] DEBUG Already up to date.
2025-03-10 08:30:25,747 [ scc.git] DEBUG ## Unique users: []
2025-03-10 08:30:25,747 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:25,747 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:25,753 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-10 08:30:25,798 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:25,798 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:25,804 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-10 08:30:25,847 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-10 08:30:25,855 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f75e43ee520> has no local changes
2025-03-10 08:30:25,856 [ 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#357 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/)'
2025-03-10 08:30:25,866 [ scc.git] DEBUG [detached HEAD 9c0be98] merge master -Dorg -Ssuccess-only
2025-03-10 08:30:25,866 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:25,867 [ scc.repo] DEBUG ## PRs found:
2025-03-10 08:30:25,975 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:26,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-03-10 08:30:26,508 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:26,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-03-10 08:30:26,991 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:27,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-03-10 08:30:27,498 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:27,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-10 08:30:28,018 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:28,339 [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-10 08:30:28,592 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:28,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-10 08:30:29,180 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:29,358 [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-10 08:30:29,358 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-03-10 08:30:29,358 [ scc.repo] DEBUG ## Branches found:
2025-03-10 08:30:29,359 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-10 08:30:29,359 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:29,359 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:29,365 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-10 08:30:29,371 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-10 08:30:29,371 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-10 08:30:29,377 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-10 08:30:29,384 [ scc.git] DEBUG Already up to date.
2025-03-10 08:30:29,384 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-03-10 08:30:29,786 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-03-10 08:30:29,787 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-03-10 08:30:29,792 [ scc.git] DEBUG ## Unique users: []
2025-03-10 08:30:29,792 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:29,792 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:29,798 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-10 08:30:29,804 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:29,809 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-10 08:30:29,846 [ scc.git] DEBUG Auto-merging Dockerfile
2025-03-10 08:30:29,846 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-03-10 08:30:29,847 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-10 08:30:29,847 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-10 08:30:29,855 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-10 08:30:29,863 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-03-10 08:30:29,866 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:30,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:30,039 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-10 08:30:30,046 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-10 08:30:30,053 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#357](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-03-10 08:30:30,058 [ scc.config] DEBUG Found github.token
2025-03-10 08:30:30,058 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-03-10 08:30:30,058 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-10 08:30:30,104 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:30,104 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:30,110 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-10 08:30:30,154 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-10 08:30:30,162 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f75e4318610> has no local changes
2025-03-10 08:30:30,162 [ 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#357 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/)'
2025-03-10 08:30:30,172 [ scc.git] DEBUG [detached HEAD 257e10a] merge master -Dorg -Ssuccess-only
2025-03-10 08:30:30,173 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:30,173 [ scc.git] INFO Overriding base-branch from master to develop
2025-03-10 08:30:30,173 [ scc.repo] DEBUG ## PRs found:
2025-03-10 08:30:30,291 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:30,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-03-10 08:30:30,854 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:31,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-03-10 08:30:31,345 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:31,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-03-10 08:30:31,846 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:32,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-10 08:30:32,324 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:32,563 [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-10 08:30:32,816 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:33,025 [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-10 08:30:33,277 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:33,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-10 08:30:33,736 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:33,921 [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-10 08:30:33,922 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-10 08:30:34,174 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:34,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-03-10 08:30:34,669 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:34,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-03-10 08:30:35,161 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:35,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-10 08:30:35,668 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:35,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-10 08:30:36,116 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:36,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-10 08:30:36,593 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:36,797 [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-10 08:30:36,798 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-10 08:30:37,050 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:37,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-03-10 08:30:37,582 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:37,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-03-10 08:30:38,149 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:38,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-03-10 08:30:38,649 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:38,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-03-10 08:30:38,962 [ scc.repo] DEBUG ## Branches found:
2025-03-10 08:30:38,962 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-10 08:30:38,962 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:38,962 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:38,969 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-03-10 08:30:38,974 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-10 08:30:38,974 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-03-10 08:30:38,980 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-03-10 08:30:38,985 [ scc.git] DEBUG Already up to date.
2025-03-10 08:30:38,985 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-03-10 08:30:39,690 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-10 08:30:39,690 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-03-10 08:30:39,695 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-03-10 08:30:40,060 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-10 08:30:40,061 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-03-10 08:30:40,066 [ scc.git] DEBUG ## Unique users: []
2025-03-10 08:30:40,067 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:40,067 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:40,073 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-10 08:30:40,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:40,086 [ 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-10 08:30:40,129 [ 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-10 08:30:40,129 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-10 08:30:40,129 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-10 08:30:40,134 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-10 08:30:40,141 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-03-10 08:30:40,143 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:40,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:40,296 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-10 08:30:40,304 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-10 08:30:40,311 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#357](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-03-10 08:30:40,316 [ scc.config] DEBUG Found github.token
2025-03-10 08:30:40,316 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-03-10 08:30:40,316 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-10 08:30:40,323 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:40,328 [ 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-10 08:30:40,354 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-10 08:30:40,357 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-03-10 08:30:40,357 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-03-10 08:30:40,548 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:40,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:40,736 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-10 08:30:40,779 [ scc.git] DEBUG Get sha1 of %s
2025-03-10 08:30:40,779 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-10 08:30:40,784 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-10 08:30:40,828 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-10 08:30:40,835 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f75e436e580> has no local changes
2025-03-10 08:30:40,835 [ 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#357 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/)'
2025-03-10 08:30:40,845 [ scc.git] DEBUG [detached HEAD 0ba43ce] merge master -Dorg -Ssuccess-only
2025-03-10 08:30:40,845 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:40,845 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-10 08:30:40,929 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-03-10 08:30:40,987 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:41,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:41,185 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-03-10 08:30:41,189 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-03-10 08:30:41,426 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:41,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:41,609 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-03-10 08:30:41,613 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-03-10 08:30:41,850 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:42,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:42,036 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-03-10 08:30:42,041 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-03-10 08:30:42,278 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:42,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:42,448 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-03-10 08:30:42,684 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:42,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:42,872 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-03-10 08:30:42,878 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-03-10 08:30:43,114 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:43,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:43,296 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-03-10 08:30:43,302 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-03-10 08:30:43,537 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:43,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:43,713 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-03-10 08:30:43,717 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-03-10 08:30:43,954 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:44,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:44,139 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-03-10 08:30:44,143 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-03-10 08:30:44,381 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:44,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:44,599 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-03-10 08:30:44,604 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-03-10 08:30:44,841 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:45,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:45,018 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-03-10 08:30:45,023 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-03-10 08:30:45,259 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:45,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:45,433 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-03-10 08:30:45,438 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-03-10 08:30:45,675 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:45,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:45,858 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-03-10 08:30:45,863 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-03-10 08:30:46,100 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:46,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:46,284 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-03-10 08:30:46,520 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:46,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:46,697 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-03-10 08:30:46,934 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:47,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:47,124 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-03-10 08:30:47,129 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-03-10 08:30:47,365 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:47,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:47,546 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-03-10 08:30:47,783 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:47,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:47,982 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-03-10 08:30:48,219 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:48,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:48,399 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-03-10 08:30:48,404 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-03-10 08:30:48,641 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:48,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:48,827 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-03-10 08:30:48,832 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-03-10 08:30:49,067 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:49,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:49,277 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-03-10 08:30:49,282 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-03-10 08:30:49,518 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:49,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:49,706 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-03-10 08:30:49,711 [ scc.config] DEBUG Found submodule.scripts.url
2025-03-10 08:30:49,947 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-10 08:30:50,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-10 08:30:50,128 [ scc.config] DEBUG Found submodule.scripts.branch
2025-03-10 08:30:50,128 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-10 08:30:50,223 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f75e6044ca0> has local changes
2025-03-10 08:30:50,224 [ 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#357 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/357/)'
2025-03-10 08:30:50,240 [ scc.git] DEBUG [detached HEAD 2015b23] merge master -Dorg -Ssuccess-only
2025-03-10 08:30:50,241 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-03-10 08:30:50,241 [ scc.merge] INFO Repository: ome/omero-plugins
2025-03-10 08:30:50,241 [ scc.merge] INFO Already up to date.
2025-03-10 08:30:50,241 [ scc.merge] INFO
2025-03-10 08:30:50,241 [ scc.merge] INFO Merged PRs:
2025-03-10 08:30:50,241 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-03-10 08:30:50,241 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-03-10 08:30:50,241 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-03-10 08:30:50,241 [ scc.merge] INFO
2025-03-10 08:30:50,241 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-03-10 08:30:50,241 [ scc.merge] INFO Already up to date.
2025-03-10 08:30:50,241 [ scc.merge] INFO
2025-03-10 08:30:50,241 [ scc.merge] INFO
2025-03-10 08:30:50,241 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-03-10 08:30:50,241 [ scc.merge] INFO Excluded PRs:
2025-03-10 08:30:50,241 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-03-10 08:30:50,241 [ scc.merge] INFO Already up to date.
2025-03-10 08:30:50,241 [ scc.merge] INFO
2025-03-10 08:30:50,241 [ scc.merge] INFO
2025-03-10 08:30:50,241 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-03-10 08:30:50,241 [ scc.merge] INFO Excluded PRs:
2025-03-10 08:30:50,241 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-03-10 08:30:50,242 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-03-10 08:30:50,242 [ scc.merge] INFO Already up to date.
2025-03-10 08:30:50,242 [ scc.merge] INFO
2025-03-10 08:30:50,242 [ scc.merge] INFO Merged PRs:
2025-03-10 08:30:50,242 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-03-10 08:30:50,242 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-03-10 08:30:50,242 [ scc.merge] INFO
2025-03-10 08:30:50,242 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-03-10 08:30:50,242 [ scc.merge] INFO Excluded PRs:
2025-03-10 08:30:50,242 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-03-10 08:30:50,242 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-03-10 08:30:50,242 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-10 08:30:50,242 [ scc.merge] INFO Already up to date.
2025-03-10 08:30:50,242 [ scc.merge] INFO
2025-03-10 08:30:50,242 [ scc.merge] INFO Merged PRs:
2025-03-10 08:30:50,242 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-03-10 08:30:50,242 [ scc.merge] INFO
2025-03-10 08:30:50,242 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-10 08:30:50,242 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-03-10 08:30:50,242 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-03-10 08:30:50,242 [ scc.merge] INFO
2025-03-10 08:30:50,242 [ scc.merge] INFO Repository: ome/omero-figure
2025-03-10 08:30:50,242 [ scc.merge] INFO Excluded PRs:
2025-03-10 08:30:50,242 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-03-10 08:30:50,242 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (stage: draft)
2025-03-10 08:30:50,242 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-03-10 08:30:50,242 [ scc.merge] INFO Already up to date.
2025-03-10 08:30:50,242 [ scc.merge] INFO
2025-03-10 08:30:50,243 [ scc.merge] INFO Merged PRs:
2025-03-10 08:30:50,243 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-03-10 08:30:50,243 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-03-10 08:30:50,243 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-03-10 08:30:50,243 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-03-10 08:30:50,243 [ scc.merge] INFO
2025-03-10 08:30:50,243 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-10 08:30:50,243 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-03-10 08:30:50,243 [ scc.merge] INFO
2025-03-10 08:30:50,243 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-03-10 08:30:50,243 [ scc.merge] INFO Already up to date.
2025-03-10 08:30:50,243 [ scc.merge] INFO
2025-03-10 08:30:50,243 [ scc.merge] INFO Merged PRs:
2025-03-10 08:30:50,243 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-03-10 08:30:50,243 [ scc.merge] INFO
2025-03-10 08:30:50,243 [ scc.merge] INFO Repository: ome/omero-gallery
2025-03-10 08:30:50,243 [ scc.merge] INFO Already up to date.
2025-03-10 08:30:50,243 [ scc.merge] INFO
2025-03-10 08:30:50,243 [ scc.merge] INFO Merged PRs:
2025-03-10 08:30:50,243 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-03-10 08:30:50,243 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-03-10 08:30:50,243 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-03-10 08:30:50,243 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-03-10 08:30:50,243 [ scc.merge] INFO
2025-03-10 08:30:50,243 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-10 08:30:50,243 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-03-10 08:30:50,243 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-03-10 08:30:50,243 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-03-10 08:30:50,243 [ scc.merge] INFO
2025-03-10 08:30:50,243 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-03-10 08:30:50,244 [ scc.merge] INFO Excluded PRs:
2025-03-10 08:30:50,244 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-03-10 08:30:50,244 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-03-10 08:30:50,244 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-03-10 08:30:50,244 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-03-10 08:30:50,244 [ scc.merge] INFO Already up to date.
2025-03-10 08:30:50,244 [ scc.merge] INFO
2025-03-10 08:30:50,244 [ scc.merge] INFO Merged PRs:
2025-03-10 08:30:50,244 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-03-10 08:30:50,244 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-03-10 08:30:50,244 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-10 08:30:50,244 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-10 08:30:50,244 [ scc.merge] INFO
2025-03-10 08:30:50,244 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-10 08:30:50,244 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-10 08:30:50,244 [ scc.merge] INFO
2025-03-10 08:30:50,244 [ scc.merge] INFO Repository: ome/omero-mapr
2025-03-10 08:30:50,244 [ scc.merge] INFO Excluded PRs:
2025-03-10 08:30:50,244 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-03-10 08:30:50,244 [ scc.merge] INFO Already up to date.
2025-03-10 08:30:50,244 [ scc.merge] INFO
2025-03-10 08:30:50,244 [ scc.merge] INFO Merged PRs:
2025-03-10 08:30:50,244 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-03-10 08:30:50,244 [ scc.merge] INFO
2025-03-10 08:30:50,244 [ scc.merge] INFO Repository: ome/omero-metadata
2025-03-10 08:30:50,244 [ scc.merge] INFO Already up to date.
2025-03-10 08:30:50,244 [ scc.merge] INFO
2025-03-10 08:30:50,244 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-10 08:30:50,244 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-10 08:30:50,244 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-10 08:30:50,245 [ scc.merge] INFO
2025-03-10 08:30:50,245 [ scc.merge] INFO Repository: ome/omero-parade
2025-03-10 08:30:50,245 [ scc.merge] INFO Excluded PRs:
2025-03-10 08:30:50,245 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-03-10 08:30:50,245 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-03-10 08:30:50,245 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-03-10 08:30:50,245 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-03-10 08:30:50,245 [ scc.merge] INFO Already up to date.
2025-03-10 08:30:50,245 [ scc.merge] INFO
2025-03-10 08:30:50,245 [ scc.merge] INFO Merged PRs:
2025-03-10 08:30:50,245 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-10 08:30:50,245 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-10 08:30:50,245 [ scc.merge] INFO
2025-03-10 08:30:50,245 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-03-10 08:30:50,245 [ scc.merge] INFO Already up to date.
2025-03-10 08:30:50,245 [ scc.merge] INFO
2025-03-10 08:30:50,245 [ scc.merge] INFO
2025-03-10 08:30:50,245 [ scc.merge] INFO Repository: ome/omero-rois
2025-03-10 08:30:50,245 [ scc.merge] INFO Excluded PRs:
2025-03-10 08:30:50,245 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-03-10 08:30:50,245 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-10 08:30:50,245 [ scc.merge] INFO Already up to date.
2025-03-10 08:30:50,245 [ scc.merge] INFO
2025-03-10 08:30:50,245 [ scc.merge] INFO
2025-03-10 08:30:50,245 [ scc.merge] INFO Repository: ome/omero-signup
2025-03-10 08:30:50,245 [ scc.merge] INFO Already up to date.
2025-03-10 08:30:50,245 [ scc.merge] INFO
2025-03-10 08:30:50,245 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-10 08:30:50,245 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-10 08:30:50,245 [ scc.merge] INFO
2025-03-10 08:30:50,245 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-03-10 08:30:50,246 [ scc.merge] INFO Excluded PRs:
2025-03-10 08:30:50,246 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-03-10 08:30:50,246 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-03-10 08:30:50,246 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-03-10 08:30:50,246 [ scc.merge] INFO Already up to date.
2025-03-10 08:30:50,246 [ scc.merge] INFO
2025-03-10 08:30:50,246 [ scc.merge] INFO Merged PRs:
2025-03-10 08:30:50,246 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-10 08:30:50,246 [ scc.merge] INFO
2025-03-10 08:30:50,246 [ scc.merge] INFO Repository: ome/omero-upload
2025-03-10 08:30:50,246 [ scc.merge] INFO Already up to date.
2025-03-10 08:30:50,246 [ scc.merge] INFO
2025-03-10 08:30:50,246 [ scc.merge] INFO
2025-03-10 08:30:50,246 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-03-10 08:30:50,246 [ scc.merge] INFO Already up to date.
2025-03-10 08:30:50,246 [ scc.merge] INFO
2025-03-10 08:30:50,246 [ scc.merge] INFO Merged PRs:
2025-03-10 08:30:50,246 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-03-10 08:30:50,246 [ scc.merge] INFO
2025-03-10 08:30:50,246 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-03-10 08:30:50,246 [ scc.merge] INFO Excluded PRs:
2025-03-10 08:30:50,246 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-03-10 08:30:50,246 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-03-10 08:30:50,246 [ scc.merge] INFO Already up to date.
2025-03-10 08:30:50,246 [ scc.merge] INFO
2025-03-10 08:30:50,246 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-10 08:30:50,246 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-10 08:30:50,246 [ scc.merge] INFO
2025-03-10 08:30:50,246 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-03-10 08:30:50,246 [ scc.merge] INFO Already up to date.
2025-03-10 08:30:50,247 [ scc.merge] INFO
2025-03-10 08:30:50,247 [ scc.merge] INFO
2025-03-10 08:30:50,247 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-03-10 08:30:50,247 [ scc.merge] INFO Already up to date.
2025-03-10 08:30:50,247 [ scc.merge] INFO
2025-03-10 08:30:50,247 [ scc.merge] INFO
2025-03-10 08:30:50,247 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-03-10 08:30:50,247 [ scc.merge] INFO Already up to date.
2025-03-10 08:30:50,247 [ scc.merge] INFO
2025-03-10 08:30:50,247 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-10 08:30:50,247 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-03-10 08:30:50,247 [ scc.merge] INFO
2025-03-10 08:30:50,247 [ scc.merge] INFO Repository: ome/scripts
2025-03-10 08:30:50,247 [ scc.merge] INFO Excluded PRs:
2025-03-10 08:30:50,247 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-03-10 08:30:50,247 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-03-10 08:30:50,247 [ scc.merge] INFO Already up to date.
2025-03-10 08:30:50,247 [ scc.merge] INFO
2025-03-10 08:30:50,247 [ scc.merge] INFO Merged PRs:
2025-03-10 08:30:50,247 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-10 08:30:50,247 [ scc.merge] INFO
2025-03-10 08:30:50,247 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-10 08:30:50,247 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-10 08:30:50,247 [ scc.merge] INFO
2025-03-10 08:30:50,247 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-03-10 08:30:50,247 [ scc.git] DEBUG Calling 'git remote'
2025-03-10 08:30:50,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-03-10 08:30:50,253 [ scc.git] DEBUG Calling 'git remote'
2025-03-10 08:30:50,258 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:50,258 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-03-10 08:30:50,258 [ scc.git] DEBUG Calling 'git remote'
2025-03-10 08:30:50,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:50,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-03-10 08:30:50,263 [ scc.git] DEBUG Calling 'git remote'
2025-03-10 08:30:50,268 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:50,268 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-03-10 08:30:50,268 [ scc.git] DEBUG Calling 'git remote'
2025-03-10 08:30:50,273 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:50,273 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-03-10 08:30:50,273 [ scc.git] DEBUG Calling 'git remote'
2025-03-10 08:30:50,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:50,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-03-10 08:30:50,278 [ scc.git] DEBUG Calling 'git remote'
2025-03-10 08:30:50,283 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:50,283 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-03-10 08:30:50,283 [ scc.git] DEBUG Calling 'git remote'
2025-03-10 08:30:50,288 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:50,288 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-10 08:30:50,288 [ scc.git] DEBUG Calling 'git remote'
2025-03-10 08:30:50,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:50,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-10 08:30:50,293 [ scc.git] DEBUG Calling 'git remote'
2025-03-10 08:30:50,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:50,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-10 08:30:50,298 [ scc.git] DEBUG Calling 'git remote'
2025-03-10 08:30:50,303 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:50,303 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-10 08:30:50,303 [ scc.git] DEBUG Calling 'git remote'
2025-03-10 08:30:50,308 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:50,308 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-10 08:30:50,308 [ scc.git] DEBUG Calling 'git remote'
2025-03-10 08:30:50,313 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:50,313 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-10 08:30:50,313 [ scc.git] DEBUG Calling 'git remote'
2025-03-10 08:30:50,317 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:50,318 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-10 08:30:50,318 [ scc.git] DEBUG Calling 'git remote'
2025-03-10 08:30:50,323 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:50,323 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-10 08:30:50,323 [ scc.git] DEBUG Calling 'git remote'
2025-03-10 08:30:50,328 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:50,328 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-10 08:30:50,328 [ scc.git] DEBUG Calling 'git remote'
2025-03-10 08:30:50,333 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:50,333 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-10 08:30:50,333 [ scc.git] DEBUG Calling 'git remote'
2025-03-10 08:30:50,338 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:50,338 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-10 08:30:50,339 [ scc.git] DEBUG Calling 'git remote'
2025-03-10 08:30:50,343 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:50,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-10 08:30:50,344 [ scc.git] DEBUG Calling 'git remote'
2025-03-10 08:30:50,348 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:50,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-10 08:30:50,349 [ scc.git] DEBUG Calling 'git remote'
2025-03-10 08:30:50,353 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:50,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-10 08:30:50,354 [ scc.git] DEBUG Calling 'git remote'
2025-03-10 08:30:50,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-10 08:30:50,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-10 08:30:50,358 [ scc.git] DEBUG Calling 'git remote'
2025-03-10 08:30:50,363 [ 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 823d760] 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 45130a2] 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-10 08:31:39,154 [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-10 08:31:48,714 [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-10 08:31:51,331 [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-10 08:31:56,228 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-10 08:32:40,437 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts (hide)
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/316c2b55/images/svgs/logo.svg){kind=logo}
