Skipping 183 KB..
Full Log2025-03-04 00:46:14,321 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-04 00:46:14,369 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:46:14,370 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:46:14,376 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-04 00:46:14,416 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-04 00:46:14,424 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f433b198940> has no local changes
2025-03-04 00:46:14,424 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Generated by OMERO-plugins-push#351 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/)'
2025-03-04 00:46:14,433 [ scc.git] DEBUG [detached HEAD 8bbb264] merge master -Dorg -Ssuccess-only
2025-03-04 00:46:14,434 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:46:14,434 [ scc.repo] DEBUG ## PRs found:
2025-03-04 00:46:14,574 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:14,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-03-04 00:46:15,162 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:15,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/503 HTTP/1.1" 200 None
2025-03-04 00:46:15,679 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:15,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/503/comments HTTP/1.1" 200 None
2025-03-04 00:46:16,153 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:16,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502 HTTP/1.1" 200 None
2025-03-04 00:46:16,652 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:16,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502/comments HTTP/1.1" 200 None
2025-03-04 00:46:16,893 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-04 00:46:17,144 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:17,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-03-04 00:46:17,733 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:17,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-04 00:46:18,247 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:18,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-04 00:46:18,819 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:19,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-03-04 00:46:19,315 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:19,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/45d08b7e29871ecff0386975c975dacd0865bcc4?per_page=1 HTTP/1.1" 200 2
2025-03-04 00:46:19,512 [ scc.repo] DEBUG - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-04 00:46:19,763 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:20,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-03-04 00:46:20,005 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-04 00:46:20,258 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:20,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-04 00:46:20,858 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:21,172 [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-04 00:46:21,424 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:21,699 [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-04 00:46:21,952 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:22,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-04 00:46:22,583 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:22,760 [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-04 00:46:22,761 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-04 00:46:23,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:23,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-03-04 00:46:23,492 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:23,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-03-04 00:46:24,004 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:24,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-03-04 00:46:24,510 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:24,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-03-04 00:46:25,024 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:25,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-04 00:46:25,575 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:25,817 [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-04 00:46:26,070 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:26,294 [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-04 00:46:26,547 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:26,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-04 00:46:27,057 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:27,252 [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-04 00:46:27,253 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-04 00:46:27,504 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:27,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-03-04 00:46:27,985 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:28,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-03-04 00:46:28,528 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:28,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-04 00:46:29,056 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:29,292 [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-04 00:46:29,545 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:29,780 [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-04 00:46:30,033 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:30,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-04 00:46:30,568 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:30,752 [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-04 00:46:30,753 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-03-04 00:46:31,005 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:31,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-03-04 00:46:31,504 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:31,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-03-04 00:46:31,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:32,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-04 00:46:32,548 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:32,774 [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-04 00:46:33,027 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:33,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-04 00:46:33,532 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:33,721 [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-04 00:46:33,721 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-03-04 00:46:33,722 [ scc.repo] DEBUG ## Branches found:
2025-03-04 00:46:33,722 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-04 00:46:33,722 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:46:33,722 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:46:33,730 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-04 00:46:33,737 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-04 00:46:33,737 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-04 00:46:33,744 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-04 00:46:33,751 [ scc.git] DEBUG Already up to date.
2025-03-04 00:46:33,751 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-03-04 00:46:34,712 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-04 00:46:34,712 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-03-04 00:46:34,717 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-03-04 00:46:36,106 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-04 00:46:36,107 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-03-04 00:46:36,112 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-03-04 00:46:36,517 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-04 00:46:36,518 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-03-04 00:46:36,527 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-03-04 00:46:36,814 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-04 00:46:36,814 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-03-04 00:46:36,820 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-03-04 00:46:37,127 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-04 00:46:37,127 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-03-04 00:46:37,132 [ scc.git] DEBUG ## Unique users: []
2025-03-04 00:46:37,133 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:46:37,133 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:46:37,140 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-04 00:46:37,150 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:46:37,157 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-04 00:46:37,174 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-03-04 00:46:37,174 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-03-04 00:46:37,175 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-04 00:46:37,179 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-03-04 00:46:37,179 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-03-04 00:46:37,179 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-03-04 00:46:37,182 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:37,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:46:37,358 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-04 00:46:37,368 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:46:37,375 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-04 00:46:37,565 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-03-04 00:46:37,565 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-03-04 00:46:37,565 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-03-04 00:46:37,565 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-03-04 00:46:37,565 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-04 00:46:37,570 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-03-04 00:46:37,571 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-03-04 00:46:37,571 [ scc.git] DEBUG src/app/header.html | 5 +
2025-03-04 00:46:37,571 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-03-04 00:46:37,571 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-03-04 00:46:37,571 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-03-04 00:46:37,572 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-03-04 00:46:37,572 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-03-04 00:46:37,610 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:37,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:46:37,774 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-04 00:46:37,786 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:46:37,800 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-04 00:46:38,030 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-03-04 00:46:38,032 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-04 00:46:38,035 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-03-04 00:46:38,035 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-03-04 00:46:38,035 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-03-04 00:46:38,038 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:38,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:46:38,204 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-04 00:46:38,214 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:46:38,220 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-04 00:46:38,272 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-04 00:46:38,283 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-03-04 00:46:38,283 [ scc.git] DEBUG package.json | 2 +-
2025-03-04 00:46:38,283 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-03-04 00:46:38,456 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:38,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:46:38,623 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-04 00:46:38,646 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:46:38,652 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-04 00:46:38,774 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-04 00:46:38,774 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-03-04 00:46:38,774 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-04 00:46:38,775 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-04 00:46:38,782 [ scc.git] DEBUG Calling 'git reset --hard ec4cc23534a33bbb4772c034853bab8a511c8023'
2025-03-04 00:46:38,792 [ scc.git] DEBUG HEAD is now at ec4cc23 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-03-04 00:46:38,875 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:39,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:46:39,049 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-04 00:46:39,056 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-03-04 00:46:39,062 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#351](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-03-04 00:46:39,068 [ scc.config] DEBUG Found github.token
2025-03-04 00:46:39,068 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-03-04 00:46:39,068 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-04 00:46:39,110 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:46:39,110 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:46:39,117 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-04 00:46:39,161 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-04 00:46:39,173 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4338112520> has no local changes
2025-03-04 00:46:39,173 [ 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#351 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/)'
2025-03-04 00:46:39,202 [ scc.git] DEBUG [detached HEAD 6d67d98] merge master -Dorg -Ssuccess-only
2025-03-04 00:46:39,203 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:46:39,203 [ scc.repo] DEBUG ## PRs found:
2025-03-04 00:46:39,302 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:39,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-03-04 00:46:39,855 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:40,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-03-04 00:46:40,332 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:40,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-03-04 00:46:40,856 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:41,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-04 00:46:41,367 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:41,602 [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-04 00:46:41,854 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:42,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-04 00:46:42,377 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:42,558 [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-04 00:46:42,559 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-03-04 00:46:42,559 [ scc.repo] DEBUG ## Branches found:
2025-03-04 00:46:42,559 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-04 00:46:42,559 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:46:42,559 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:46:42,565 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-04 00:46:42,571 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-04 00:46:42,571 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-04 00:46:42,578 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-04 00:46:42,584 [ scc.git] DEBUG Already up to date.
2025-03-04 00:46:42,585 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-03-04 00:46:43,415 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-03-04 00:46:43,415 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-03-04 00:46:43,420 [ scc.git] DEBUG ## Unique users: []
2025-03-04 00:46:43,420 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:46:43,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:46:43,426 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-04 00:46:43,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:46:43,441 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-04 00:46:43,452 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-04 00:46:43,455 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-03-04 00:46:43,455 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-03-04 00:46:43,455 [ scc.git] DEBUG requirements.txt | 2 +-
2025-03-04 00:46:43,455 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-03-04 00:46:43,455 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-03-04 00:46:43,455 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-03-04 00:46:43,458 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:43,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:46:43,621 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-04 00:46:43,666 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:46:43,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:46:43,678 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-04 00:46:43,720 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-04 00:46:43,728 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f433b1a7af0> has no local changes
2025-03-04 00:46:43,729 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Generated by OMERO-plugins-push#351 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/)'
2025-03-04 00:46:43,739 [ scc.git] DEBUG [detached HEAD 39e0ef4] merge master -Dorg -Ssuccess-only
2025-03-04 00:46:43,739 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:46:43,740 [ scc.repo] DEBUG ## PRs found:
2025-03-04 00:46:43,876 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:44,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-03-04 00:46:44,447 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:44,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-03-04 00:46:44,958 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:45,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-03-04 00:46:45,525 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:45,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-04 00:46:46,100 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:46,313 [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-04 00:46:46,565 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:46,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-04 00:46:47,090 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:47,261 [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-04 00:46:47,262 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-04 00:46:47,514 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:47,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-03-04 00:46:48,027 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:48,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-03-04 00:46:48,511 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:48,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-04 00:46:49,046 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:49,293 [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-04 00:46:49,545 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:49,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-04 00:46:50,060 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:50,231 [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-04 00:46:50,233 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-04 00:46:50,233 [ scc.repo] DEBUG ## Branches found:
2025-03-04 00:46:50,233 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-04 00:46:50,233 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:46:50,234 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:46:50,243 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-04 00:46:50,249 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-04 00:46:50,249 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-04 00:46:50,255 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-04 00:46:50,262 [ scc.git] DEBUG Already up to date.
2025-03-04 00:46:50,262 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-03-04 00:46:51,187 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-04 00:46:51,187 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-03-04 00:46:51,192 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-03-04 00:46:51,829 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-04 00:46:51,829 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-03-04 00:46:51,836 [ scc.git] DEBUG ## Unique users: []
2025-03-04 00:46:51,836 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:46:51,836 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:46:51,844 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-04 00:46:51,853 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:46:51,861 [ 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-04 00:46:51,945 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-03-04 00:46:51,946 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-03-04 00:46:51,946 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-04 00:46:51,946 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-04 00:46:51,946 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-04 00:46:51,947 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-04 00:46:51,955 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-04 00:46:51,963 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-04 00:46:51,966 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:52,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:46:52,134 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-04 00:46:52,142 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-04 00:46:52,206 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#351](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-03-04 00:46:52,213 [ scc.config] DEBUG Found github.token
2025-03-04 00:46:52,213 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-03-04 00:46:52,214 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-04 00:46:52,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:46:52,227 [ 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-04 00:46:52,415 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-04 00:46:52,416 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-04 00:46:52,416 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-03-04 00:46:52,416 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-04 00:46:52,416 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-04 00:46:52,423 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-04 00:46:52,431 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-04 00:46:52,435 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:52,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:46:52,601 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-04 00:46:52,609 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-04 00:46:52,616 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#351](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/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-04 00:46:52,621 [ scc.config] DEBUG Found github.token
2025-03-04 00:46:52,621 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-03-04 00:46:52,621 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-04 00:46:52,661 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:46:52,661 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:46:52,667 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-04 00:46:52,709 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-04 00:46:52,717 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f433a14afd0> has no local changes
2025-03-04 00:46:52,717 [ 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#351 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/)'
2025-03-04 00:46:52,727 [ scc.git] DEBUG [detached HEAD 4511fd9] merge master -Dorg -Ssuccess-only
2025-03-04 00:46:52,727 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:46:52,728 [ scc.repo] DEBUG ## PRs found:
2025-03-04 00:46:52,853 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:53,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-03-04 00:46:53,441 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:53,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-03-04 00:46:53,665 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-04 00:46:53,917 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:54,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-04 00:46:54,492 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:54,775 [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-04 00:46:55,028 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:55,324 [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-04 00:46:55,576 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:55,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-04 00:46:56,168 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:56,355 [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-04 00:46:56,356 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-04 00:46:56,607 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:56,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-03-04 00:46:57,087 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:57,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-03-04 00:46:57,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:57,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-03-04 00:46:58,051 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:58,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-03-04 00:46:58,519 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:59,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-03-04 00:46:59,462 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:46:59,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-03-04 00:46:59,943 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:00,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-03-04 00:47:00,220 [ scc.repo] DEBUG ## Branches found:
2025-03-04 00:47:00,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-04 00:47:00,220 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:00,220 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:00,227 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-04 00:47:00,232 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-04 00:47:00,233 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-04 00:47:00,238 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-04 00:47:00,245 [ scc.git] DEBUG Already up to date.
2025-03-04 00:47:00,246 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-03-04 00:47:00,587 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-04 00:47:00,587 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-03-04 00:47:00,591 [ scc.git] DEBUG ## Unique users: []
2025-03-04 00:47:00,591 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:00,592 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:00,598 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-04 00:47:00,605 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:00,611 [ 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-04 00:47:00,689 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-04 00:47:00,693 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-03-04 00:47:00,693 [ scc.git] DEBUG package.json | 2 +-
2025-03-04 00:47:00,693 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-03-04 00:47:00,696 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:00,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:00,873 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-04 00:47:00,915 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:00,915 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:00,921 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-04 00:47:00,962 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-04 00:47:00,970 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f433a143880> has no local changes
2025-03-04 00:47:00,971 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
Generated by OMERO-plugins-push#351 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/)'
2025-03-04 00:47:00,981 [ scc.git] DEBUG [detached HEAD 6f55555] merge master -Dorg -Ssuccess-only
2025-03-04 00:47:00,982 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:00,982 [ scc.repo] DEBUG ## PRs found:
2025-03-04 00:47:01,126 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:01,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-03-04 00:47:01,306 [ scc.repo] DEBUG ## Branches found:
2025-03-04 00:47:01,306 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-04 00:47:01,306 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:01,306 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:01,313 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-04 00:47:01,319 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-04 00:47:01,319 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-04 00:47:01,327 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-04 00:47:01,334 [ scc.git] DEBUG Already up to date.
2025-03-04 00:47:01,334 [ scc.git] DEBUG ## Unique users: []
2025-03-04 00:47:01,335 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:01,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:01,340 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-04 00:47:01,381 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:01,382 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:01,388 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-04 00:47:01,432 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-04 00:47:01,439 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f433a161220> has no local changes
2025-03-04 00:47:01,439 [ 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#351 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/)'
2025-03-04 00:47:01,449 [ scc.git] DEBUG [detached HEAD 0343414] merge master -Dorg -Ssuccess-only
2025-03-04 00:47:01,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:01,449 [ scc.repo] DEBUG ## PRs found:
2025-03-04 00:47:01,558 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:01,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-03-04 00:47:02,047 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:02,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-03-04 00:47:02,274 [ scc.repo] DEBUG ## Branches found:
2025-03-04 00:47:02,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-04 00:47:02,274 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:02,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:02,280 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-04 00:47:02,285 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-04 00:47:02,285 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-04 00:47:02,291 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-04 00:47:02,296 [ scc.git] DEBUG Already up to date.
2025-03-04 00:47:02,296 [ scc.git] DEBUG ## Unique users: []
2025-03-04 00:47:02,297 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:02,297 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:02,301 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-04 00:47:02,341 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:02,341 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:02,347 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-04 00:47:02,385 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-04 00:47:02,392 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f433a14ac70> has no local changes
2025-03-04 00:47:02,392 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Generated by OMERO-plugins-push#351 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/)'
2025-03-04 00:47:02,401 [ scc.git] DEBUG [detached HEAD 919d923] merge master -Dorg -Ssuccess-only
2025-03-04 00:47:02,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:02,401 [ scc.repo] DEBUG ## PRs found:
2025-03-04 00:47:02,526 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:02,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-03-04 00:47:03,082 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:03,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-03-04 00:47:03,581 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:03,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-03-04 00:47:04,058 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:04,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-04 00:47:04,632 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:04,918 [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-04 00:47:05,172 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:05,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-04 00:47:05,693 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:05,867 [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-04 00:47:05,867 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-04 00:47:05,868 [ scc.repo] DEBUG ## Branches found:
2025-03-04 00:47:05,868 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-04 00:47:05,868 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:05,868 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:05,875 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-04 00:47:05,881 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-04 00:47:05,881 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-04 00:47:05,888 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-04 00:47:05,895 [ scc.git] DEBUG Already up to date.
2025-03-04 00:47:05,895 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-03-04 00:47:06,269 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-03-04 00:47:06,270 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-03-04 00:47:06,275 [ scc.git] DEBUG ## Unique users: []
2025-03-04 00:47:06,275 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:06,275 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:06,282 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-04 00:47:06,290 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:06,296 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-04 00:47:06,345 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-03-04 00:47:06,346 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-03-04 00:47:06,346 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-03-04 00:47:06,346 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-03-04 00:47:06,346 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-03-04 00:47:06,346 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-03-04 00:47:06,346 [ scc.git] DEBUG Auto-merging setup.py
2025-03-04 00:47:06,346 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-03-04 00:47:06,346 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-04 00:47:06,346 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-04 00:47:06,354 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-04 00:47:06,362 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-03-04 00:47:06,366 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:06,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:06,540 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-04 00:47:06,548 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-04 00:47:06,675 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#351](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/urls.py
- omero_signup/views.py
- setup.py
--conflicts
2025-03-04 00:47:06,682 [ scc.config] DEBUG Found github.token
2025-03-04 00:47:06,683 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-03-04 00:47:06,683 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-04 00:47:06,723 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:06,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:06,730 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-04 00:47:06,773 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-04 00:47:06,780 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4338100fd0> has no local changes
2025-03-04 00:47:06,781 [ 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#351 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/)'
2025-03-04 00:47:06,800 [ scc.git] DEBUG [detached HEAD 222d807] merge master -Dorg -Ssuccess-only
2025-03-04 00:47:06,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:06,801 [ scc.repo] DEBUG ## PRs found:
2025-03-04 00:47:06,803 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:07,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-03-04 00:47:07,380 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:07,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-03-04 00:47:07,879 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:08,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-03-04 00:47:08,383 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:08,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-03-04 00:47:08,919 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:09,165 [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-04 00:47:09,417 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:09,699 [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-04 00:47:09,952 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:10,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-03-04 00:47:10,475 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:10,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-03-04 00:47:10,947 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:11,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-03-04 00:47:11,431 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:11,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-03-04 00:47:11,906 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:12,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-04 00:47:12,442 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:12,648 [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-04 00:47:12,901 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:13,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-04 00:47:13,354 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:13,531 [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-04 00:47:13,532 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-04 00:47:13,532 [ scc.repo] DEBUG ## Branches found:
2025-03-04 00:47:13,532 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-04 00:47:13,532 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:13,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:13,540 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-04 00:47:13,545 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-04 00:47:13,546 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-04 00:47:13,551 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-04 00:47:13,556 [ scc.git] DEBUG Already up to date.
2025-03-04 00:47:13,556 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-03-04 00:47:13,961 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-03-04 00:47:13,961 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-03-04 00:47:13,967 [ scc.git] DEBUG ## Unique users: []
2025-03-04 00:47:13,968 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:13,968 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:13,974 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-03-04 00:47:13,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:13,989 [ 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-04 00:47:14,023 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-04 00:47:14,026 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-03-04 00:47:14,026 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-03-04 00:47:14,026 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-03-04 00:47:14,026 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-03-04 00:47:14,026 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-03-04 00:47:14,026 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-03-04 00:47:14,026 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-03-04 00:47:14,026 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-03-04 00:47:14,026 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-03-04 00:47:14,026 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-03-04 00:47:14,026 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-03-04 00:47:14,027 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-03-04 00:47:14,029 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:14,029 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-03-04 00:47:14,029 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-03-04 00:47:14,029 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-03-04 00:47:14,029 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-03-04 00:47:14,029 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-03-04 00:47:14,029 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-03-04 00:47:14,029 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-03-04 00:47:14,029 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-03-04 00:47:14,030 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-03-04 00:47:14,030 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-03-04 00:47:14,030 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-03-04 00:47:14,030 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-03-04 00:47:14,030 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-03-04 00:47:14,030 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-03-04 00:47:14,030 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-03-04 00:47:14,030 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-03-04 00:47:14,030 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-03-04 00:47:14,030 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-03-04 00:47:14,030 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-03-04 00:47:14,030 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-03-04 00:47:14,030 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-03-04 00:47:14,030 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-03-04 00:47:14,030 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-03-04 00:47:14,030 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-03-04 00:47:14,030 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-03-04 00:47:14,030 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-03-04 00:47:14,030 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-03-04 00:47:14,030 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-03-04 00:47:14,030 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-03-04 00:47:14,030 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-03-04 00:47:14,030 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-03-04 00:47:14,030 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-03-04 00:47:14,030 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-03-04 00:47:14,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:14,190 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-04 00:47:14,233 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:14,233 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:14,239 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-04 00:47:14,282 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-04 00:47:14,290 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f433a14aa60> has no local changes
2025-03-04 00:47:14,290 [ 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#351 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/)'
2025-03-04 00:47:14,300 [ scc.git] DEBUG [detached HEAD 47e3bdf] merge master -Dorg -Ssuccess-only
2025-03-04 00:47:14,300 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:14,300 [ scc.repo] DEBUG ## PRs found:
2025-03-04 00:47:14,442 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:14,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-03-04 00:47:14,641 [ scc.repo] DEBUG ## Branches found:
2025-03-04 00:47:14,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-04 00:47:14,642 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:14,642 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:14,649 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-04 00:47:14,654 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-04 00:47:14,654 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-04 00:47:14,659 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-04 00:47:14,665 [ scc.git] DEBUG Already up to date.
2025-03-04 00:47:14,665 [ scc.git] DEBUG ## Unique users: []
2025-03-04 00:47:14,665 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:14,665 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:14,671 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-04 00:47:14,711 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:14,711 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:14,718 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-04 00:47:14,757 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-04 00:47:14,764 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f43380fa250> has no local changes
2025-03-04 00:47:14,764 [ 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#351 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/)'
2025-03-04 00:47:14,773 [ scc.git] DEBUG [detached HEAD a48691e] merge master -Dorg -Ssuccess-only
2025-03-04 00:47:14,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:14,774 [ scc.repo] DEBUG ## PRs found:
2025-03-04 00:47:14,894 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:15,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-03-04 00:47:15,426 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:15,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-03-04 00:47:15,902 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:16,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-03-04 00:47:16,398 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:16,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-04 00:47:16,948 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:17,224 [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-04 00:47:17,477 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:17,702 [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-04 00:47:17,954 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:18,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-04 00:47:18,477 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:18,640 [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-04 00:47:18,641 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-03-04 00:47:18,641 [ scc.repo] DEBUG ## Branches found:
2025-03-04 00:47:18,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-04 00:47:18,641 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:18,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:18,648 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-04 00:47:18,654 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-04 00:47:18,654 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-04 00:47:18,660 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-04 00:47:18,667 [ scc.git] DEBUG Already up to date.
2025-03-04 00:47:18,668 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-03-04 00:47:19,263 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-03-04 00:47:19,263 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-03-04 00:47:19,268 [ scc.git] DEBUG ## Unique users: []
2025-03-04 00:47:19,268 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:19,268 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:19,273 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-03-04 00:47:19,278 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:19,283 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-03-04 00:47:19,342 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-04 00:47:19,345 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-03-04 00:47:19,345 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-03-04 00:47:19,345 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-03-04 00:47:19,345 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-03-04 00:47:19,345 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-03-04 00:47:19,347 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:19,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:19,511 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-04 00:47:19,549 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:19,550 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:19,555 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-04 00:47:19,591 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-04 00:47:19,597 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f433a14aa30> has no local changes
2025-03-04 00:47:19,598 [ 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#351 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/)'
2025-03-04 00:47:19,607 [ scc.git] DEBUG [detached HEAD 85b1368] merge master -Dorg -Ssuccess-only
2025-03-04 00:47:19,608 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:19,608 [ scc.git] INFO Overriding base-branch from master to main
2025-03-04 00:47:19,608 [ scc.repo] DEBUG ## PRs found:
2025-03-04 00:47:19,763 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:20,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-03-04 00:47:20,283 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:20,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-03-04 00:47:20,776 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:21,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-03-04 00:47:21,342 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:21,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-03-04 00:47:21,958 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:22,211 [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-04 00:47:22,464 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:22,711 [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-04 00:47:22,963 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:23,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-03-04 00:47:23,512 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:23,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-03-04 00:47:24,015 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:24,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-03-04 00:47:24,494 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:24,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-04 00:47:25,128 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:25,366 [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-04 00:47:25,619 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:25,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-04 00:47:26,096 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:26,284 [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-04 00:47:26,286 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-04 00:47:26,286 [ scc.repo] DEBUG ## Branches found:
2025-03-04 00:47:26,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-04 00:47:26,286 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:26,286 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:26,293 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-03-04 00:47:26,299 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-04 00:47:26,299 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-03-04 00:47:26,305 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-03-04 00:47:26,311 [ scc.git] DEBUG Already up to date.
2025-03-04 00:47:26,312 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-03-04 00:47:26,813 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-03-04 00:47:26,814 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-03-04 00:47:26,820 [ scc.git] DEBUG ## Unique users: []
2025-03-04 00:47:26,820 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:26,820 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:26,826 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-04 00:47:26,832 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:26,837 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-04 00:47:26,975 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-03-04 00:47:26,976 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-03-04 00:47:26,976 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-04 00:47:26,976 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-04 00:47:26,982 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-04 00:47:26,988 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-03-04 00:47:26,991 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:27,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:27,214 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-04 00:47:27,221 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-04 00:47:27,228 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#351](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-03-04 00:47:27,233 [ scc.config] DEBUG Found github.token
2025-03-04 00:47:27,234 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-03-04 00:47:27,234 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-04 00:47:27,282 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:27,282 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:27,288 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-04 00:47:27,340 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-04 00:47:27,348 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f43380cf100> has no local changes
2025-03-04 00:47:27,348 [ 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#351 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/)'
2025-03-04 00:47:27,358 [ scc.git] DEBUG [detached HEAD 11efc75] merge master -Dorg -Ssuccess-only
2025-03-04 00:47:27,359 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:27,359 [ scc.repo] DEBUG ## PRs found:
2025-03-04 00:47:27,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:27,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-03-04 00:47:27,665 [ scc.repo] DEBUG ## Branches found:
2025-03-04 00:47:27,665 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-04 00:47:27,665 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:27,665 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:27,675 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-04 00:47:27,681 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-04 00:47:27,681 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-04 00:47:27,686 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-04 00:47:27,692 [ scc.git] DEBUG Already up to date.
2025-03-04 00:47:27,692 [ scc.git] DEBUG ## Unique users: []
2025-03-04 00:47:27,692 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:27,692 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:27,697 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-04 00:47:27,734 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:27,735 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:27,740 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-04 00:47:27,777 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-04 00:47:27,784 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f43187c55b0> has no local changes
2025-03-04 00:47:27,784 [ 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#351 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/)'
2025-03-04 00:47:27,792 [ scc.git] DEBUG [detached HEAD 4a2b16a] merge master -Dorg -Ssuccess-only
2025-03-04 00:47:27,792 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:27,792 [ scc.repo] DEBUG ## PRs found:
2025-03-04 00:47:27,917 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:28,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-03-04 00:47:28,110 [ scc.repo] DEBUG ## Branches found:
2025-03-04 00:47:28,110 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-04 00:47:28,110 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:28,110 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:28,117 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-04 00:47:28,123 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-04 00:47:28,123 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-04 00:47:28,128 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-04 00:47:28,134 [ scc.git] DEBUG Already up to date.
2025-03-04 00:47:28,134 [ scc.git] DEBUG ## Unique users: []
2025-03-04 00:47:28,134 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:28,134 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:28,139 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-04 00:47:28,178 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:28,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:28,187 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-04 00:47:28,235 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-04 00:47:28,244 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f43380b9520> has no local changes
2025-03-04 00:47:28,244 [ 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#351 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/)'
2025-03-04 00:47:28,254 [ scc.git] DEBUG [detached HEAD 2569f19] merge master -Dorg -Ssuccess-only
2025-03-04 00:47:28,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:28,255 [ scc.repo] DEBUG ## PRs found:
2025-03-04 00:47:28,363 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:28,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-03-04 00:47:28,882 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:29,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-03-04 00:47:29,365 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:29,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-03-04 00:47:29,825 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:30,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-04 00:47:30,356 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:30,604 [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-04 00:47:30,858 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:31,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-04 00:47:31,420 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:31,591 [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-04 00:47:31,592 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-03-04 00:47:31,593 [ scc.repo] DEBUG ## Branches found:
2025-03-04 00:47:31,593 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-04 00:47:31,593 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:31,593 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:31,600 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-04 00:47:31,606 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-04 00:47:31,606 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-04 00:47:31,611 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-04 00:47:31,616 [ scc.git] DEBUG Already up to date.
2025-03-04 00:47:31,616 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-03-04 00:47:32,286 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-03-04 00:47:32,287 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-03-04 00:47:32,293 [ scc.git] DEBUG ## Unique users: []
2025-03-04 00:47:32,293 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:32,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:32,300 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-04 00:47:32,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:32,310 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-04 00:47:32,322 [ scc.git] DEBUG Auto-merging Dockerfile
2025-03-04 00:47:32,322 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-03-04 00:47:32,322 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-04 00:47:32,323 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-04 00:47:32,328 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-04 00:47:32,335 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-03-04 00:47:32,338 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:32,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:32,502 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-04 00:47:32,509 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-04 00:47:32,514 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#351](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-03-04 00:47:32,519 [ scc.config] DEBUG Found github.token
2025-03-04 00:47:32,519 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-03-04 00:47:32,519 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-04 00:47:32,557 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:32,557 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:32,563 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-04 00:47:32,602 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-04 00:47:32,611 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f43187c5610> has no local changes
2025-03-04 00:47:32,611 [ 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#351 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/)'
2025-03-04 00:47:32,624 [ scc.git] DEBUG [detached HEAD 2f98667] merge master -Dorg -Ssuccess-only
2025-03-04 00:47:32,625 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:32,625 [ scc.git] INFO Overriding base-branch from master to develop
2025-03-04 00:47:32,625 [ scc.repo] DEBUG ## PRs found:
2025-03-04 00:47:32,754 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:33,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-03-04 00:47:33,280 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:33,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-03-04 00:47:33,798 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:34,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-03-04 00:47:34,260 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:34,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-04 00:47:34,877 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:35,118 [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-04 00:47:35,371 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:35,593 [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-04 00:47:35,846 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:36,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-04 00:47:36,292 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:36,475 [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-04 00:47:36,476 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-04 00:47:36,728 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:36,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-03-04 00:47:37,236 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:37,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-03-04 00:47:37,691 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:37,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-04 00:47:38,207 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:38,433 [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-04 00:47:38,685 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:38,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-04 00:47:39,146 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:39,320 [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-04 00:47:39,321 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-04 00:47:39,572 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:39,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-03-04 00:47:40,073 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:40,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-03-04 00:47:40,565 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:40,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-03-04 00:47:41,057 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:41,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-03-04 00:47:41,331 [ scc.repo] DEBUG ## Branches found:
2025-03-04 00:47:41,331 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-04 00:47:41,331 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:41,331 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:41,337 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-03-04 00:47:41,343 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-04 00:47:41,343 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-03-04 00:47:41,348 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-03-04 00:47:41,354 [ scc.git] DEBUG Already up to date.
2025-03-04 00:47:41,354 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-03-04 00:47:42,166 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-04 00:47:42,166 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-03-04 00:47:42,171 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-03-04 00:47:42,739 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-04 00:47:42,739 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-03-04 00:47:42,745 [ scc.git] DEBUG ## Unique users: []
2025-03-04 00:47:42,745 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:42,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:42,751 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-04 00:47:42,760 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:42,767 [ 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-04 00:47:42,856 [ 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-04 00:47:42,857 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-04 00:47:42,857 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-04 00:47:42,864 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-04 00:47:42,871 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-03-04 00:47:42,874 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:43,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:43,032 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-04 00:47:43,042 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-04 00:47:43,050 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#351](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-03-04 00:47:43,056 [ scc.config] DEBUG Found github.token
2025-03-04 00:47:43,056 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-03-04 00:47:43,056 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-04 00:47:43,063 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:43,068 [ 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-04 00:47:43,091 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-04 00:47:43,094 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-03-04 00:47:43,094 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-03-04 00:47:43,285 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:43,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:43,446 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-04 00:47:43,489 [ scc.git] DEBUG Get sha1 of %s
2025-03-04 00:47:43,489 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-04 00:47:43,495 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-04 00:47:43,537 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-04 00:47:43,544 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f433802e580> has no local changes
2025-03-04 00:47:43,544 [ 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#351 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/)'
2025-03-04 00:47:43,555 [ scc.git] DEBUG [detached HEAD baa5614] merge master -Dorg -Ssuccess-only
2025-03-04 00:47:43,555 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:43,555 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-04 00:47:43,640 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-03-04 00:47:43,699 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:43,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:43,889 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-03-04 00:47:43,896 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-03-04 00:47:44,130 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:44,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:44,305 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-03-04 00:47:44,311 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-03-04 00:47:44,542 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:44,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:44,715 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-03-04 00:47:44,721 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-03-04 00:47:44,954 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:45,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:45,137 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-03-04 00:47:45,373 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:45,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:45,556 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-03-04 00:47:45,563 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-03-04 00:47:45,796 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:45,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:45,968 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-03-04 00:47:45,973 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-03-04 00:47:46,208 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:46,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:46,398 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-03-04 00:47:46,403 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-03-04 00:47:46,638 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:46,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:46,848 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-03-04 00:47:46,854 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-03-04 00:47:47,089 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:47,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:47,268 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-03-04 00:47:47,273 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-03-04 00:47:47,506 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:47,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:47,692 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-03-04 00:47:47,697 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-03-04 00:47:47,929 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:48,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:48,111 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-03-04 00:47:48,117 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-03-04 00:47:48,350 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:48,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:48,544 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-03-04 00:47:48,549 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-03-04 00:47:48,782 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:48,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:48,975 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-03-04 00:47:49,209 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:49,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:49,396 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-03-04 00:47:49,631 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:49,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:49,812 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-03-04 00:47:49,817 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-03-04 00:47:50,052 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:50,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:50,234 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-03-04 00:47:50,469 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:50,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:50,655 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-03-04 00:47:50,891 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:51,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:51,058 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-03-04 00:47:51,064 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-03-04 00:47:51,299 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:51,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:51,476 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-03-04 00:47:51,481 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-03-04 00:47:51,717 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:51,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:51,891 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-03-04 00:47:51,897 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-03-04 00:47:52,133 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:52,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:52,316 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-03-04 00:47:52,321 [ scc.config] DEBUG Found submodule.scripts.url
2025-03-04 00:47:52,558 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-04 00:47:52,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-04 00:47:52,733 [ scc.config] DEBUG Found submodule.scripts.branch
2025-03-04 00:47:52,734 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-04 00:47:52,817 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f433c526ca0> has local changes
2025-03-04 00:47:52,817 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 167 dominikl 'Add extinfo command' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 600 Rdornier 'Label on rois' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#351 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/351/)'
2025-03-04 00:47:52,832 [ scc.git] DEBUG [detached HEAD 773cefb] merge master -Dorg -Ssuccess-only
2025-03-04 00:47:52,833 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-03-04 00:47:52,833 [ scc.merge] INFO Repository: ome/omero-plugins
2025-03-04 00:47:52,833 [ scc.merge] INFO Already up to date.
2025-03-04 00:47:52,833 [ scc.merge] INFO
2025-03-04 00:47:52,833 [ scc.merge] INFO Merged PRs:
2025-03-04 00:47:52,833 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-03-04 00:47:52,833 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-03-04 00:47:52,833 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-03-04 00:47:52,833 [ scc.merge] INFO
2025-03-04 00:47:52,833 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-03-04 00:47:52,833 [ scc.merge] INFO Already up to date.
2025-03-04 00:47:52,833 [ scc.merge] INFO
2025-03-04 00:47:52,833 [ scc.merge] INFO
2025-03-04 00:47:52,833 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-03-04 00:47:52,833 [ scc.merge] INFO Excluded PRs:
2025-03-04 00:47:52,833 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-03-04 00:47:52,833 [ scc.merge] INFO Already up to date.
2025-03-04 00:47:52,833 [ scc.merge] INFO
2025-03-04 00:47:52,833 [ scc.merge] INFO
2025-03-04 00:47:52,833 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-03-04 00:47:52,833 [ scc.merge] INFO Excluded PRs:
2025-03-04 00:47:52,833 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-03-04 00:47:52,834 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-03-04 00:47:52,834 [ scc.merge] INFO Already up to date.
2025-03-04 00:47:52,834 [ scc.merge] INFO
2025-03-04 00:47:52,834 [ scc.merge] INFO Merged PRs:
2025-03-04 00:47:52,834 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-03-04 00:47:52,834 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-03-04 00:47:52,834 [ scc.merge] INFO
2025-03-04 00:47:52,834 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-03-04 00:47:52,834 [ scc.merge] INFO Excluded PRs:
2025-03-04 00:47:52,834 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-03-04 00:47:52,834 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-03-04 00:47:52,834 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-04 00:47:52,834 [ scc.merge] INFO Already up to date.
2025-03-04 00:47:52,834 [ scc.merge] INFO
2025-03-04 00:47:52,834 [ scc.merge] INFO Merged PRs:
2025-03-04 00:47:52,834 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-03-04 00:47:52,834 [ scc.merge] INFO
2025-03-04 00:47:52,834 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-04 00:47:52,834 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-03-04 00:47:52,834 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-03-04 00:47:52,834 [ scc.merge] INFO
2025-03-04 00:47:52,834 [ scc.merge] INFO Repository: ome/omero-figure
2025-03-04 00:47:52,834 [ scc.merge] INFO Excluded PRs:
2025-03-04 00:47:52,834 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-03-04 00:47:52,834 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (stage: draft)
2025-03-04 00:47:52,834 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-03-04 00:47:52,834 [ scc.merge] INFO Already up to date.
2025-03-04 00:47:52,834 [ scc.merge] INFO
2025-03-04 00:47:52,834 [ scc.merge] INFO Merged PRs:
2025-03-04 00:47:52,834 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-03-04 00:47:52,834 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-03-04 00:47:52,834 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-03-04 00:47:52,834 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-03-04 00:47:52,834 [ scc.merge] INFO
2025-03-04 00:47:52,834 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-04 00:47:52,834 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-03-04 00:47:52,834 [ scc.merge] INFO
2025-03-04 00:47:52,835 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-03-04 00:47:52,835 [ scc.merge] INFO Already up to date.
2025-03-04 00:47:52,835 [ scc.merge] INFO
2025-03-04 00:47:52,835 [ scc.merge] INFO Merged PRs:
2025-03-04 00:47:52,835 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-03-04 00:47:52,835 [ scc.merge] INFO
2025-03-04 00:47:52,835 [ scc.merge] INFO Repository: ome/omero-gallery
2025-03-04 00:47:52,835 [ scc.merge] INFO Already up to date.
2025-03-04 00:47:52,835 [ scc.merge] INFO
2025-03-04 00:47:52,835 [ scc.merge] INFO Merged PRs:
2025-03-04 00:47:52,835 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-03-04 00:47:52,835 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-03-04 00:47:52,835 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-03-04 00:47:52,835 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-03-04 00:47:52,835 [ scc.merge] INFO
2025-03-04 00:47:52,835 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-04 00:47:52,835 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-03-04 00:47:52,835 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-03-04 00:47:52,835 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-03-04 00:47:52,835 [ scc.merge] INFO
2025-03-04 00:47:52,835 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-03-04 00:47:52,835 [ scc.merge] INFO Excluded PRs:
2025-03-04 00:47:52,835 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-03-04 00:47:52,835 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-03-04 00:47:52,835 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-03-04 00:47:52,835 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-03-04 00:47:52,835 [ scc.merge] INFO Already up to date.
2025-03-04 00:47:52,835 [ scc.merge] INFO
2025-03-04 00:47:52,835 [ scc.merge] INFO Merged PRs:
2025-03-04 00:47:52,835 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-03-04 00:47:52,835 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-03-04 00:47:52,835 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-04 00:47:52,835 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-04 00:47:52,835 [ scc.merge] INFO
2025-03-04 00:47:52,835 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-04 00:47:52,835 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-04 00:47:52,835 [ scc.merge] INFO
2025-03-04 00:47:52,835 [ scc.merge] INFO Repository: ome/omero-mapr
2025-03-04 00:47:52,836 [ scc.merge] INFO Excluded PRs:
2025-03-04 00:47:52,836 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-03-04 00:47:52,836 [ scc.merge] INFO Already up to date.
2025-03-04 00:47:52,836 [ scc.merge] INFO
2025-03-04 00:47:52,836 [ scc.merge] INFO Merged PRs:
2025-03-04 00:47:52,836 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-03-04 00:47:52,836 [ scc.merge] INFO
2025-03-04 00:47:52,836 [ scc.merge] INFO Repository: ome/omero-metadata
2025-03-04 00:47:52,836 [ scc.merge] INFO Already up to date.
2025-03-04 00:47:52,836 [ scc.merge] INFO
2025-03-04 00:47:52,836 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-04 00:47:52,836 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-04 00:47:52,836 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-04 00:47:52,836 [ scc.merge] INFO
2025-03-04 00:47:52,836 [ scc.merge] INFO Repository: ome/omero-parade
2025-03-04 00:47:52,836 [ scc.merge] INFO Excluded PRs:
2025-03-04 00:47:52,836 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-03-04 00:47:52,836 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-03-04 00:47:52,836 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-03-04 00:47:52,836 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-03-04 00:47:52,836 [ scc.merge] INFO Already up to date.
2025-03-04 00:47:52,836 [ scc.merge] INFO
2025-03-04 00:47:52,836 [ scc.merge] INFO Merged PRs:
2025-03-04 00:47:52,836 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-04 00:47:52,836 [ scc.merge] INFO
2025-03-04 00:47:52,836 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-03-04 00:47:52,836 [ scc.merge] INFO Already up to date.
2025-03-04 00:47:52,836 [ scc.merge] INFO
2025-03-04 00:47:52,836 [ scc.merge] INFO
2025-03-04 00:47:52,836 [ scc.merge] INFO Repository: ome/omero-rois
2025-03-04 00:47:52,836 [ scc.merge] INFO Excluded PRs:
2025-03-04 00:47:52,836 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-04 00:47:52,836 [ scc.merge] INFO Already up to date.
2025-03-04 00:47:52,836 [ scc.merge] INFO
2025-03-04 00:47:52,836 [ scc.merge] INFO
2025-03-04 00:47:52,836 [ scc.merge] INFO Repository: ome/omero-signup
2025-03-04 00:47:52,836 [ scc.merge] INFO Already up to date.
2025-03-04 00:47:52,836 [ scc.merge] INFO
2025-03-04 00:47:52,837 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-04 00:47:52,837 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-04 00:47:52,837 [ scc.merge] INFO
2025-03-04 00:47:52,837 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-03-04 00:47:52,837 [ scc.merge] INFO Excluded PRs:
2025-03-04 00:47:52,837 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-03-04 00:47:52,837 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-03-04 00:47:52,837 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-03-04 00:47:52,837 [ scc.merge] INFO Already up to date.
2025-03-04 00:47:52,837 [ scc.merge] INFO
2025-03-04 00:47:52,837 [ scc.merge] INFO Merged PRs:
2025-03-04 00:47:52,837 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-04 00:47:52,837 [ scc.merge] INFO
2025-03-04 00:47:52,837 [ scc.merge] INFO Repository: ome/omero-upload
2025-03-04 00:47:52,837 [ scc.merge] INFO Already up to date.
2025-03-04 00:47:52,837 [ scc.merge] INFO
2025-03-04 00:47:52,837 [ scc.merge] INFO
2025-03-04 00:47:52,837 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-03-04 00:47:52,837 [ scc.merge] INFO Already up to date.
2025-03-04 00:47:52,837 [ scc.merge] INFO
2025-03-04 00:47:52,837 [ scc.merge] INFO Merged PRs:
2025-03-04 00:47:52,837 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-03-04 00:47:52,837 [ scc.merge] INFO
2025-03-04 00:47:52,837 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-03-04 00:47:52,837 [ scc.merge] INFO Excluded PRs:
2025-03-04 00:47:52,837 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-03-04 00:47:52,837 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-03-04 00:47:52,837 [ scc.merge] INFO Already up to date.
2025-03-04 00:47:52,837 [ scc.merge] INFO
2025-03-04 00:47:52,837 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-04 00:47:52,837 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-04 00:47:52,837 [ scc.merge] INFO
2025-03-04 00:47:52,837 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-03-04 00:47:52,837 [ scc.merge] INFO Already up to date.
2025-03-04 00:47:52,837 [ scc.merge] INFO
2025-03-04 00:47:52,837 [ scc.merge] INFO
2025-03-04 00:47:52,837 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-03-04 00:47:52,837 [ scc.merge] INFO Already up to date.
2025-03-04 00:47:52,838 [ scc.merge] INFO
2025-03-04 00:47:52,838 [ scc.merge] INFO
2025-03-04 00:47:52,838 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-03-04 00:47:52,838 [ scc.merge] INFO Already up to date.
2025-03-04 00:47:52,838 [ scc.merge] INFO
2025-03-04 00:47:52,838 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-04 00:47:52,838 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-03-04 00:47:52,838 [ scc.merge] INFO
2025-03-04 00:47:52,838 [ scc.merge] INFO Repository: ome/scripts
2025-03-04 00:47:52,838 [ scc.merge] INFO Excluded PRs:
2025-03-04 00:47:52,838 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-03-04 00:47:52,838 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-03-04 00:47:52,838 [ scc.merge] INFO Already up to date.
2025-03-04 00:47:52,838 [ scc.merge] INFO
2025-03-04 00:47:52,838 [ scc.merge] INFO Merged PRs:
2025-03-04 00:47:52,838 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-04 00:47:52,838 [ scc.merge] INFO
2025-03-04 00:47:52,838 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-04 00:47:52,838 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-04 00:47:52,838 [ scc.merge] INFO
2025-03-04 00:47:52,838 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-03-04 00:47:52,838 [ scc.git] DEBUG Calling 'git remote'
2025-03-04 00:47:52,844 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-03-04 00:47:52,845 [ scc.git] DEBUG Calling 'git remote'
2025-03-04 00:47:52,850 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:52,851 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-03-04 00:47:52,851 [ scc.git] DEBUG Calling 'git remote'
2025-03-04 00:47:52,856 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:52,856 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-03-04 00:47:52,856 [ scc.git] DEBUG Calling 'git remote'
2025-03-04 00:47:52,862 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:52,862 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-03-04 00:47:52,862 [ scc.git] DEBUG Calling 'git remote'
2025-03-04 00:47:52,868 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:52,868 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-03-04 00:47:52,868 [ scc.git] DEBUG Calling 'git remote'
2025-03-04 00:47:52,874 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:52,874 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-03-04 00:47:52,874 [ scc.git] DEBUG Calling 'git remote'
2025-03-04 00:47:52,879 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:52,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-03-04 00:47:52,880 [ scc.git] DEBUG Calling 'git remote'
2025-03-04 00:47:52,885 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:52,885 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-04 00:47:52,885 [ scc.git] DEBUG Calling 'git remote'
2025-03-04 00:47:52,891 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:52,891 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-04 00:47:52,891 [ scc.git] DEBUG Calling 'git remote'
2025-03-04 00:47:52,896 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:52,897 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-04 00:47:52,897 [ scc.git] DEBUG Calling 'git remote'
2025-03-04 00:47:52,902 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:52,902 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-04 00:47:52,902 [ scc.git] DEBUG Calling 'git remote'
2025-03-04 00:47:52,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:52,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-04 00:47:52,907 [ scc.git] DEBUG Calling 'git remote'
2025-03-04 00:47:52,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:52,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-04 00:47:52,913 [ scc.git] DEBUG Calling 'git remote'
2025-03-04 00:47:52,918 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:52,919 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-04 00:47:52,919 [ scc.git] DEBUG Calling 'git remote'
2025-03-04 00:47:52,925 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:52,925 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-04 00:47:52,925 [ scc.git] DEBUG Calling 'git remote'
2025-03-04 00:47:52,930 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:52,930 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-04 00:47:52,931 [ scc.git] DEBUG Calling 'git remote'
2025-03-04 00:47:52,936 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:52,936 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-04 00:47:52,936 [ scc.git] DEBUG Calling 'git remote'
2025-03-04 00:47:52,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:52,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-04 00:47:52,942 [ scc.git] DEBUG Calling 'git remote'
2025-03-04 00:47:52,948 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:52,948 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-04 00:47:52,948 [ scc.git] DEBUG Calling 'git remote'
2025-03-04 00:47:52,954 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:52,954 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-04 00:47:52,954 [ scc.git] DEBUG Calling 'git remote'
2025-03-04 00:47:52,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:52,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-04 00:47:52,960 [ scc.git] DEBUG Calling 'git remote'
2025-03-04 00:47:52,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-04 00:47:52,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-04 00:47:52,966 [ scc.git] DEBUG Calling 'git remote'
2025-03-04 00:47:52,972 [ 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 b989c6e] 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 39a6576] 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-04 00:48:42,813 [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-04 00:48:52,374 [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-04 00:48:54,892 [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-04 00:48:59,722 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-04 00:49:40,622 [ 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/f8f0d1dd/images/svgs/logo.svg){kind=logo}
