Skipping 179 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
- PR #115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- package-lock.json
- PR #116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- package-lock.json
- PR #117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
- package-lock.json
- PR #118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- package-lock.json
--conflicts
2025-02-21 00:47:42,619 [ scc.config] DEBUG Found github.token
2025-02-21 00:47:42,619 [ scc.git] DEBUG Adding comment to issue #119.
2025-02-21 00:47:42,851 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:43,491 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-gallery/issues/119/comments HTTP/1.1" 201 2487
2025-02-21 00:47:43,492 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-21 00:47:43,535 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:47:43,535 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:47:43,541 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-21 00:47:43,580 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-21 00:47:43,587 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f699f03a130> has no local changes
2025-02-21 00:47:43,588 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Generated by OMERO-plugins-push#339 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/)'
2025-02-21 00:47:43,597 [ scc.git] DEBUG [detached HEAD a575d44] merge master -Dorg -Ssuccess-only
2025-02-21 00:47:43,598 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:47:43,598 [ scc.repo] DEBUG ## PRs found:
2025-02-21 00:47:43,744 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:44,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-02-21 00:47:44,360 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:44,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502 HTTP/1.1" 200 None
2025-02-21 00:47:44,840 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:45,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502/comments HTTP/1.1" 200 None
2025-02-21 00:47:45,040 [ scc.repo] DEBUG # ... Include label: dependencies
2025-02-21 00:47:45,292 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:45,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-02-21 00:47:45,910 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:46,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-02-21 00:47:46,427 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:46,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-02-21 00:47:46,950 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:47,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-02-21 00:47:47,504 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:47,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/45d08b7e29871ecff0386975c975dacd0865bcc4?per_page=1 HTTP/1.1" 200 2
2025-02-21 00:47:47,672 [ scc.repo] DEBUG - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-02-21 00:47:47,924 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:48,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-02-21 00:47:48,182 [ scc.repo] DEBUG # ... Include label: dependencies
2025-02-21 00:47:48,434 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:48,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-02-21 00:47:49,006 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:49,286 [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-02-21 00:47:49,538 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:49,812 [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-02-21 00:47:50,065 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:50,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-02-21 00:47:50,533 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:50,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2025-02-21 00:47:50,712 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-02-21 00:47:50,965 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:51,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-02-21 00:47:51,445 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:51,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-02-21 00:47:51,923 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:52,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-02-21 00:47:52,398 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:52,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-02-21 00:47:52,891 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:53,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-02-21 00:47:53,513 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:53,770 [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-02-21 00:47:54,022 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:54,245 [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-02-21 00:47:54,498 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:54,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-02-21 00:47:54,962 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:55,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2025-02-21 00:47:55,142 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-02-21 00:47:55,393 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:55,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-02-21 00:47:55,893 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:56,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-02-21 00:47:56,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:56,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-02-21 00:47:56,919 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:57,215 [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-02-21 00:47:57,468 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:57,718 [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-02-21 00:47:57,970 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:58,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-02-21 00:47:58,512 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:58,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2025-02-21 00:47:58,696 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-02-21 00:47:58,948 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:59,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-02-21 00:47:59,423 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:47:59,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-02-21 00:47:59,899 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:00,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-02-21 00:48:00,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:00,635 [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-02-21 00:48:00,887 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:01,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-02-21 00:48:01,415 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:01,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2025-02-21 00:48:01,601 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-02-21 00:48:01,601 [ scc.repo] DEBUG ## Branches found:
2025-02-21 00:48:01,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-02-21 00:48:01,602 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:01,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:01,608 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-21 00:48:01,614 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-21 00:48:01,614 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-21 00:48:01,619 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-21 00:48:01,625 [ scc.git] DEBUG Already up to date.
2025-02-21 00:48:01,625 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-02-21 00:48:03,202 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-21 00:48:03,202 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-02-21 00:48:03,207 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-02-21 00:48:04,702 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-21 00:48:04,702 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-02-21 00:48:04,708 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-02-21 00:48:05,246 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-21 00:48:05,246 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-02-21 00:48:05,250 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-02-21 00:48:05,535 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-21 00:48:05,535 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-02-21 00:48:05,540 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-02-21 00:48:05,817 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-02-21 00:48:05,818 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-02-21 00:48:05,823 [ scc.git] DEBUG ## Unique users: []
2025-02-21 00:48:05,823 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:05,823 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:05,829 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-02-21 00:48:05,838 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:05,846 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-02-21 00:48:06,150 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-02-21 00:48:06,150 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-02-21 00:48:06,151 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-21 00:48:06,155 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-02-21 00:48:06,155 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-02-21 00:48:06,155 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-02-21 00:48:06,158 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:06,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:48:06,333 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-02-21 00:48:06,345 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:06,354 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-02-21 00:48:06,384 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-02-21 00:48:06,385 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-02-21 00:48:06,385 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-02-21 00:48:06,385 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-02-21 00:48:06,385 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-21 00:48:06,390 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-02-21 00:48:06,390 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-02-21 00:48:06,390 [ scc.git] DEBUG src/app/header.html | 5 +
2025-02-21 00:48:06,390 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-02-21 00:48:06,390 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-02-21 00:48:06,390 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-02-21 00:48:06,390 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-02-21 00:48:06,390 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-02-21 00:48:06,588 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:06,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:48:06,757 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-02-21 00:48:06,768 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:06,774 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-02-21 00:48:06,813 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-02-21 00:48:06,814 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-21 00:48:06,818 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-02-21 00:48:06,818 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-02-21 00:48:06,818 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-02-21 00:48:07,008 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:07,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:48:07,168 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-02-21 00:48:07,219 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:07,225 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-02-21 00:48:07,256 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-21 00:48:07,266 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-02-21 00:48:07,266 [ scc.git] DEBUG package.json | 2 +-
2025-02-21 00:48:07,266 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-02-21 00:48:07,420 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:07,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:48:07,622 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-02-21 00:48:07,639 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:07,645 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-02-21 00:48:07,910 [ scc.git] DEBUG Auto-merging package-lock.json
2025-02-21 00:48:07,911 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-02-21 00:48:07,911 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-21 00:48:07,911 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-21 00:48:07,919 [ scc.git] DEBUG Calling 'git reset --hard b1dca499d2cf8aaf0f3bcdb68cd86da9fa8d36f0'
2025-02-21 00:48:07,931 [ scc.git] DEBUG HEAD is now at b1dca49 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-02-21 00:48:07,934 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:08,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:48:08,103 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-02-21 00:48:08,109 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-02-21 00:48:08,115 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#339](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-02-21 00:48:08,119 [ scc.config] DEBUG Found github.token
2025-02-21 00:48:08,119 [ scc.git] DEBUG Adding comment to issue #502.
2025-02-21 00:48:08,355 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:08,859 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-iviewer/issues/502/comments HTTP/1.1" 201 2017
2025-02-21 00:48:08,860 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-21 00:48:08,903 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:08,903 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:08,909 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-21 00:48:08,950 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-21 00:48:08,961 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f699e7f2100> has no local changes
2025-02-21 00:48:08,962 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- 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#339 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/)'
2025-02-21 00:48:08,972 [ scc.git] DEBUG [detached HEAD aa7ffa3] merge master -Dorg -Ssuccess-only
2025-02-21 00:48:08,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:48:08,973 [ scc.repo] DEBUG ## PRs found:
2025-02-21 00:48:09,112 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:09,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-02-21 00:48:09,650 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:09,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-02-21 00:48:10,153 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:10,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-02-21 00:48:10,691 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:10,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-02-21 00:48:11,196 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:11,405 [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-02-21 00:48:11,658 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:11,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-02-21 00:48:12,106 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:12,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-02-21 00:48:12,302 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-02-21 00:48:12,302 [ scc.repo] DEBUG ## Branches found:
2025-02-21 00:48:12,302 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-02-21 00:48:12,302 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:12,303 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:12,309 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-21 00:48:12,315 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-21 00:48:12,316 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-21 00:48:12,322 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-21 00:48:12,329 [ scc.git] DEBUG Already up to date.
2025-02-21 00:48:12,329 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-02-21 00:48:13,315 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-02-21 00:48:13,316 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-02-21 00:48:13,321 [ scc.git] DEBUG ## Unique users: []
2025-02-21 00:48:13,321 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:13,321 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:13,327 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-02-21 00:48:13,333 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:13,338 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-02-21 00:48:13,349 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-21 00:48:13,352 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-02-21 00:48:13,352 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-02-21 00:48:13,352 [ scc.git] DEBUG requirements.txt | 2 +-
2025-02-21 00:48:13,352 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-02-21 00:48:13,352 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-02-21 00:48:13,352 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-02-21 00:48:13,355 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:13,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:48:13,517 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-21 00:48:13,558 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:13,558 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:13,564 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-21 00:48:13,604 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-21 00:48:13,612 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f699e800310> has no local changes
2025-02-21 00:48:13,612 [ 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#339 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/)'
2025-02-21 00:48:13,621 [ scc.git] DEBUG [detached HEAD 15a131d] merge master -Dorg -Ssuccess-only
2025-02-21 00:48:13,622 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:48:13,622 [ scc.repo] DEBUG ## PRs found:
2025-02-21 00:48:13,770 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:14,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-02-21 00:48:14,314 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:14,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-02-21 00:48:14,797 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:15,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-02-21 00:48:15,319 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:15,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-02-21 00:48:15,880 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:16,091 [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-02-21 00:48:16,344 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:16,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-02-21 00:48:16,861 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:17,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-02-21 00:48:17,030 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-02-21 00:48:17,282 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:17,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-02-21 00:48:17,770 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:18,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-02-21 00:48:18,253 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:18,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-02-21 00:48:18,788 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:18,987 [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-02-21 00:48:19,240 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:19,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-02-21 00:48:19,797 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:19,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-02-21 00:48:19,977 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-02-21 00:48:19,977 [ scc.repo] DEBUG ## Branches found:
2025-02-21 00:48:19,977 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-02-21 00:48:19,977 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:19,978 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:19,983 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-21 00:48:19,988 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-21 00:48:19,988 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-21 00:48:19,993 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-21 00:48:19,999 [ scc.git] DEBUG Already up to date.
2025-02-21 00:48:19,999 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-02-21 00:48:20,903 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-02-21 00:48:20,903 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-02-21 00:48:20,911 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-02-21 00:48:21,477 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-02-21 00:48:21,477 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-02-21 00:48:21,481 [ scc.git] DEBUG ## Unique users: []
2025-02-21 00:48:21,481 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:21,481 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:21,487 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-02-21 00:48:21,494 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:21,498 [ 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-02-21 00:48:21,696 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-02-21 00:48:21,696 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-02-21 00:48:21,696 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-02-21 00:48:21,696 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-02-21 00:48:21,696 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-21 00:48:21,697 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-21 00:48:21,703 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-21 00:48:21,710 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-02-21 00:48:21,713 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:21,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:48:21,876 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-02-21 00:48:21,884 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-21 00:48:21,958 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#339](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-02-21 00:48:21,964 [ scc.config] DEBUG Found github.token
2025-02-21 00:48:21,964 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-02-21 00:48:21,964 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-02-21 00:48:21,971 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:21,976 [ 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-02-21 00:48:22,136 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-02-21 00:48:22,137 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-02-21 00:48:22,137 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-02-21 00:48:22,137 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-21 00:48:22,137 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-21 00:48:22,144 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-21 00:48:22,153 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-02-21 00:48:22,155 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:22,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:48:22,325 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-02-21 00:48:22,333 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-02-21 00:48:22,338 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#339](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/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-02-21 00:48:22,343 [ scc.config] DEBUG Found github.token
2025-02-21 00:48:22,343 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-02-21 00:48:22,343 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-21 00:48:22,382 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:22,382 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:22,391 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-21 00:48:22,434 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-21 00:48:22,443 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f699d791a60> has no local changes
2025-02-21 00:48:22,443 [ 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#339 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/)'
2025-02-21 00:48:22,454 [ scc.git] DEBUG [detached HEAD 06bddd9] merge master -Dorg -Ssuccess-only
2025-02-21 00:48:22,454 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:48:22,454 [ scc.repo] DEBUG ## PRs found:
2025-02-21 00:48:22,577 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:22,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-02-21 00:48:23,100 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:23,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-02-21 00:48:23,424 [ scc.repo] DEBUG # ... Include label: dependencies
2025-02-21 00:48:23,676 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:24,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-02-21 00:48:24,275 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:24,556 [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-02-21 00:48:24,809 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:25,099 [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-02-21 00:48:25,351 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:25,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-02-21 00:48:25,916 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:26,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-02-21 00:48:26,085 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-02-21 00:48:26,337 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:26,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-02-21 00:48:26,832 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:27,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-02-21 00:48:27,296 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:27,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-02-21 00:48:27,758 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:28,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-02-21 00:48:28,275 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:28,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-02-21 00:48:28,771 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:29,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-02-21 00:48:29,259 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:29,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-02-21 00:48:29,558 [ scc.repo] DEBUG ## Branches found:
2025-02-21 00:48:29,558 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-02-21 00:48:29,558 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:29,558 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:29,564 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-21 00:48:29,569 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-21 00:48:29,570 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-21 00:48:29,576 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-21 00:48:29,581 [ scc.git] DEBUG Already up to date.
2025-02-21 00:48:29,581 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-02-21 00:48:29,904 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-02-21 00:48:29,904 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-02-21 00:48:29,909 [ scc.git] DEBUG ## Unique users: []
2025-02-21 00:48:29,909 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:29,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:29,915 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-02-21 00:48:29,921 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:29,926 [ 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-02-21 00:48:30,034 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-21 00:48:30,038 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-02-21 00:48:30,038 [ scc.git] DEBUG package.json | 2 +-
2025-02-21 00:48:30,038 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-02-21 00:48:30,041 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:30,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:48:30,213 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-21 00:48:30,255 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:30,256 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:30,262 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-21 00:48:30,299 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-21 00:48:30,306 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f699d7c4e80> has no local changes
2025-02-21 00:48:30,306 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
Generated by OMERO-plugins-push#339 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/)'
2025-02-21 00:48:30,315 [ scc.git] DEBUG [detached HEAD 93c5245] merge master -Dorg -Ssuccess-only
2025-02-21 00:48:30,315 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:48:30,315 [ scc.repo] DEBUG ## PRs found:
2025-02-21 00:48:30,465 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:30,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-02-21 00:48:30,670 [ scc.repo] DEBUG ## Branches found:
2025-02-21 00:48:30,670 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-02-21 00:48:30,670 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:30,670 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:30,676 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-21 00:48:30,681 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-21 00:48:30,681 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-21 00:48:30,686 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-21 00:48:30,693 [ scc.git] DEBUG Already up to date.
2025-02-21 00:48:30,693 [ scc.git] DEBUG ## Unique users: []
2025-02-21 00:48:30,693 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:30,693 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:30,698 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-21 00:48:30,740 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:30,740 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:30,746 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-21 00:48:30,787 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-21 00:48:30,793 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f699d791fd0> has no local changes
2025-02-21 00:48:30,794 [ 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#339 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/)'
2025-02-21 00:48:30,802 [ scc.git] DEBUG [detached HEAD 9092340] merge master -Dorg -Ssuccess-only
2025-02-21 00:48:30,803 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:48:30,803 [ scc.repo] DEBUG ## PRs found:
2025-02-21 00:48:30,922 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:31,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-02-21 00:48:31,422 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:31,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-02-21 00:48:31,639 [ scc.repo] DEBUG ## Branches found:
2025-02-21 00:48:31,640 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-02-21 00:48:31,640 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:31,640 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:31,646 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-21 00:48:31,651 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-21 00:48:31,651 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-21 00:48:31,657 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-21 00:48:31,662 [ scc.git] DEBUG Already up to date.
2025-02-21 00:48:31,662 [ scc.git] DEBUG ## Unique users: []
2025-02-21 00:48:31,662 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:31,663 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:31,667 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-21 00:48:31,706 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:31,707 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:31,712 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-21 00:48:31,751 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-21 00:48:31,757 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f699c783c40> has no local changes
2025-02-21 00:48:31,757 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Generated by OMERO-plugins-push#339 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/)'
2025-02-21 00:48:31,766 [ scc.git] DEBUG [detached HEAD 19398a7] merge master -Dorg -Ssuccess-only
2025-02-21 00:48:31,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:48:31,766 [ scc.repo] DEBUG ## PRs found:
2025-02-21 00:48:31,892 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:32,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-02-21 00:48:32,387 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:32,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-02-21 00:48:32,888 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:33,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-02-21 00:48:33,357 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:33,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-02-21 00:48:33,947 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:34,139 [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-02-21 00:48:34,392 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:34,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-02-21 00:48:34,988 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:35,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-02-21 00:48:35,173 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-02-21 00:48:35,173 [ scc.repo] DEBUG ## Branches found:
2025-02-21 00:48:35,173 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-02-21 00:48:35,173 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:35,174 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:35,179 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-21 00:48:35,184 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-21 00:48:35,184 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-21 00:48:35,190 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-21 00:48:35,195 [ scc.git] DEBUG Already up to date.
2025-02-21 00:48:35,195 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-02-21 00:48:35,603 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-02-21 00:48:35,604 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-02-21 00:48:35,609 [ scc.git] DEBUG ## Unique users: []
2025-02-21 00:48:35,609 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:35,609 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:35,615 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-02-21 00:48:35,622 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:35,627 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-02-21 00:48:35,797 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-02-21 00:48:35,797 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-02-21 00:48:35,797 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-02-21 00:48:35,797 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-02-21 00:48:35,797 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-02-21 00:48:35,797 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-02-21 00:48:35,797 [ scc.git] DEBUG Auto-merging setup.py
2025-02-21 00:48:35,797 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-02-21 00:48:35,797 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-21 00:48:35,797 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-21 00:48:35,805 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-02-21 00:48:35,813 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-02-21 00:48:35,816 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:35,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:48:35,989 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-02-21 00:48:35,996 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-02-21 00:48:36,019 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#339](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
--conflicts
2025-02-21 00:48:36,025 [ scc.config] DEBUG Found github.token
2025-02-21 00:48:36,025 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-02-21 00:48:36,025 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-21 00:48:36,064 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:36,064 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:36,071 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-21 00:48:36,112 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-21 00:48:36,119 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f699c765a60> has no local changes
2025-02-21 00:48:36,120 [ 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#339 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/)'
2025-02-21 00:48:36,130 [ scc.git] DEBUG [detached HEAD bb45a64] merge master -Dorg -Ssuccess-only
2025-02-21 00:48:36,130 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:48:36,130 [ scc.repo] DEBUG ## PRs found:
2025-02-21 00:48:36,241 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:36,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-02-21 00:48:36,753 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:36,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-02-21 00:48:37,227 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:37,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-02-21 00:48:37,697 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:37,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-02-21 00:48:38,246 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:38,514 [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-02-21 00:48:38,767 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:38,967 [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-02-21 00:48:39,222 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:39,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-02-21 00:48:39,723 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:39,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-02-21 00:48:40,187 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:40,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-02-21 00:48:40,667 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:40,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-02-21 00:48:41,132 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:41,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-02-21 00:48:41,639 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:41,858 [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-02-21 00:48:42,111 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:42,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-02-21 00:48:42,573 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:42,736 [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-02-21 00:48:42,737 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-02-21 00:48:42,737 [ scc.repo] DEBUG ## Branches found:
2025-02-21 00:48:42,737 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-02-21 00:48:42,738 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:42,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:42,745 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-21 00:48:42,750 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-21 00:48:42,750 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-21 00:48:42,756 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-21 00:48:42,761 [ scc.git] DEBUG Already up to date.
2025-02-21 00:48:42,761 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-02-21 00:48:43,090 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-02-21 00:48:43,090 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-02-21 00:48:43,094 [ scc.git] DEBUG ## Unique users: []
2025-02-21 00:48:43,094 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:43,094 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:43,100 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-02-21 00:48:43,106 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:43,111 [ 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-02-21 00:48:43,262 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-21 00:48:43,266 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-02-21 00:48:43,266 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-02-21 00:48:43,266 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-02-21 00:48:43,266 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-02-21 00:48:43,266 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-02-21 00:48:43,266 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-02-21 00:48:43,266 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-02-21 00:48:43,266 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-02-21 00:48:43,266 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-02-21 00:48:43,266 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-02-21 00:48:43,266 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-02-21 00:48:43,267 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-02-21 00:48:43,267 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-02-21 00:48:43,267 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-02-21 00:48:43,269 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:43,269 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-02-21 00:48:43,269 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-02-21 00:48:43,269 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-02-21 00:48:43,269 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-02-21 00:48:43,269 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-02-21 00:48:43,269 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-02-21 00:48:43,269 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-02-21 00:48:43,269 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-02-21 00:48:43,269 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-02-21 00:48:43,269 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-02-21 00:48:43,269 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-02-21 00:48:43,269 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-02-21 00:48:43,269 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-02-21 00:48:43,269 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-02-21 00:48:43,269 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-02-21 00:48:43,269 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-02-21 00:48:43,269 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-02-21 00:48:43,269 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-02-21 00:48:43,270 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-02-21 00:48:43,270 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-02-21 00:48:43,270 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-02-21 00:48:43,270 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-02-21 00:48:43,270 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-02-21 00:48:43,270 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-02-21 00:48:43,270 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-02-21 00:48:43,270 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-02-21 00:48:43,270 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-02-21 00:48:43,270 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-02-21 00:48:43,270 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-02-21 00:48:43,270 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-02-21 00:48:43,270 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-02-21 00:48:43,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:48:43,430 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-21 00:48:43,471 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:43,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:43,477 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-21 00:48:43,516 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-21 00:48:43,523 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f699c765ca0> has no local changes
2025-02-21 00:48:43,523 [ 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#339 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/)'
2025-02-21 00:48:43,532 [ scc.git] DEBUG [detached HEAD 4b5d6bb] merge master -Dorg -Ssuccess-only
2025-02-21 00:48:43,532 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:48:43,533 [ scc.repo] DEBUG ## PRs found:
2025-02-21 00:48:43,683 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:43,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-02-21 00:48:43,921 [ scc.repo] DEBUG ## Branches found:
2025-02-21 00:48:43,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-02-21 00:48:43,922 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:43,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:43,927 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-21 00:48:43,932 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-21 00:48:43,932 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-21 00:48:43,938 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-21 00:48:43,943 [ scc.git] DEBUG Already up to date.
2025-02-21 00:48:43,943 [ scc.git] DEBUG ## Unique users: []
2025-02-21 00:48:43,943 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:43,943 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:43,948 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-21 00:48:43,986 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:43,986 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:43,992 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-21 00:48:44,030 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-21 00:48:44,036 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f699c6d0eb0> has no local changes
2025-02-21 00:48:44,036 [ 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#339 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/)'
2025-02-21 00:48:44,044 [ scc.git] DEBUG [detached HEAD f6268b1] merge master -Dorg -Ssuccess-only
2025-02-21 00:48:44,044 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:48:44,044 [ scc.repo] DEBUG ## PRs found:
2025-02-21 00:48:44,174 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:44,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-02-21 00:48:44,668 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:44,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-02-21 00:48:45,168 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:45,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-02-21 00:48:45,637 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:45,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-02-21 00:48:46,176 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:46,435 [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-02-21 00:48:46,687 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:46,912 [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-02-21 00:48:47,165 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:47,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-02-21 00:48:47,701 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:47,877 [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-02-21 00:48:47,878 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-02-21 00:48:47,878 [ scc.repo] DEBUG ## Branches found:
2025-02-21 00:48:47,878 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-02-21 00:48:47,878 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:47,878 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:47,884 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-21 00:48:47,889 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-21 00:48:47,890 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-21 00:48:47,896 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-21 00:48:47,903 [ scc.git] DEBUG Already up to date.
2025-02-21 00:48:47,903 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-02-21 00:48:48,484 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-02-21 00:48:48,484 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-02-21 00:48:48,488 [ scc.git] DEBUG ## Unique users: []
2025-02-21 00:48:48,488 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:48,489 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:48,495 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-02-21 00:48:48,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:48,505 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-02-21 00:48:48,567 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-21 00:48:48,570 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-02-21 00:48:48,570 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-02-21 00:48:48,570 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-02-21 00:48:48,570 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-02-21 00:48:48,570 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-02-21 00:48:48,573 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:48,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:48:48,766 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-21 00:48:48,805 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:48,805 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:48,810 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-21 00:48:48,849 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-21 00:48:48,855 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f699c710040> has no local changes
2025-02-21 00:48:48,856 [ 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#339 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/)'
2025-02-21 00:48:48,864 [ scc.git] DEBUG [detached HEAD 9cef079] merge master -Dorg -Ssuccess-only
2025-02-21 00:48:48,865 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:48:48,865 [ scc.git] INFO Overriding base-branch from master to main
2025-02-21 00:48:48,865 [ scc.repo] DEBUG ## PRs found:
2025-02-21 00:48:49,018 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:49,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-02-21 00:48:49,578 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:49,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-02-21 00:48:50,059 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:50,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-02-21 00:48:50,555 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:50,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-02-21 00:48:51,080 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:51,352 [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-02-21 00:48:51,604 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:51,819 [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-02-21 00:48:52,072 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:52,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-02-21 00:48:52,574 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:52,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-02-21 00:48:53,069 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:53,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-02-21 00:48:53,550 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:53,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-02-21 00:48:54,058 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:54,292 [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-02-21 00:48:54,545 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:54,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-02-21 00:48:55,087 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:55,265 [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-02-21 00:48:55,266 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-02-21 00:48:55,266 [ scc.repo] DEBUG ## Branches found:
2025-02-21 00:48:55,266 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-02-21 00:48:55,266 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:55,266 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:55,272 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-02-21 00:48:55,278 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-21 00:48:55,278 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-02-21 00:48:55,284 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-02-21 00:48:55,290 [ scc.git] DEBUG Already up to date.
2025-02-21 00:48:55,290 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-02-21 00:48:55,708 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-02-21 00:48:55,708 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-02-21 00:48:55,712 [ scc.git] DEBUG ## Unique users: []
2025-02-21 00:48:55,712 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:55,713 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:55,719 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-02-21 00:48:55,724 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:55,729 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-02-21 00:48:55,897 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-02-21 00:48:55,897 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-02-21 00:48:55,897 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-21 00:48:55,898 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-21 00:48:55,906 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-02-21 00:48:55,913 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-02-21 00:48:55,917 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:56,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:48:56,072 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-02-21 00:48:56,079 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-02-21 00:48:56,086 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#339](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-02-21 00:48:56,092 [ scc.config] DEBUG Found github.token
2025-02-21 00:48:56,093 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-02-21 00:48:56,093 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-21 00:48:56,135 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:56,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:56,141 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-21 00:48:56,187 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-21 00:48:56,195 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f699c71f820> has no local changes
2025-02-21 00:48:56,195 [ 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#339 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/)'
2025-02-21 00:48:56,205 [ scc.git] DEBUG [detached HEAD 1d18c17] merge master -Dorg -Ssuccess-only
2025-02-21 00:48:56,206 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:48:56,206 [ scc.repo] DEBUG ## PRs found:
2025-02-21 00:48:56,324 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:56,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-02-21 00:48:56,574 [ scc.repo] DEBUG ## Branches found:
2025-02-21 00:48:56,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-02-21 00:48:56,575 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:56,575 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:56,581 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-21 00:48:56,587 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-21 00:48:56,587 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-21 00:48:56,594 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-21 00:48:56,600 [ scc.git] DEBUG Already up to date.
2025-02-21 00:48:56,600 [ scc.git] DEBUG ## Unique users: []
2025-02-21 00:48:56,600 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:56,600 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:56,606 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-21 00:48:56,649 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:56,649 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:56,655 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-21 00:48:56,696 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-21 00:48:56,703 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f699c736040> has no local changes
2025-02-21 00:48:56,703 [ 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#339 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/)'
2025-02-21 00:48:56,711 [ scc.git] DEBUG [detached HEAD 93f39f6] merge master -Dorg -Ssuccess-only
2025-02-21 00:48:56,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:48:56,712 [ scc.repo] DEBUG ## PRs found:
2025-02-21 00:48:56,827 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:57,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-02-21 00:48:57,019 [ scc.repo] DEBUG ## Branches found:
2025-02-21 00:48:57,019 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-02-21 00:48:57,019 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:57,019 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:57,026 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-21 00:48:57,033 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-21 00:48:57,033 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-21 00:48:57,039 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-21 00:48:57,045 [ scc.git] DEBUG Already up to date.
2025-02-21 00:48:57,045 [ scc.git] DEBUG ## Unique users: []
2025-02-21 00:48:57,045 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:57,045 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:57,050 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-21 00:48:57,093 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:48:57,093 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:48:57,099 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-21 00:48:57,138 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-21 00:48:57,146 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f699c6e9be0> has no local changes
2025-02-21 00:48:57,147 [ 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#339 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/)'
2025-02-21 00:48:57,155 [ scc.git] DEBUG [detached HEAD 451a651] merge master -Dorg -Ssuccess-only
2025-02-21 00:48:57,156 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:48:57,156 [ scc.repo] DEBUG ## PRs found:
2025-02-21 00:48:57,271 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:57,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-02-21 00:48:57,811 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:58,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-02-21 00:48:58,276 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:58,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-02-21 00:48:58,736 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:59,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-02-21 00:48:59,274 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:48:59,509 [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-02-21 00:48:59,762 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:00,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-02-21 00:49:00,367 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:00,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-02-21 00:49:00,535 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-02-21 00:49:00,535 [ scc.repo] DEBUG ## Branches found:
2025-02-21 00:49:00,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-02-21 00:49:00,535 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:49:00,535 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:49:00,543 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-02-21 00:49:00,548 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-21 00:49:00,548 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-02-21 00:49:00,554 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-02-21 00:49:00,560 [ scc.git] DEBUG Already up to date.
2025-02-21 00:49:00,561 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-02-21 00:49:01,055 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-02-21 00:49:01,055 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-02-21 00:49:01,060 [ scc.git] DEBUG ## Unique users: []
2025-02-21 00:49:01,060 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:49:01,060 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:49:01,067 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-02-21 00:49:01,073 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:49:01,080 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-02-21 00:49:01,252 [ scc.git] DEBUG Auto-merging Dockerfile
2025-02-21 00:49:01,252 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-02-21 00:49:01,252 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-21 00:49:01,253 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-21 00:49:01,261 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-02-21 00:49:01,269 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-02-21 00:49:01,272 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:01,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:01,427 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-02-21 00:49:01,434 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-02-21 00:49:01,440 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#339](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-02-21 00:49:01,446 [ scc.config] DEBUG Found github.token
2025-02-21 00:49:01,446 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-02-21 00:49:01,446 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-21 00:49:01,488 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:49:01,488 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:49:01,494 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-21 00:49:01,534 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-21 00:49:01,541 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f699c653400> has no local changes
2025-02-21 00:49:01,542 [ 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#339 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/)'
2025-02-21 00:49:01,552 [ scc.git] DEBUG [detached HEAD 8e394a3] merge master -Dorg -Ssuccess-only
2025-02-21 00:49:01,552 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:49:01,553 [ scc.git] INFO Overriding base-branch from master to develop
2025-02-21 00:49:01,553 [ scc.repo] DEBUG ## PRs found:
2025-02-21 00:49:01,679 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:01,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-02-21 00:49:02,220 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:02,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-02-21 00:49:02,740 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:02,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-02-21 00:49:03,210 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:03,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-02-21 00:49:03,764 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:03,996 [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-02-21 00:49:04,249 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:04,477 [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-02-21 00:49:04,731 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:04,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-02-21 00:49:05,191 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:05,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-02-21 00:49:05,373 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-02-21 00:49:05,625 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:05,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-02-21 00:49:06,108 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:06,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-02-21 00:49:06,574 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:06,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-02-21 00:49:07,026 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:07,241 [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-02-21 00:49:07,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:07,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-02-21 00:49:07,932 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:08,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-02-21 00:49:08,136 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-02-21 00:49:08,387 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:08,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-02-21 00:49:08,910 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:09,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-02-21 00:49:09,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:09,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-02-21 00:49:09,912 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:10,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-02-21 00:49:10,226 [ scc.repo] DEBUG ## Branches found:
2025-02-21 00:49:10,226 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-02-21 00:49:10,226 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:49:10,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:49:10,232 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-02-21 00:49:10,237 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-02-21 00:49:10,237 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-02-21 00:49:10,243 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-02-21 00:49:10,249 [ scc.git] DEBUG Already up to date.
2025-02-21 00:49:10,249 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-02-21 00:49:10,968 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-02-21 00:49:10,968 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-02-21 00:49:10,973 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-02-21 00:49:11,488 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-02-21 00:49:11,489 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-02-21 00:49:11,493 [ scc.git] DEBUG ## Unique users: []
2025-02-21 00:49:11,493 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:49:11,494 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:49:11,499 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-02-21 00:49:11,508 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:49:11,513 [ 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-02-21 00:49:11,551 [ 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-02-21 00:49:11,551 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-02-21 00:49:11,552 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-02-21 00:49:11,560 [ scc.git] DEBUG Calling 'git reset --hard 4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-02-21 00:49:11,567 [ scc.git] DEBUG HEAD is now at 4b4c755 Bump version: 5.9.0 → 5.9.1.dev0
2025-02-21 00:49:11,570 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:11,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:11,735 [ scc.git] DEBUG Calling 'git merge-base 4b4c755af4ccf8a5e709548d1f8415fab48a4867 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-02-21 00:49:11,744 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..4b4c755af4ccf8a5e709548d1f8415fab48a4867'
2025-02-21 00:49:11,751 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#339](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-02-21 00:49:11,756 [ scc.config] DEBUG Found github.token
2025-02-21 00:49:11,756 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-02-21 00:49:11,756 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-02-21 00:49:11,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:49:11,768 [ 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-02-21 00:49:11,779 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-02-21 00:49:11,781 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-02-21 00:49:11,781 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-02-21 00:49:11,987 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:12,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:12,156 [ scc.git] DEBUG Calling 'git submodule update'
2025-02-21 00:49:12,199 [ scc.git] DEBUG Get sha1 of %s
2025-02-21 00:49:12,199 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-02-21 00:49:12,205 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-21 00:49:12,249 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-21 00:49:12,256 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f699c6d5310> has no local changes
2025-02-21 00:49:12,257 [ 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#339 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/)'
2025-02-21 00:49:12,267 [ scc.git] DEBUG [detached HEAD 44096f4] merge master -Dorg -Ssuccess-only
2025-02-21 00:49:12,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:49:12,268 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-02-21 00:49:12,347 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-02-21 00:49:12,408 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:12,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:12,583 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-02-21 00:49:12,589 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-02-21 00:49:12,823 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:12,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:12,999 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-02-21 00:49:13,003 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-02-21 00:49:13,240 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:13,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:13,406 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-02-21 00:49:13,411 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-02-21 00:49:13,646 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:13,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:13,830 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-02-21 00:49:14,065 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:14,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:14,251 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-02-21 00:49:14,256 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-02-21 00:49:14,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:14,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:14,675 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-02-21 00:49:14,680 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-02-21 00:49:14,915 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:15,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:15,087 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-02-21 00:49:15,092 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-02-21 00:49:15,329 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:15,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:15,504 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-02-21 00:49:15,509 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-02-21 00:49:15,746 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:15,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:15,911 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-02-21 00:49:15,917 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-02-21 00:49:16,152 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:16,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:16,321 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-02-21 00:49:16,326 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-02-21 00:49:16,562 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:16,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:16,741 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-02-21 00:49:16,746 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-02-21 00:49:16,982 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:17,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:17,165 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-02-21 00:49:17,170 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-02-21 00:49:17,406 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:17,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:17,591 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-02-21 00:49:17,829 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:17,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:18,006 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-02-21 00:49:18,244 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:18,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:18,420 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-02-21 00:49:18,425 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-02-21 00:49:18,661 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:18,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:18,848 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-02-21 00:49:19,083 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:19,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:19,271 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-02-21 00:49:19,503 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:19,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:19,685 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-02-21 00:49:19,691 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-02-21 00:49:19,924 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:20,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:20,197 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-02-21 00:49:20,203 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-02-21 00:49:20,435 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:20,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:20,627 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-02-21 00:49:20,634 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-02-21 00:49:20,863 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:21,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:21,035 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-02-21 00:49:21,040 [ scc.config] DEBUG Found submodule.scripts.url
2025-02-21 00:49:21,276 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-02-21 00:49:21,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-02-21 00:49:21,452 [ scc.config] DEBUG Found submodule.scripts.branch
2025-02-21 00:49:21,452 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-02-21 00:49:21,531 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f699f8b9cd0> has local changes
2025-02-21 00:49:21,532 [ 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'
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 616 Rdornier 'Fix labels around border' (status: failure)
- 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'
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 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#339 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/339/)'
2025-02-21 00:49:21,547 [ scc.git] DEBUG [detached HEAD fc1542a] merge master -Dorg -Ssuccess-only
2025-02-21 00:49:21,547 [ scc.merge] INFO Repository: ome/omero-plugins
2025-02-21 00:49:21,547 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-02-21 00:49:21,547 [ scc.merge] INFO Already up to date.
2025-02-21 00:49:21,548 [ scc.merge] INFO
2025-02-21 00:49:21,548 [ scc.merge] INFO Merged PRs:
2025-02-21 00:49:21,548 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-02-21 00:49:21,548 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-02-21 00:49:21,548 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-02-21 00:49:21,548 [ scc.merge] INFO
2025-02-21 00:49:21,548 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-02-21 00:49:21,548 [ scc.merge] INFO Already up to date.
2025-02-21 00:49:21,548 [ scc.merge] INFO
2025-02-21 00:49:21,548 [ scc.merge] INFO
2025-02-21 00:49:21,548 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-02-21 00:49:21,548 [ scc.merge] INFO Excluded PRs:
2025-02-21 00:49:21,548 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-02-21 00:49:21,548 [ scc.merge] INFO Already up to date.
2025-02-21 00:49:21,548 [ scc.merge] INFO
2025-02-21 00:49:21,548 [ scc.merge] INFO
2025-02-21 00:49:21,548 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-02-21 00:49:21,548 [ scc.merge] INFO Excluded PRs:
2025-02-21 00:49:21,548 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-02-21 00:49:21,548 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-02-21 00:49:21,548 [ scc.merge] INFO Already up to date.
2025-02-21 00:49:21,548 [ scc.merge] INFO
2025-02-21 00:49:21,548 [ scc.merge] INFO Merged PRs:
2025-02-21 00:49:21,548 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-02-21 00:49:21,548 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-02-21 00:49:21,548 [ scc.merge] INFO
2025-02-21 00:49:21,548 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-02-21 00:49:21,548 [ scc.merge] INFO Excluded PRs:
2025-02-21 00:49:21,548 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-02-21 00:49:21,548 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-02-21 00:49:21,548 [ scc.merge] INFO Already up to date.
2025-02-21 00:49:21,548 [ scc.merge] INFO
2025-02-21 00:49:21,548 [ scc.merge] INFO Merged PRs:
2025-02-21 00:49:21,548 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-02-21 00:49:21,548 [ scc.merge] INFO
2025-02-21 00:49:21,549 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-21 00:49:21,549 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-02-21 00:49:21,549 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-02-21 00:49:21,549 [ scc.merge] INFO
2025-02-21 00:49:21,549 [ scc.merge] INFO Repository: ome/omero-figure
2025-02-21 00:49:21,549 [ scc.merge] INFO Excluded PRs:
2025-02-21 00:49:21,549 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-02-21 00:49:21,549 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border' (status: failure)
2025-02-21 00:49:21,549 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (stage: draft)
2025-02-21 00:49:21,549 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-02-21 00:49:21,549 [ scc.merge] INFO Already up to date.
2025-02-21 00:49:21,549 [ scc.merge] INFO
2025-02-21 00:49:21,549 [ scc.merge] INFO Merged PRs:
2025-02-21 00:49:21,549 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-02-21 00:49:21,549 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-02-21 00:49:21,549 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-02-21 00:49:21,549 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-02-21 00:49:21,549 [ scc.merge] INFO
2025-02-21 00:49:21,549 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-02-21 00:49:21,549 [ scc.merge] INFO Already up to date.
2025-02-21 00:49:21,549 [ scc.merge] INFO
2025-02-21 00:49:21,549 [ scc.merge] INFO Merged PRs:
2025-02-21 00:49:21,549 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-02-21 00:49:21,549 [ scc.merge] INFO
2025-02-21 00:49:21,549 [ scc.merge] INFO Repository: ome/omero-gallery
2025-02-21 00:49:21,549 [ scc.merge] INFO Already up to date.
2025-02-21 00:49:21,549 [ scc.merge] INFO
2025-02-21 00:49:21,549 [ scc.merge] INFO Merged PRs:
2025-02-21 00:49:21,549 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-02-21 00:49:21,549 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-02-21 00:49:21,549 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-02-21 00:49:21,549 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-02-21 00:49:21,549 [ scc.merge] INFO
2025-02-21 00:49:21,549 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-21 00:49:21,549 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-02-21 00:49:21,549 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-02-21 00:49:21,549 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-02-21 00:49:21,549 [ scc.merge] INFO
2025-02-21 00:49:21,550 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-02-21 00:49:21,550 [ scc.merge] INFO Excluded PRs:
2025-02-21 00:49:21,550 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-02-21 00:49:21,550 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-02-21 00:49:21,550 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-02-21 00:49:21,550 [ scc.merge] INFO Already up to date.
2025-02-21 00:49:21,550 [ scc.merge] INFO
2025-02-21 00:49:21,550 [ scc.merge] INFO Merged PRs:
2025-02-21 00:49:21,550 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-02-21 00:49:21,550 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-02-21 00:49:21,550 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-02-21 00:49:21,550 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-02-21 00:49:21,550 [ scc.merge] INFO
2025-02-21 00:49:21,550 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-21 00:49:21,550 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-02-21 00:49:21,550 [ scc.merge] INFO
2025-02-21 00:49:21,550 [ scc.merge] INFO Repository: ome/omero-mapr
2025-02-21 00:49:21,550 [ scc.merge] INFO Excluded PRs:
2025-02-21 00:49:21,550 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-02-21 00:49:21,550 [ scc.merge] INFO Already up to date.
2025-02-21 00:49:21,550 [ scc.merge] INFO
2025-02-21 00:49:21,550 [ scc.merge] INFO Merged PRs:
2025-02-21 00:49:21,550 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-02-21 00:49:21,550 [ scc.merge] INFO
2025-02-21 00:49:21,550 [ scc.merge] INFO Repository: ome/omero-metadata
2025-02-21 00:49:21,550 [ scc.merge] INFO Already up to date.
2025-02-21 00:49:21,550 [ scc.merge] INFO
2025-02-21 00:49:21,550 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-21 00:49:21,550 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-02-21 00:49:21,550 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-02-21 00:49:21,550 [ scc.merge] INFO
2025-02-21 00:49:21,550 [ scc.merge] INFO Repository: ome/omero-parade
2025-02-21 00:49:21,550 [ scc.merge] INFO Excluded PRs:
2025-02-21 00:49:21,550 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-02-21 00:49:21,550 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-02-21 00:49:21,550 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-02-21 00:49:21,550 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-02-21 00:49:21,550 [ scc.merge] INFO Already up to date.
2025-02-21 00:49:21,551 [ scc.merge] INFO
2025-02-21 00:49:21,551 [ scc.merge] INFO Merged PRs:
2025-02-21 00:49:21,551 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-02-21 00:49:21,551 [ scc.merge] INFO
2025-02-21 00:49:21,551 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-02-21 00:49:21,551 [ scc.merge] INFO Already up to date.
2025-02-21 00:49:21,551 [ scc.merge] INFO
2025-02-21 00:49:21,551 [ scc.merge] INFO
2025-02-21 00:49:21,551 [ scc.merge] INFO Repository: ome/omero-rois
2025-02-21 00:49:21,551 [ scc.merge] INFO Excluded PRs:
2025-02-21 00:49:21,551 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-02-21 00:49:21,551 [ scc.merge] INFO Already up to date.
2025-02-21 00:49:21,551 [ scc.merge] INFO
2025-02-21 00:49:21,551 [ scc.merge] INFO
2025-02-21 00:49:21,551 [ scc.merge] INFO Repository: ome/omero-signup
2025-02-21 00:49:21,551 [ scc.merge] INFO Already up to date.
2025-02-21 00:49:21,551 [ scc.merge] INFO
2025-02-21 00:49:21,551 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-21 00:49:21,551 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-02-21 00:49:21,551 [ scc.merge] INFO
2025-02-21 00:49:21,551 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-02-21 00:49:21,551 [ scc.merge] INFO Excluded PRs:
2025-02-21 00:49:21,551 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-02-21 00:49:21,551 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-02-21 00:49:21,551 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-02-21 00:49:21,551 [ scc.merge] INFO Already up to date.
2025-02-21 00:49:21,551 [ scc.merge] INFO
2025-02-21 00:49:21,551 [ scc.merge] INFO Merged PRs:
2025-02-21 00:49:21,551 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-02-21 00:49:21,551 [ scc.merge] INFO
2025-02-21 00:49:21,551 [ scc.merge] INFO Repository: ome/omero-upload
2025-02-21 00:49:21,551 [ scc.merge] INFO Already up to date.
2025-02-21 00:49:21,551 [ scc.merge] INFO
2025-02-21 00:49:21,551 [ scc.merge] INFO
2025-02-21 00:49:21,551 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-02-21 00:49:21,551 [ scc.merge] INFO Already up to date.
2025-02-21 00:49:21,551 [ scc.merge] INFO
2025-02-21 00:49:21,551 [ scc.merge] INFO Merged PRs:
2025-02-21 00:49:21,552 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-02-21 00:49:21,552 [ scc.merge] INFO
2025-02-21 00:49:21,552 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-02-21 00:49:21,552 [ scc.merge] INFO Excluded PRs:
2025-02-21 00:49:21,552 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-02-21 00:49:21,552 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-02-21 00:49:21,552 [ scc.merge] INFO Already up to date.
2025-02-21 00:49:21,552 [ scc.merge] INFO
2025-02-21 00:49:21,552 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-21 00:49:21,552 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-02-21 00:49:21,552 [ scc.merge] INFO
2025-02-21 00:49:21,552 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-02-21 00:49:21,552 [ scc.merge] INFO Already up to date.
2025-02-21 00:49:21,552 [ scc.merge] INFO
2025-02-21 00:49:21,552 [ scc.merge] INFO
2025-02-21 00:49:21,552 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-02-21 00:49:21,552 [ scc.merge] INFO Already up to date.
2025-02-21 00:49:21,552 [ scc.merge] INFO
2025-02-21 00:49:21,552 [ scc.merge] INFO
2025-02-21 00:49:21,552 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-02-21 00:49:21,552 [ scc.merge] INFO Already up to date.
2025-02-21 00:49:21,552 [ scc.merge] INFO
2025-02-21 00:49:21,552 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-21 00:49:21,552 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-02-21 00:49:21,552 [ scc.merge] INFO
2025-02-21 00:49:21,552 [ scc.merge] INFO Repository: ome/scripts
2025-02-21 00:49:21,552 [ scc.merge] INFO Excluded PRs:
2025-02-21 00:49:21,552 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-02-21 00:49:21,552 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-02-21 00:49:21,552 [ scc.merge] INFO Already up to date.
2025-02-21 00:49:21,552 [ scc.merge] INFO
2025-02-21 00:49:21,552 [ scc.merge] INFO Merged PRs:
2025-02-21 00:49:21,552 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-02-21 00:49:21,552 [ scc.merge] INFO
2025-02-21 00:49:21,552 [ scc.merge] INFO Conflicting PRs (not included):
2025-02-21 00:49:21,552 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-02-21 00:49:21,552 [ scc.merge] INFO
2025-02-21 00:49:21,553 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-02-21 00:49:21,553 [ scc.git] DEBUG Calling 'git remote'
2025-02-21 00:49:21,559 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-02-21 00:49:21,560 [ scc.git] DEBUG Calling 'git remote'
2025-02-21 00:49:21,565 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:49:21,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-02-21 00:49:21,566 [ scc.git] DEBUG Calling 'git remote'
2025-02-21 00:49:21,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:49:21,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-02-21 00:49:21,572 [ scc.git] DEBUG Calling 'git remote'
2025-02-21 00:49:21,577 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:49:21,578 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-02-21 00:49:21,578 [ scc.git] DEBUG Calling 'git remote'
2025-02-21 00:49:21,583 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:49:21,583 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-02-21 00:49:21,583 [ scc.git] DEBUG Calling 'git remote'
2025-02-21 00:49:21,589 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:49:21,589 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-02-21 00:49:21,589 [ scc.git] DEBUG Calling 'git remote'
2025-02-21 00:49:21,595 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:49:21,595 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-02-21 00:49:21,595 [ scc.git] DEBUG Calling 'git remote'
2025-02-21 00:49:21,601 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:49:21,601 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-02-21 00:49:21,601 [ scc.git] DEBUG Calling 'git remote'
2025-02-21 00:49:21,606 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:49:21,606 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-02-21 00:49:21,606 [ scc.git] DEBUG Calling 'git remote'
2025-02-21 00:49:21,611 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:49:21,611 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-02-21 00:49:21,611 [ scc.git] DEBUG Calling 'git remote'
2025-02-21 00:49:21,616 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:49:21,616 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-02-21 00:49:21,616 [ scc.git] DEBUG Calling 'git remote'
2025-02-21 00:49:21,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:49:21,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-02-21 00:49:21,621 [ scc.git] DEBUG Calling 'git remote'
2025-02-21 00:49:21,626 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:49:21,626 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-02-21 00:49:21,626 [ scc.git] DEBUG Calling 'git remote'
2025-02-21 00:49:21,631 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:49:21,631 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-02-21 00:49:21,631 [ scc.git] DEBUG Calling 'git remote'
2025-02-21 00:49:21,636 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:49:21,636 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-02-21 00:49:21,636 [ scc.git] DEBUG Calling 'git remote'
2025-02-21 00:49:21,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:49:21,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-02-21 00:49:21,642 [ scc.git] DEBUG Calling 'git remote'
2025-02-21 00:49:21,649 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:49:21,650 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-02-21 00:49:21,650 [ scc.git] DEBUG Calling 'git remote'
2025-02-21 00:49:21,657 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:49:21,657 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-02-21 00:49:21,657 [ scc.git] DEBUG Calling 'git remote'
2025-02-21 00:49:21,665 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:49:21,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-02-21 00:49:21,666 [ scc.git] DEBUG Calling 'git remote'
2025-02-21 00:49:21,672 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:49:21,672 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-02-21 00:49:21,672 [ scc.git] DEBUG Calling 'git remote'
2025-02-21 00:49:21,678 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:49:21,678 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-02-21 00:49:21,678 [ scc.git] DEBUG Calling 'git remote'
2025-02-21 00:49:21,683 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-02-21 00:49:21,683 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-02-21 00:49:21,684 [ scc.git] DEBUG Calling 'git remote'
2025-02-21 00:49:21,688 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.10.0 to 5.10.1-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD 6922c8b] 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 286e73d] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-02-21 00:50:11,530 [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-02-21 00:50:20,886 [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-02-21 00:50:23,401 [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-02-21 00:50:28,215 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-02-21 00:51:08,003 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/eb00aee0/images/svgs/logo.svg){kind=logo}
