Skipping 191 KB..
Full Log2025-03-20 00:52:07,741 [ scc.repo] DEBUG - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-20 00:52:07,992 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:08,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-03-20 00:52:08,223 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-20 00:52:08,475 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:08,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-20 00:52:09,079 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:09,376 [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-20 00:52:09,628 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:09,870 [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-20 00:52:10,122 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:10,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-20 00:52:10,772 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:10,938 [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-20 00:52:10,939 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-20 00:52:11,190 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:11,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-03-20 00:52:11,680 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:11,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-03-20 00:52:12,175 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:12,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-03-20 00:52:12,678 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:12,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-03-20 00:52:13,181 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:13,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-20 00:52:13,718 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:13,941 [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-20 00:52:14,193 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:14,421 [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-20 00:52:14,673 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:14,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-20 00:52:15,226 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:15,425 [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-20 00:52:15,426 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-20 00:52:15,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:15,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-03-20 00:52:16,159 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:16,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-03-20 00:52:16,702 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:16,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-20 00:52:17,215 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:17,443 [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-20 00:52:17,695 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:18,028 [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-20 00:52:18,280 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:18,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-20 00:52:18,719 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:18,894 [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-20 00:52:18,895 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-03-20 00:52:19,146 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:19,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-03-20 00:52:19,660 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:19,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-03-20 00:52:20,145 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:20,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-20 00:52:20,675 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:20,903 [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-20 00:52:21,155 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:21,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-20 00:52:21,649 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:21,829 [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-20 00:52:21,829 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-03-20 00:52:21,829 [ scc.repo] DEBUG ## Branches found:
2025-03-20 00:52:21,829 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-20 00:52:21,830 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:52:21,830 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:21,835 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 00:52:21,840 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 00:52:21,840 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 00:52:21,845 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 00:52:21,850 [ scc.git] DEBUG Already up to date.
2025-03-20 00:52:21,850 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-03-20 00:52:23,911 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-20 00:52:23,911 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-03-20 00:52:23,915 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-03-20 00:52:25,268 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-20 00:52:25,268 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-03-20 00:52:25,272 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-03-20 00:52:25,642 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-20 00:52:25,643 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-03-20 00:52:25,646 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-03-20 00:52:25,924 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-20 00:52:25,924 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-03-20 00:52:25,927 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-03-20 00:52:26,208 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-20 00:52:26,208 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-03-20 00:52:26,212 [ scc.git] DEBUG ## Unique users: []
2025-03-20 00:52:26,212 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:52:26,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:26,217 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-20 00:52:26,224 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:26,228 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-20 00:52:26,363 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-03-20 00:52:26,363 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-03-20 00:52:26,364 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 00:52:26,367 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-03-20 00:52:26,367 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-03-20 00:52:26,367 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-03-20 00:52:26,369 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:26,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:52:26,539 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-20 00:52:26,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:26,552 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-20 00:52:26,770 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-03-20 00:52:26,771 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-03-20 00:52:26,771 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-03-20 00:52:26,771 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-03-20 00:52:26,771 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 00:52:26,775 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-03-20 00:52:26,775 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-03-20 00:52:26,775 [ scc.git] DEBUG src/app/header.html | 5 +
2025-03-20 00:52:26,775 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-03-20 00:52:26,775 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-03-20 00:52:26,775 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-03-20 00:52:26,775 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-03-20 00:52:26,775 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-03-20 00:52:26,791 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:26,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:52:26,960 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-20 00:52:26,968 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:26,972 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-20 00:52:27,089 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-03-20 00:52:27,090 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 00:52:27,093 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-03-20 00:52:27,093 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-03-20 00:52:27,093 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-03-20 00:52:27,212 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:27,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:52:27,377 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-20 00:52:27,421 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:27,426 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-20 00:52:27,441 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 00:52:27,450 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-03-20 00:52:27,450 [ scc.git] DEBUG package.json | 2 +-
2025-03-20 00:52:27,450 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-03-20 00:52:27,629 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:27,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:52:27,795 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-20 00:52:27,825 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:27,830 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-20 00:52:28,030 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-20 00:52:28,030 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-03-20 00:52:28,030 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-20 00:52:28,030 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-20 00:52:28,036 [ scc.git] DEBUG Calling 'git reset --hard 1961d2266df407aafe0b0268badb2eae3a5a4672'
2025-03-20 00:52:28,045 [ scc.git] DEBUG HEAD is now at 1961d22 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-03-20 00:52:28,048 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:28,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:52:28,231 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-20 00:52:28,236 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-03-20 00:52:28,241 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#359](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-03-20 00:52:28,246 [ scc.config] DEBUG Found github.token
2025-03-20 00:52:28,246 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-03-20 00:52:28,246 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 00:52:28,282 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:52:28,283 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:28,287 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 00:52:28,322 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 00:52:28,331 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4e44257520> has no local changes
2025-03-20 00:52:28,331 [ 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#359 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/)'
2025-03-20 00:52:28,342 [ scc.git] DEBUG [detached HEAD a846476] merge master -Dorg -Ssuccess-only
2025-03-20 00:52:28,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:52:28,342 [ scc.repo] DEBUG ## PRs found:
2025-03-20 00:52:28,483 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:28,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-03-20 00:52:29,042 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:29,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-03-20 00:52:29,521 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:29,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-03-20 00:52:30,095 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:30,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-20 00:52:30,655 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:30,887 [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-20 00:52:31,139 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:31,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-20 00:52:31,679 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:31,873 [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-20 00:52:31,873 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-03-20 00:52:31,873 [ scc.repo] DEBUG ## Branches found:
2025-03-20 00:52:31,873 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-20 00:52:31,874 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:52:31,874 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:31,879 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 00:52:31,884 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 00:52:31,884 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 00:52:31,889 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 00:52:31,894 [ scc.git] DEBUG Already up to date.
2025-03-20 00:52:31,894 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-03-20 00:52:32,577 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-03-20 00:52:32,577 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-03-20 00:52:32,582 [ scc.git] DEBUG ## Unique users: []
2025-03-20 00:52:32,582 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:52:32,582 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:32,587 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-20 00:52:32,593 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:32,598 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-20 00:52:32,608 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 00:52:32,611 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-03-20 00:52:32,611 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-03-20 00:52:32,611 [ scc.git] DEBUG requirements.txt | 2 +-
2025-03-20 00:52:32,611 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-03-20 00:52:32,611 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-03-20 00:52:32,611 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-03-20 00:52:32,613 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:32,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:52:32,776 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 00:52:32,812 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:52:32,812 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:32,817 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 00:52:32,852 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 00:52:32,858 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4e442cfaf0> has no local changes
2025-03-20 00:52:32,858 [ 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#359 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/)'
2025-03-20 00:52:32,866 [ scc.git] DEBUG [detached HEAD 926dcc6] merge master -Dorg -Ssuccess-only
2025-03-20 00:52:32,866 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:52:32,867 [ scc.repo] DEBUG ## PRs found:
2025-03-20 00:52:33,028 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:34,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-03-20 00:52:34,609 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:34,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-03-20 00:52:35,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:35,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-03-20 00:52:35,607 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:35,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-20 00:52:36,119 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:38,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-20 00:52:38,984 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:39,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-20 00:52:39,514 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:39,694 [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-20 00:52:39,694 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-20 00:52:39,946 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:40,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-03-20 00:52:40,442 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:40,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-03-20 00:52:40,944 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:41,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-20 00:52:41,471 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:41,696 [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-20 00:52:41,949 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:42,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-20 00:52:42,471 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:42,750 [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-20 00:52:42,750 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-20 00:52:42,751 [ scc.repo] DEBUG ## Branches found:
2025-03-20 00:52:42,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-20 00:52:42,751 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:52:42,751 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:42,756 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 00:52:42,761 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 00:52:42,761 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 00:52:42,766 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 00:52:42,771 [ scc.git] DEBUG Already up to date.
2025-03-20 00:52:42,771 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-03-20 00:52:44,677 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-20 00:52:44,678 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-03-20 00:52:44,683 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-03-20 00:52:45,355 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-20 00:52:45,355 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-03-20 00:52:45,359 [ scc.git] DEBUG ## Unique users: []
2025-03-20 00:52:45,360 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:52:45,360 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:45,365 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-20 00:52:45,371 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:45,376 [ 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-20 00:52:45,581 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-03-20 00:52:45,581 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-03-20 00:52:45,581 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-20 00:52:45,581 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-20 00:52:45,582 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-20 00:52:45,582 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-20 00:52:45,588 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-20 00:52:45,594 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-20 00:52:45,597 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:45,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:52:45,760 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-20 00:52:45,767 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-20 00:52:45,774 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#359](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-03-20 00:52:45,779 [ scc.config] DEBUG Found github.token
2025-03-20 00:52:45,779 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-03-20 00:52:45,779 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-20 00:52:45,786 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:45,792 [ 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-20 00:52:46,024 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-20 00:52:46,024 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-20 00:52:46,024 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-03-20 00:52:46,024 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-20 00:52:46,025 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-20 00:52:46,031 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-20 00:52:46,038 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-20 00:52:46,041 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:46,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:52:46,218 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-20 00:52:46,225 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-20 00:52:46,230 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#359](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/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-20 00:52:46,234 [ scc.config] DEBUG Found github.token
2025-03-20 00:52:46,234 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-03-20 00:52:46,234 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 00:52:46,270 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:52:46,271 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:46,275 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 00:52:46,310 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 00:52:46,316 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4e4428bfd0> has no local changes
2025-03-20 00:52:46,317 [ 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#359 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/)'
2025-03-20 00:52:46,325 [ scc.git] DEBUG [detached HEAD 8b1ee18] merge master -Dorg -Ssuccess-only
2025-03-20 00:52:46,325 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:52:46,325 [ scc.repo] DEBUG ## PRs found:
2025-03-20 00:52:46,470 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:46,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-03-20 00:52:47,106 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:47,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-03-20 00:52:47,357 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-20 00:52:47,608 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:47,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-20 00:52:48,192 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:48,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-20 00:52:48,691 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:48,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-20 00:52:49,228 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:49,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-20 00:52:49,762 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:49,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-03-20 00:52:49,947 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-20 00:52:50,199 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:50,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-03-20 00:52:50,430 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-20 00:52:50,681 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:51,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-20 00:52:51,287 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:51,562 [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-20 00:52:51,814 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:52,065 [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-20 00:52:52,317 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:52,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-20 00:52:52,902 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:53,081 [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-20 00:52:53,082 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-20 00:52:53,334 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:53,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-03-20 00:52:53,813 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:54,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-03-20 00:52:54,343 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:54,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-03-20 00:52:54,816 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:55,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-03-20 00:52:55,299 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:55,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-03-20 00:52:55,794 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:56,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-03-20 00:52:56,292 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:56,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-03-20 00:52:56,573 [ scc.repo] DEBUG ## Branches found:
2025-03-20 00:52:56,573 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-20 00:52:56,573 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:52:56,573 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:56,578 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 00:52:56,583 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 00:52:56,583 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 00:52:56,588 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 00:52:56,594 [ scc.git] DEBUG Already up to date.
2025-03-20 00:52:56,594 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-03-20 00:52:56,906 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-20 00:52:56,906 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-03-20 00:52:56,910 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-03-20 00:52:57,212 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-20 00:52:57,213 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-03-20 00:52:57,218 [ scc.git] DEBUG ## Unique users: []
2025-03-20 00:52:57,218 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:52:57,218 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:57,223 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-20 00:52:57,276 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:57,281 [ 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-20 00:52:57,414 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 00:52:57,417 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-03-20 00:52:57,417 [ scc.git] DEBUG package.json | 2 +-
2025-03-20 00:52:57,418 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-03-20 00:52:57,420 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:57,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:52:57,576 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-03-20 00:52:57,597 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:57,602 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 141 (Bump axios from 1.6.0 to 1.8.2) de7db17cd62b498179713df276cff151a1f36d80'
2025-03-20 00:52:57,684 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-20 00:52:57,684 [ scc.git] DEBUG Auto-merging package.json
2025-03-20 00:52:57,685 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 00:52:57,688 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-03-20 00:52:57,688 [ scc.git] DEBUG package.json | 2 +-
2025-03-20 00:52:57,688 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-03-20 00:52:57,827 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:57,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:52:57,995 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 00:52:58,032 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:52:58,033 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:58,037 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 00:52:58,074 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 00:52:58,080 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4e442a3880> has no local changes
2025-03-20 00:52:58,080 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
Generated by OMERO-plugins-push#359 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/)'
2025-03-20 00:52:58,088 [ scc.git] DEBUG [detached HEAD 9c2a4a1] merge master -Dorg -Ssuccess-only
2025-03-20 00:52:58,088 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:52:58,089 [ scc.repo] DEBUG ## PRs found:
2025-03-20 00:52:58,247 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:58,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-03-20 00:52:58,442 [ scc.repo] DEBUG ## Branches found:
2025-03-20 00:52:58,442 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-20 00:52:58,442 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:52:58,442 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:58,448 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 00:52:58,453 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 00:52:58,453 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 00:52:58,459 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 00:52:58,465 [ scc.git] DEBUG Already up to date.
2025-03-20 00:52:58,466 [ scc.git] DEBUG ## Unique users: []
2025-03-20 00:52:58,466 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:52:58,466 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:58,470 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 00:52:58,510 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:52:58,511 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:52:58,515 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 00:52:58,551 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 00:52:58,557 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4e44289220> has no local changes
2025-03-20 00:52:58,557 [ 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#359 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/)'
2025-03-20 00:52:58,565 [ scc.git] DEBUG [detached HEAD bd2b8f0] merge master -Dorg -Ssuccess-only
2025-03-20 00:52:58,565 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:52:58,565 [ scc.repo] DEBUG ## PRs found:
2025-03-20 00:52:58,694 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:59,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-03-20 00:52:59,285 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:52:59,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-03-20 00:52:59,793 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:00,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-03-20 00:53:00,261 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:00,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-03-20 00:53:00,513 [ scc.repo] DEBUG ## Branches found:
2025-03-20 00:53:00,513 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-20 00:53:00,513 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:00,513 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:00,519 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 00:53:00,523 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 00:53:00,523 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 00:53:00,530 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 00:53:00,535 [ scc.git] DEBUG Already up to date.
2025-03-20 00:53:00,535 [ scc.git] DEBUG ## Unique users: []
2025-03-20 00:53:00,535 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:00,535 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:00,540 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 00:53:00,577 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:00,577 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:00,582 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 00:53:00,617 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 00:53:00,622 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4e4428bc70> has no local changes
2025-03-20 00:53:00,622 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Generated by OMERO-plugins-push#359 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/)'
2025-03-20 00:53:00,630 [ scc.git] DEBUG [detached HEAD 185d98a] merge master -Dorg -Ssuccess-only
2025-03-20 00:53:00,630 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:00,630 [ scc.repo] DEBUG ## PRs found:
2025-03-20 00:53:00,765 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:01,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-03-20 00:53:01,321 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:01,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-03-20 00:53:01,844 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:02,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-03-20 00:53:02,295 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:02,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-20 00:53:02,840 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:03,073 [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-20 00:53:03,325 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:03,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-20 00:53:03,773 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:03,956 [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-20 00:53:03,956 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-20 00:53:03,957 [ scc.repo] DEBUG ## Branches found:
2025-03-20 00:53:03,957 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-20 00:53:03,957 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:03,957 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:03,962 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 00:53:03,967 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 00:53:03,967 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 00:53:03,972 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 00:53:03,977 [ scc.git] DEBUG Already up to date.
2025-03-20 00:53:03,977 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-03-20 00:53:04,453 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-03-20 00:53:04,453 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-03-20 00:53:04,457 [ scc.git] DEBUG ## Unique users: []
2025-03-20 00:53:04,457 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:04,457 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:04,462 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-20 00:53:04,467 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:04,472 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-20 00:53:04,525 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-03-20 00:53:04,525 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-03-20 00:53:04,525 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-03-20 00:53:04,525 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-03-20 00:53:04,525 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-03-20 00:53:04,525 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-03-20 00:53:04,525 [ scc.git] DEBUG Auto-merging setup.py
2025-03-20 00:53:04,525 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-03-20 00:53:04,525 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-20 00:53:04,525 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-20 00:53:04,530 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-20 00:53:04,536 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-03-20 00:53:04,539 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:04,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:04,704 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-20 00:53:04,710 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-20 00:53:04,716 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#359](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
- omero_signup/views.py
--conflicts
2025-03-20 00:53:04,720 [ scc.config] DEBUG Found github.token
2025-03-20 00:53:04,720 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-03-20 00:53:04,721 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 00:53:04,756 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:04,757 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:04,761 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 00:53:04,796 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 00:53:04,801 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4e4424cfd0> has no local changes
2025-03-20 00:53:04,801 [ 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#359 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/)'
2025-03-20 00:53:04,809 [ scc.git] DEBUG [detached HEAD 0e30a2a] merge master -Dorg -Ssuccess-only
2025-03-20 00:53:04,809 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:04,809 [ scc.repo] DEBUG ## PRs found:
2025-03-20 00:53:04,956 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:05,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-03-20 00:53:05,522 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:05,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-03-20 00:53:06,018 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:06,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-03-20 00:53:06,515 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:06,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-03-20 00:53:07,023 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:07,302 [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-20 00:53:07,554 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:07,771 [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-20 00:53:08,023 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:08,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-03-20 00:53:08,523 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:08,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-03-20 00:53:08,987 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:09,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-03-20 00:53:09,473 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:09,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-03-20 00:53:09,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:10,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-20 00:53:10,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:10,685 [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-20 00:53:10,937 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:11,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-20 00:53:11,390 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:11,566 [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-20 00:53:11,567 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-20 00:53:11,567 [ scc.repo] DEBUG ## Branches found:
2025-03-20 00:53:11,567 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-20 00:53:11,567 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:11,568 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:11,573 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 00:53:11,578 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 00:53:11,578 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 00:53:11,583 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 00:53:11,588 [ scc.git] DEBUG Already up to date.
2025-03-20 00:53:11,588 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-03-20 00:53:12,200 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-03-20 00:53:12,200 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-03-20 00:53:12,205 [ scc.git] DEBUG ## Unique users: []
2025-03-20 00:53:12,205 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:12,205 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:12,211 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-03-20 00:53:12,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:12,222 [ 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-20 00:53:12,234 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 00:53:12,237 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-03-20 00:53:12,237 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-03-20 00:53:12,237 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-03-20 00:53:12,237 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-03-20 00:53:12,237 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-03-20 00:53:12,238 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-03-20 00:53:12,238 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-03-20 00:53:12,238 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-03-20 00:53:12,238 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-03-20 00:53:12,240 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:12,240 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-03-20 00:53:12,240 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-03-20 00:53:12,240 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-03-20 00:53:12,240 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-03-20 00:53:12,240 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-03-20 00:53:12,240 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-03-20 00:53:12,240 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-03-20 00:53:12,240 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-03-20 00:53:12,240 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-03-20 00:53:12,240 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-03-20 00:53:12,240 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-03-20 00:53:12,240 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-03-20 00:53:12,241 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-03-20 00:53:12,241 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-03-20 00:53:12,241 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-03-20 00:53:12,241 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-03-20 00:53:12,241 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-03-20 00:53:12,241 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-03-20 00:53:12,241 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-03-20 00:53:12,241 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-03-20 00:53:12,241 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-03-20 00:53:12,241 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-03-20 00:53:12,241 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-03-20 00:53:12,241 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-03-20 00:53:12,241 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-03-20 00:53:12,241 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-03-20 00:53:12,241 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-03-20 00:53:12,241 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-03-20 00:53:12,241 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-03-20 00:53:12,241 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-03-20 00:53:12,241 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-03-20 00:53:12,241 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-03-20 00:53:12,241 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-03-20 00:53:12,241 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-03-20 00:53:12,241 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-03-20 00:53:12,241 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-03-20 00:53:12,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:12,434 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 00:53:12,473 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:12,474 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:12,478 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 00:53:12,514 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 00:53:12,520 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4e4428ba60> has no local changes
2025-03-20 00:53:12,520 [ 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#359 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/)'
2025-03-20 00:53:12,528 [ scc.git] DEBUG [detached HEAD e12f57b] merge master -Dorg -Ssuccess-only
2025-03-20 00:53:12,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:12,529 [ scc.repo] DEBUG ## PRs found:
2025-03-20 00:53:12,686 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:12,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-03-20 00:53:12,867 [ scc.repo] DEBUG ## Branches found:
2025-03-20 00:53:12,867 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-20 00:53:12,867 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:12,867 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:12,872 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 00:53:12,877 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 00:53:12,877 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 00:53:12,882 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 00:53:12,887 [ scc.git] DEBUG Already up to date.
2025-03-20 00:53:12,887 [ scc.git] DEBUG ## Unique users: []
2025-03-20 00:53:12,887 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:12,888 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:12,892 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 00:53:12,928 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:12,928 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:12,933 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 00:53:12,970 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 00:53:12,975 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4e44240250> has no local changes
2025-03-20 00:53:12,975 [ 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#359 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/)'
2025-03-20 00:53:12,982 [ scc.git] DEBUG [detached HEAD 4bf535d] merge master -Dorg -Ssuccess-only
2025-03-20 00:53:12,983 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:12,983 [ scc.repo] DEBUG ## PRs found:
2025-03-20 00:53:13,119 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:13,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-03-20 00:53:13,676 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:13,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-03-20 00:53:14,191 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:14,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-03-20 00:53:14,675 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:14,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-20 00:53:15,191 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:15,464 [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-20 00:53:15,716 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:15,921 [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-20 00:53:16,174 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:16,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-20 00:53:16,776 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:16,971 [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-20 00:53:16,972 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-03-20 00:53:16,972 [ scc.repo] DEBUG ## Branches found:
2025-03-20 00:53:16,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-20 00:53:16,972 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:16,972 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:16,977 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 00:53:16,982 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 00:53:16,982 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 00:53:16,987 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 00:53:16,992 [ scc.git] DEBUG Already up to date.
2025-03-20 00:53:16,992 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-03-20 00:53:17,642 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-03-20 00:53:17,642 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-03-20 00:53:17,647 [ scc.git] DEBUG ## Unique users: []
2025-03-20 00:53:17,647 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:17,648 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:17,653 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-03-20 00:53:17,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:17,663 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-03-20 00:53:17,672 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 00:53:17,675 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-03-20 00:53:17,675 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-03-20 00:53:17,675 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-03-20 00:53:17,675 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-03-20 00:53:17,675 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-03-20 00:53:17,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:17,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:17,852 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 00:53:17,890 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:17,890 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:17,894 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 00:53:17,929 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 00:53:17,935 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4e4428ba30> has no local changes
2025-03-20 00:53:17,935 [ 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#359 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/)'
2025-03-20 00:53:17,943 [ scc.git] DEBUG [detached HEAD 6342ede] merge master -Dorg -Ssuccess-only
2025-03-20 00:53:17,943 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:17,943 [ scc.git] INFO Overriding base-branch from master to main
2025-03-20 00:53:17,944 [ scc.repo] DEBUG ## PRs found:
2025-03-20 00:53:18,104 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:18,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-03-20 00:53:18,628 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:18,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-03-20 00:53:19,112 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:19,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-03-20 00:53:19,622 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:19,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-03-20 00:53:20,179 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:20,411 [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-20 00:53:20,664 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:20,884 [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-20 00:53:21,136 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:21,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-03-20 00:53:21,630 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:21,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-03-20 00:53:22,104 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:22,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-03-20 00:53:22,582 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:22,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-20 00:53:23,134 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:23,375 [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-20 00:53:23,627 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:23,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-20 00:53:24,091 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:24,288 [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-20 00:53:24,288 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-20 00:53:24,288 [ scc.repo] DEBUG ## Branches found:
2025-03-20 00:53:24,289 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-20 00:53:24,289 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:24,289 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:24,294 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-03-20 00:53:24,299 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 00:53:24,299 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-03-20 00:53:24,304 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-03-20 00:53:24,309 [ scc.git] DEBUG Already up to date.
2025-03-20 00:53:24,309 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-03-20 00:53:24,815 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-03-20 00:53:24,816 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-03-20 00:53:24,820 [ scc.git] DEBUG ## Unique users: []
2025-03-20 00:53:24,820 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:24,820 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:24,825 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-20 00:53:24,831 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:24,835 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-20 00:53:24,972 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-03-20 00:53:24,972 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-03-20 00:53:24,972 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-20 00:53:24,973 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-20 00:53:24,978 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-20 00:53:24,985 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-03-20 00:53:24,987 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:25,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:25,162 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-20 00:53:25,168 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-20 00:53:25,173 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#359](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-03-20 00:53:25,177 [ scc.config] DEBUG Found github.token
2025-03-20 00:53:25,178 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-03-20 00:53:25,178 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 00:53:25,214 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:25,214 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:25,219 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 00:53:25,254 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 00:53:25,260 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4e44206100> has no local changes
2025-03-20 00:53:25,260 [ 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#359 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/)'
2025-03-20 00:53:25,268 [ scc.git] DEBUG [detached HEAD 08dc40f] merge master -Dorg -Ssuccess-only
2025-03-20 00:53:25,268 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:25,268 [ scc.repo] DEBUG ## PRs found:
2025-03-20 00:53:25,415 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:25,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-03-20 00:53:25,600 [ scc.repo] DEBUG ## Branches found:
2025-03-20 00:53:25,600 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-20 00:53:25,600 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:25,600 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:25,606 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 00:53:25,610 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 00:53:25,610 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 00:53:25,615 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 00:53:25,620 [ scc.git] DEBUG Already up to date.
2025-03-20 00:53:25,621 [ scc.git] DEBUG ## Unique users: []
2025-03-20 00:53:25,621 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:25,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:25,625 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 00:53:25,663 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:25,663 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:25,668 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 00:53:25,704 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 00:53:25,709 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4e441385b0> has no local changes
2025-03-20 00:53:25,710 [ 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#359 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/)'
2025-03-20 00:53:25,717 [ scc.git] DEBUG [detached HEAD ac853d5] merge master -Dorg -Ssuccess-only
2025-03-20 00:53:25,717 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:25,717 [ scc.repo] DEBUG ## PRs found:
2025-03-20 00:53:25,852 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:26,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-03-20 00:53:26,034 [ scc.repo] DEBUG ## Branches found:
2025-03-20 00:53:26,034 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-20 00:53:26,034 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:26,034 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:26,041 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 00:53:26,046 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 00:53:26,047 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 00:53:26,052 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 00:53:26,058 [ scc.git] DEBUG Already up to date.
2025-03-20 00:53:26,058 [ scc.git] DEBUG ## Unique users: []
2025-03-20 00:53:26,058 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:26,058 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:26,063 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 00:53:26,105 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:26,106 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:26,112 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 00:53:26,153 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 00:53:26,159 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4e44200520> has no local changes
2025-03-20 00:53:26,159 [ 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#359 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/)'
2025-03-20 00:53:26,169 [ scc.git] DEBUG [detached HEAD cb8992a] merge master -Dorg -Ssuccess-only
2025-03-20 00:53:26,169 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:26,169 [ scc.repo] DEBUG ## PRs found:
2025-03-20 00:53:26,287 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:26,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-03-20 00:53:26,805 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:27,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-03-20 00:53:27,276 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:27,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-03-20 00:53:27,729 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:28,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-20 00:53:28,283 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:28,495 [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-20 00:53:28,748 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:29,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-20 00:53:29,262 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:29,447 [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-20 00:53:29,448 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-03-20 00:53:29,448 [ scc.repo] DEBUG ## Branches found:
2025-03-20 00:53:29,448 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-20 00:53:29,448 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:29,448 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:29,454 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-20 00:53:29,459 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 00:53:29,459 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-20 00:53:29,464 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-20 00:53:29,469 [ scc.git] DEBUG Already up to date.
2025-03-20 00:53:29,470 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-03-20 00:53:29,856 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-03-20 00:53:29,856 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-03-20 00:53:29,860 [ scc.git] DEBUG ## Unique users: []
2025-03-20 00:53:29,860 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:29,860 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:29,865 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-20 00:53:29,871 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:29,876 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-20 00:53:29,912 [ scc.git] DEBUG Auto-merging Dockerfile
2025-03-20 00:53:29,912 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-03-20 00:53:29,912 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-20 00:53:29,913 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-20 00:53:29,918 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-20 00:53:29,925 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-03-20 00:53:29,927 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:30,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:30,094 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-20 00:53:30,100 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-20 00:53:30,105 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#359](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-03-20 00:53:30,110 [ scc.config] DEBUG Found github.token
2025-03-20 00:53:30,110 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-03-20 00:53:30,110 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 00:53:30,146 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:30,147 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:30,151 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 00:53:30,187 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 00:53:30,193 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4e44138610> has no local changes
2025-03-20 00:53:30,193 [ 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#359 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/)'
2025-03-20 00:53:30,201 [ scc.git] DEBUG [detached HEAD e1179f6] merge master -Dorg -Ssuccess-only
2025-03-20 00:53:30,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:30,201 [ scc.git] INFO Overriding base-branch from master to develop
2025-03-20 00:53:30,201 [ scc.repo] DEBUG ## PRs found:
2025-03-20 00:53:30,346 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:30,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-03-20 00:53:30,922 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:31,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-03-20 00:53:31,416 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:31,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-03-20 00:53:31,918 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:32,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-20 00:53:32,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:32,692 [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-20 00:53:32,944 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:33,185 [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-20 00:53:33,438 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:33,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-20 00:53:33,887 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:34,072 [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-20 00:53:34,073 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-20 00:53:34,324 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:34,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-03-20 00:53:34,810 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:35,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-03-20 00:53:35,316 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:35,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-20 00:53:35,777 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:35,954 [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-20 00:53:36,206 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:36,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-20 00:53:36,730 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:36,914 [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-20 00:53:36,915 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-20 00:53:37,167 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:37,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-03-20 00:53:37,653 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:37,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-03-20 00:53:38,188 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:38,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-03-20 00:53:38,711 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:38,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-03-20 00:53:38,981 [ scc.repo] DEBUG ## Branches found:
2025-03-20 00:53:38,981 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-20 00:53:38,982 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:38,982 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:38,987 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-03-20 00:53:38,992 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-20 00:53:38,992 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-03-20 00:53:38,997 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-03-20 00:53:39,002 [ scc.git] DEBUG Already up to date.
2025-03-20 00:53:39,002 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-03-20 00:53:39,756 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-20 00:53:39,756 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-03-20 00:53:39,761 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-03-20 00:53:40,203 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-20 00:53:40,203 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-03-20 00:53:40,207 [ scc.git] DEBUG ## Unique users: []
2025-03-20 00:53:40,207 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:40,207 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:40,213 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-20 00:53:40,220 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:40,225 [ 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-20 00:53:40,261 [ 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-20 00:53:40,261 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-20 00:53:40,261 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-20 00:53:40,267 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-20 00:53:40,272 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-03-20 00:53:40,276 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:40,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:40,439 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-20 00:53:40,447 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-03-20 00:53:40,453 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#359](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-03-20 00:53:40,458 [ scc.config] DEBUG Found github.token
2025-03-20 00:53:40,458 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-03-20 00:53:40,458 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-20 00:53:40,464 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:40,469 [ 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-20 00:53:40,479 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-20 00:53:40,481 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-03-20 00:53:40,481 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-03-20 00:53:40,691 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:40,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:40,854 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-20 00:53:40,891 [ scc.git] DEBUG Get sha1 of %s
2025-03-20 00:53:40,892 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-20 00:53:40,896 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 00:53:40,932 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 00:53:40,938 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4e44187ac0> has no local changes
2025-03-20 00:53:40,938 [ 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#359 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/)'
2025-03-20 00:53:40,946 [ scc.git] DEBUG [detached HEAD 07eea9c] merge master -Dorg -Ssuccess-only
2025-03-20 00:53:40,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:40,947 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-20 00:53:41,016 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-03-20 00:53:41,106 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:41,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:41,276 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-03-20 00:53:41,281 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-03-20 00:53:41,519 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:41,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:41,703 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-03-20 00:53:41,708 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-03-20 00:53:41,943 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:42,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:42,132 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-03-20 00:53:42,137 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-03-20 00:53:42,374 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:42,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:42,553 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-03-20 00:53:42,791 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:42,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:42,968 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-03-20 00:53:42,972 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-03-20 00:53:43,211 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:43,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:43,384 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-03-20 00:53:43,388 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-03-20 00:53:43,626 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:43,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:43,804 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-03-20 00:53:43,809 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-03-20 00:53:44,047 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:44,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:44,224 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-03-20 00:53:44,229 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-03-20 00:53:44,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:44,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:44,649 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-03-20 00:53:44,653 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-03-20 00:53:44,892 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:45,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:45,067 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-03-20 00:53:45,072 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-03-20 00:53:45,310 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:45,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:45,492 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-03-20 00:53:45,498 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-03-20 00:53:45,734 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:45,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:45,913 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-03-20 00:53:45,917 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-03-20 00:53:46,155 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:46,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:46,331 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-03-20 00:53:46,569 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:46,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:46,763 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-03-20 00:53:47,001 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:47,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:47,181 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-03-20 00:53:47,185 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-03-20 00:53:47,424 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:47,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:47,613 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-03-20 00:53:47,851 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:48,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:48,035 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-03-20 00:53:48,274 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:48,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:48,456 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-03-20 00:53:48,461 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-03-20 00:53:48,699 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:48,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:48,881 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-03-20 00:53:48,886 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-03-20 00:53:49,124 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:49,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:49,297 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-03-20 00:53:49,302 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-03-20 00:53:49,540 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:49,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:49,706 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-03-20 00:53:49,711 [ scc.config] DEBUG Found submodule.scripts.url
2025-03-20 00:53:49,949 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-20 00:53:50,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-20 00:53:50,127 [ scc.config] DEBUG Found submodule.scripts.branch
2025-03-20 00:53:50,127 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-20 00:53:50,205 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4e45666ca0> has local changes
2025-03-20 00:53:50,205 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
- PR 167 dominikl 'Add extinfo command'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 600 Rdornier 'Label on rois' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#359 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/359/)'
2025-03-20 00:53:50,219 [ scc.git] DEBUG [detached HEAD 7af67ef] merge master -Dorg -Ssuccess-only
2025-03-20 00:53:50,219 [ scc.merge] INFO Repository: ome/omero-plugins
2025-03-20 00:53:50,219 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-03-20 00:53:50,220 [ scc.merge] INFO Already up to date.
2025-03-20 00:53:50,220 [ scc.merge] INFO
2025-03-20 00:53:50,220 [ scc.merge] INFO Merged PRs:
2025-03-20 00:53:50,220 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-03-20 00:53:50,220 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-03-20 00:53:50,220 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-03-20 00:53:50,220 [ scc.merge] INFO
2025-03-20 00:53:50,220 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-03-20 00:53:50,220 [ scc.merge] INFO Already up to date.
2025-03-20 00:53:50,220 [ scc.merge] INFO
2025-03-20 00:53:50,220 [ scc.merge] INFO
2025-03-20 00:53:50,220 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-03-20 00:53:50,220 [ scc.merge] INFO Excluded PRs:
2025-03-20 00:53:50,220 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-03-20 00:53:50,220 [ scc.merge] INFO Already up to date.
2025-03-20 00:53:50,220 [ scc.merge] INFO
2025-03-20 00:53:50,220 [ scc.merge] INFO
2025-03-20 00:53:50,220 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-03-20 00:53:50,220 [ scc.merge] INFO Excluded PRs:
2025-03-20 00:53:50,220 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-03-20 00:53:50,220 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-03-20 00:53:50,220 [ scc.merge] INFO Already up to date.
2025-03-20 00:53:50,220 [ scc.merge] INFO
2025-03-20 00:53:50,220 [ scc.merge] INFO Merged PRs:
2025-03-20 00:53:50,220 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-03-20 00:53:50,220 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-03-20 00:53:50,220 [ scc.merge] INFO
2025-03-20 00:53:50,220 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-03-20 00:53:50,220 [ scc.merge] INFO Excluded PRs:
2025-03-20 00:53:50,220 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-03-20 00:53:50,220 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-20 00:53:50,220 [ scc.merge] INFO Already up to date.
2025-03-20 00:53:50,220 [ scc.merge] INFO
2025-03-20 00:53:50,220 [ scc.merge] INFO Merged PRs:
2025-03-20 00:53:50,220 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-03-20 00:53:50,220 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-03-20 00:53:50,221 [ scc.merge] INFO
2025-03-20 00:53:50,221 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 00:53:50,221 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-03-20 00:53:50,221 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-03-20 00:53:50,221 [ scc.merge] INFO
2025-03-20 00:53:50,221 [ scc.merge] INFO Repository: ome/omero-figure
2025-03-20 00:53:50,221 [ scc.merge] INFO Excluded PRs:
2025-03-20 00:53:50,221 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-03-20 00:53:50,221 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (stage: draft)
2025-03-20 00:53:50,221 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-03-20 00:53:50,221 [ scc.merge] INFO Already up to date.
2025-03-20 00:53:50,221 [ scc.merge] INFO
2025-03-20 00:53:50,221 [ scc.merge] INFO Merged PRs:
2025-03-20 00:53:50,221 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-03-20 00:53:50,221 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-03-20 00:53:50,221 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-03-20 00:53:50,221 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-03-20 00:53:50,221 [ scc.merge] INFO
2025-03-20 00:53:50,221 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 00:53:50,221 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-03-20 00:53:50,221 [ scc.merge] INFO
2025-03-20 00:53:50,221 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-03-20 00:53:50,221 [ scc.merge] INFO Already up to date.
2025-03-20 00:53:50,221 [ scc.merge] INFO
2025-03-20 00:53:50,221 [ scc.merge] INFO Merged PRs:
2025-03-20 00:53:50,221 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-03-20 00:53:50,221 [ scc.merge] INFO
2025-03-20 00:53:50,221 [ scc.merge] INFO Repository: ome/omero-gallery
2025-03-20 00:53:50,221 [ scc.merge] INFO Already up to date.
2025-03-20 00:53:50,221 [ scc.merge] INFO
2025-03-20 00:53:50,221 [ scc.merge] INFO Merged PRs:
2025-03-20 00:53:50,221 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-03-20 00:53:50,221 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-03-20 00:53:50,221 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-03-20 00:53:50,221 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-03-20 00:53:50,221 [ scc.merge] INFO
2025-03-20 00:53:50,221 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 00:53:50,221 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-03-20 00:53:50,221 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-03-20 00:53:50,221 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-03-20 00:53:50,221 [ scc.merge] INFO
2025-03-20 00:53:50,222 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-03-20 00:53:50,222 [ scc.merge] INFO Excluded PRs:
2025-03-20 00:53:50,222 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-03-20 00:53:50,222 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-03-20 00:53:50,222 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-03-20 00:53:50,222 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-03-20 00:53:50,222 [ scc.merge] INFO Already up to date.
2025-03-20 00:53:50,222 [ scc.merge] INFO
2025-03-20 00:53:50,222 [ scc.merge] INFO Merged PRs:
2025-03-20 00:53:50,222 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-03-20 00:53:50,222 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-03-20 00:53:50,222 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-20 00:53:50,222 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-20 00:53:50,222 [ scc.merge] INFO
2025-03-20 00:53:50,222 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 00:53:50,222 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-20 00:53:50,222 [ scc.merge] INFO
2025-03-20 00:53:50,222 [ scc.merge] INFO Repository: ome/omero-mapr
2025-03-20 00:53:50,222 [ scc.merge] INFO Excluded PRs:
2025-03-20 00:53:50,222 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-03-20 00:53:50,222 [ scc.merge] INFO Already up to date.
2025-03-20 00:53:50,222 [ scc.merge] INFO
2025-03-20 00:53:50,222 [ scc.merge] INFO Merged PRs:
2025-03-20 00:53:50,222 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-03-20 00:53:50,222 [ scc.merge] INFO
2025-03-20 00:53:50,222 [ scc.merge] INFO Repository: ome/omero-metadata
2025-03-20 00:53:50,222 [ scc.merge] INFO Already up to date.
2025-03-20 00:53:50,222 [ scc.merge] INFO
2025-03-20 00:53:50,222 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 00:53:50,222 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-20 00:53:50,222 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-20 00:53:50,222 [ scc.merge] INFO
2025-03-20 00:53:50,222 [ scc.merge] INFO Repository: ome/omero-parade
2025-03-20 00:53:50,222 [ scc.merge] INFO Excluded PRs:
2025-03-20 00:53:50,222 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-03-20 00:53:50,222 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-03-20 00:53:50,222 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-03-20 00:53:50,222 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-03-20 00:53:50,222 [ scc.merge] INFO Already up to date.
2025-03-20 00:53:50,222 [ scc.merge] INFO
2025-03-20 00:53:50,222 [ scc.merge] INFO Merged PRs:
2025-03-20 00:53:50,222 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-20 00:53:50,222 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-20 00:53:50,223 [ scc.merge] INFO
2025-03-20 00:53:50,223 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-03-20 00:53:50,223 [ scc.merge] INFO Already up to date.
2025-03-20 00:53:50,223 [ scc.merge] INFO
2025-03-20 00:53:50,223 [ scc.merge] INFO
2025-03-20 00:53:50,223 [ scc.merge] INFO Repository: ome/omero-rois
2025-03-20 00:53:50,223 [ scc.merge] INFO Excluded PRs:
2025-03-20 00:53:50,223 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-03-20 00:53:50,223 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-20 00:53:50,223 [ scc.merge] INFO Already up to date.
2025-03-20 00:53:50,223 [ scc.merge] INFO
2025-03-20 00:53:50,223 [ scc.merge] INFO
2025-03-20 00:53:50,223 [ scc.merge] INFO Repository: ome/omero-signup
2025-03-20 00:53:50,223 [ scc.merge] INFO Already up to date.
2025-03-20 00:53:50,223 [ scc.merge] INFO
2025-03-20 00:53:50,223 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 00:53:50,223 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-20 00:53:50,223 [ scc.merge] INFO
2025-03-20 00:53:50,223 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-03-20 00:53:50,223 [ scc.merge] INFO Excluded PRs:
2025-03-20 00:53:50,223 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-03-20 00:53:50,223 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-03-20 00:53:50,223 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-03-20 00:53:50,223 [ scc.merge] INFO Already up to date.
2025-03-20 00:53:50,223 [ scc.merge] INFO
2025-03-20 00:53:50,223 [ scc.merge] INFO Merged PRs:
2025-03-20 00:53:50,223 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-20 00:53:50,223 [ scc.merge] INFO
2025-03-20 00:53:50,223 [ scc.merge] INFO Repository: ome/omero-upload
2025-03-20 00:53:50,223 [ scc.merge] INFO Already up to date.
2025-03-20 00:53:50,223 [ scc.merge] INFO
2025-03-20 00:53:50,223 [ scc.merge] INFO
2025-03-20 00:53:50,223 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-03-20 00:53:50,223 [ scc.merge] INFO Already up to date.
2025-03-20 00:53:50,223 [ scc.merge] INFO
2025-03-20 00:53:50,223 [ scc.merge] INFO Merged PRs:
2025-03-20 00:53:50,223 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-03-20 00:53:50,223 [ scc.merge] INFO
2025-03-20 00:53:50,223 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-03-20 00:53:50,223 [ scc.merge] INFO Excluded PRs:
2025-03-20 00:53:50,223 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-03-20 00:53:50,224 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-03-20 00:53:50,224 [ scc.merge] INFO Already up to date.
2025-03-20 00:53:50,224 [ scc.merge] INFO
2025-03-20 00:53:50,224 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 00:53:50,224 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-20 00:53:50,224 [ scc.merge] INFO
2025-03-20 00:53:50,224 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-03-20 00:53:50,224 [ scc.merge] INFO Already up to date.
2025-03-20 00:53:50,224 [ scc.merge] INFO
2025-03-20 00:53:50,224 [ scc.merge] INFO
2025-03-20 00:53:50,224 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-03-20 00:53:50,224 [ scc.merge] INFO Already up to date.
2025-03-20 00:53:50,224 [ scc.merge] INFO
2025-03-20 00:53:50,224 [ scc.merge] INFO
2025-03-20 00:53:50,224 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-03-20 00:53:50,224 [ scc.merge] INFO Already up to date.
2025-03-20 00:53:50,224 [ scc.merge] INFO
2025-03-20 00:53:50,224 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 00:53:50,224 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-03-20 00:53:50,224 [ scc.merge] INFO
2025-03-20 00:53:50,224 [ scc.merge] INFO Repository: ome/scripts
2025-03-20 00:53:50,224 [ scc.merge] INFO Excluded PRs:
2025-03-20 00:53:50,224 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-03-20 00:53:50,224 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-03-20 00:53:50,224 [ scc.merge] INFO Already up to date.
2025-03-20 00:53:50,224 [ scc.merge] INFO
2025-03-20 00:53:50,224 [ scc.merge] INFO Merged PRs:
2025-03-20 00:53:50,224 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-20 00:53:50,224 [ scc.merge] INFO
2025-03-20 00:53:50,224 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-20 00:53:50,224 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-20 00:53:50,224 [ scc.merge] INFO
2025-03-20 00:53:50,224 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-03-20 00:53:50,224 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 00:53:50,229 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-03-20 00:53:50,229 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 00:53:50,233 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:50,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-03-20 00:53:50,234 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 00:53:50,238 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:50,238 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-03-20 00:53:50,238 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 00:53:50,243 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:50,243 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-03-20 00:53:50,243 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 00:53:50,247 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:50,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-03-20 00:53:50,248 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 00:53:50,252 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:50,252 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-03-20 00:53:50,252 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 00:53:50,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:50,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-03-20 00:53:50,257 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 00:53:50,261 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:50,261 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-20 00:53:50,261 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 00:53:50,266 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:50,266 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-20 00:53:50,266 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 00:53:50,270 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:50,271 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-20 00:53:50,271 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 00:53:50,275 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:50,275 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-20 00:53:50,275 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 00:53:50,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:50,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-20 00:53:50,280 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 00:53:50,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:50,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-20 00:53:50,285 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 00:53:50,289 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:50,289 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-20 00:53:50,289 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 00:53:50,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:50,294 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-20 00:53:50,294 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 00:53:50,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:50,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-20 00:53:50,298 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 00:53:50,303 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:50,303 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-20 00:53:50,303 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 00:53:50,307 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:50,307 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-20 00:53:50,307 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 00:53:50,312 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:50,312 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-20 00:53:50,312 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 00:53:50,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:50,317 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-20 00:53:50,317 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 00:53:50,321 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:50,321 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-20 00:53:50,321 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 00:53:50,325 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-20 00:53:50,326 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-20 00:53:50,326 [ scc.git] DEBUG Calling 'git remote'
2025-03-20 00:53:50,330 [ 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.2-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 20fbbc0] 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 d127bbb] 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-20 00:54:38,145 [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-20 00:54:47,592 [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-20 00:54:50,035 [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-20 00:54:54,871 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-20 00:55:36,532 [ 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}
