Skipping 209 KB..
Full Log2025-03-30 09:52:26,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 09:52:26,941 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:27,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-30 09:52:27,477 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:27,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2025-03-30 09:52:27,669 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-03-30 09:52:27,921 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:28,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/227 HTTP/1.1" 200 None
2025-03-30 09:52:28,415 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:28,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/227/comments HTTP/1.1" 200 None
2025-03-30 09:52:28,929 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:29,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/a081a9f2892763bd49a7ad7ba425965150e76f97 HTTP/1.1" 200 None
2025-03-30 09:52:29,445 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:29,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/a081a9f2892763bd49a7ad7ba425965150e76f97/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 09:52:29,912 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:30,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/a081a9f2892763bd49a7ad7ba425965150e76f97/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-30 09:52:30,185 [ scc.repo] DEBUG ## Branches found:
2025-03-30 09:52:30,185 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-30 09:52:30,186 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:52:30,186 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:30,188 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 09:52:30,191 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 09:52:30,191 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 09:52:30,194 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 09:52:30,197 [ scc.git] DEBUG Already up to date.
2025-03-30 09:52:30,197 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-03-30 09:52:30,497 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-30 09:52:30,497 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-03-30 09:52:30,501 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-03-30 09:52:30,786 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-30 09:52:30,786 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-03-30 09:52:30,790 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-03-30 09:52:31,074 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-30 09:52:31,074 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-03-30 09:52:31,078 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-03-30 09:52:31,361 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-30 09:52:31,361 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-03-30 09:52:31,365 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-03-30 09:52:31,623 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-30 09:52:31,623 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-03-30 09:52:31,628 [ scc.git] DEBUG ## Unique users: []
2025-03-30 09:52:31,628 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:52:31,628 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:31,630 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-30 09:52:31,636 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:31,638 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-30 09:52:31,651 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-03-30 09:52:31,651 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-03-30 09:52:31,652 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-30 09:52:31,656 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-03-30 09:52:31,656 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-03-30 09:52:31,656 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-03-30 09:52:31,658 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:31,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:52:31,820 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-30 09:52:31,827 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:31,829 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-30 09:52:31,849 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-03-30 09:52:31,849 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-03-30 09:52:31,849 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-03-30 09:52:31,849 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-03-30 09:52:31,850 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-30 09:52:31,854 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-03-30 09:52:31,855 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-03-30 09:52:31,855 [ scc.git] DEBUG src/app/header.html | 5 +
2025-03-30 09:52:31,855 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-03-30 09:52:31,855 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-03-30 09:52:31,855 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-03-30 09:52:31,855 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-03-30 09:52:31,855 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-03-30 09:52:32,071 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:32,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:52:32,236 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-30 09:52:32,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:32,245 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-30 09:52:32,259 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-03-30 09:52:32,260 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-30 09:52:32,264 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-03-30 09:52:32,264 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-03-30 09:52:32,264 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-03-30 09:52:32,487 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:32,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:52:32,644 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-30 09:52:32,651 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:32,653 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-30 09:52:32,669 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-30 09:52:32,679 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-03-30 09:52:32,679 [ scc.git] DEBUG package.json | 2 +-
2025-03-30 09:52:32,679 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-03-30 09:52:32,896 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:33,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:52:33,072 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-30 09:52:33,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:33,081 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-30 09:52:33,117 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-30 09:52:33,117 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-03-30 09:52:33,118 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-30 09:52:33,118 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-30 09:52:33,121 [ scc.git] DEBUG Calling 'git reset --hard 18cc032d4c5bace7b4d0dac904a52d5a039109ce'
2025-03-30 09:52:33,128 [ scc.git] DEBUG HEAD is now at 18cc032 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-03-30 09:52:33,323 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:33,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:52:33,492 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-30 09:52:33,495 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-03-30 09:52:33,498 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#371](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-03-30 09:52:33,500 [ scc.config] DEBUG Found github.token
2025-03-30 09:52:33,501 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-03-30 09:52:33,501 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 09:52:33,541 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:52:33,541 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:33,543 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 09:52:33,581 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 09:52:33,588 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f915c141950> has no local changes
2025-03-30 09:52:33,588 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
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#371 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/)'
2025-03-30 09:52:33,598 [ scc.git] DEBUG [detached HEAD 5244b36] merge master -Dorg -Ssuccess-only
2025-03-30 09:52:33,598 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:52:33,598 [ scc.repo] DEBUG ## PRs found:
2025-03-30 09:52:33,743 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:34,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-03-30 09:52:34,289 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:34,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-03-30 09:52:34,792 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:35,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-03-30 09:52:35,332 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:35,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-30 09:52:35,894 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:36,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 09:52:36,395 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:36,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-30 09:52:36,919 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:37,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-03-30 09:52:37,096 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-03-30 09:52:37,096 [ scc.repo] DEBUG ## Branches found:
2025-03-30 09:52:37,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-30 09:52:37,096 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:52:37,096 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:37,099 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 09:52:37,101 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 09:52:37,101 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 09:52:37,104 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 09:52:37,107 [ scc.git] DEBUG Already up to date.
2025-03-30 09:52:37,107 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-03-30 09:52:37,427 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-03-30 09:52:37,427 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-03-30 09:52:37,432 [ scc.git] DEBUG ## Unique users: []
2025-03-30 09:52:37,432 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:52:37,432 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:37,435 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-30 09:52:37,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:37,441 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-30 09:52:37,450 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-30 09:52:37,453 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-03-30 09:52:37,453 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-03-30 09:52:37,453 [ scc.git] DEBUG requirements.txt | 2 +-
2025-03-30 09:52:37,453 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-03-30 09:52:37,453 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-03-30 09:52:37,453 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-03-30 09:52:37,455 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:37,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:52:37,627 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 09:52:37,667 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:52:37,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:37,670 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 09:52:37,708 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 09:52:37,712 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f915c0445d0> has no local changes
2025-03-30 09:52:37,712 [ 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#371 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/)'
2025-03-30 09:52:37,719 [ scc.git] DEBUG [detached HEAD be1ecbc] merge master -Dorg -Ssuccess-only
2025-03-30 09:52:37,719 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:52:37,719 [ scc.repo] DEBUG ## PRs found:
2025-03-30 09:52:37,878 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:38,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-03-30 09:52:38,410 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:38,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-03-30 09:52:38,912 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:39,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-03-30 09:52:39,478 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:39,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-30 09:52:39,996 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:40,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 09:52:40,485 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:40,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-30 09:52:41,040 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:41,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-03-30 09:52:41,218 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-30 09:52:41,470 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:41,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-03-30 09:52:41,966 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:42,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-03-30 09:52:42,462 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:42,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-30 09:52:42,987 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:43,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 09:52:43,497 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:43,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-30 09:52:43,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:44,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-03-30 09:52:44,184 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-30 09:52:44,184 [ scc.repo] DEBUG ## Branches found:
2025-03-30 09:52:44,185 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-30 09:52:44,185 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:52:44,185 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:44,188 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 09:52:44,190 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 09:52:44,190 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 09:52:44,193 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 09:52:44,197 [ scc.git] DEBUG Already up to date.
2025-03-30 09:52:44,197 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-03-30 09:52:44,474 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-30 09:52:44,474 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-03-30 09:52:44,478 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-03-30 09:52:44,737 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-30 09:52:44,737 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-03-30 09:52:44,741 [ scc.git] DEBUG ## Unique users: []
2025-03-30 09:52:44,741 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:52:44,741 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:44,744 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-30 09:52:44,748 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:44,750 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-30 09:52:44,764 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-03-30 09:52:44,764 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-03-30 09:52:44,764 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-30 09:52:44,764 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-30 09:52:44,764 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-30 09:52:44,764 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-30 09:52:44,767 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-30 09:52:44,772 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-30 09:52:44,773 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:44,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:52:44,939 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-30 09:52:44,944 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-30 09:52:44,947 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#371](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-03-30 09:52:44,949 [ scc.config] DEBUG Found github.token
2025-03-30 09:52:44,949 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-03-30 09:52:44,949 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-30 09:52:44,954 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:44,956 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-30 09:52:44,971 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-30 09:52:44,971 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-30 09:52:44,971 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-03-30 09:52:44,971 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-30 09:52:44,972 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-30 09:52:44,975 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-30 09:52:44,980 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-30 09:52:45,190 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:45,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:52:45,354 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-30 09:52:45,358 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-30 09:52:45,361 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#371](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2025-03-30 09:52:45,363 [ scc.config] DEBUG Found github.token
2025-03-30 09:52:45,363 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-03-30 09:52:45,363 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 09:52:45,403 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:52:45,403 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:45,405 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 09:52:45,442 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 09:52:45,446 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f915c11d7d0> has no local changes
2025-03-30 09:52:45,446 [ 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#371 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/)'
2025-03-30 09:52:45,452 [ scc.git] DEBUG [detached HEAD c3ab7d8] merge master -Dorg -Ssuccess-only
2025-03-30 09:52:45,452 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:52:45,453 [ scc.repo] DEBUG ## PRs found:
2025-03-30 09:52:45,605 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:45,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-03-30 09:52:46,160 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:46,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-03-30 09:52:46,446 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-30 09:52:46,697 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:47,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-30 09:52:47,275 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:47,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 09:52:47,777 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:48,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-30 09:52:48,279 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:48,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-30 09:52:48,842 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:49,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-03-30 09:52:49,011 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-30 09:52:49,262 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:49,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-03-30 09:52:49,536 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-30 09:52:49,786 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:50,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-30 09:52:50,371 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:50,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 09:52:50,888 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:51,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-30 09:52:51,365 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:51,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-30 09:52:51,817 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:52,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-03-30 09:52:52,013 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-30 09:52:52,264 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:52,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-03-30 09:52:52,725 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:52,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-03-30 09:52:53,189 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:53,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-03-30 09:52:53,659 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:53,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-03-30 09:52:54,136 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:54,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-03-30 09:52:54,644 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:54,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-03-30 09:52:55,127 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:55,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-03-30 09:52:55,417 [ scc.repo] DEBUG ## Branches found:
2025-03-30 09:52:55,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-30 09:52:55,417 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:52:55,417 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:55,420 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 09:52:55,423 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 09:52:55,423 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 09:52:55,426 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 09:52:55,429 [ scc.git] DEBUG Already up to date.
2025-03-30 09:52:55,429 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-03-30 09:52:55,708 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-30 09:52:55,708 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-03-30 09:52:55,713 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-03-30 09:52:55,988 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-30 09:52:55,988 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-03-30 09:52:55,992 [ scc.git] DEBUG ## Unique users: []
2025-03-30 09:52:55,993 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:52:55,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:55,995 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-30 09:52:55,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:56,000 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 140 (Bump vite from 4.2.3 to 4.5.9) 6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-30 09:52:56,009 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-30 09:52:56,013 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-03-30 09:52:56,013 [ scc.git] DEBUG package.json | 2 +-
2025-03-30 09:52:56,013 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-03-30 09:52:56,014 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:56,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:52:56,173 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-03-30 09:52:56,177 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:56,179 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 141 (Bump axios from 1.6.0 to 1.8.2) de7db17cd62b498179713df276cff151a1f36d80'
2025-03-30 09:52:56,189 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-30 09:52:56,189 [ scc.git] DEBUG Auto-merging package.json
2025-03-30 09:52:56,190 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-30 09:52:56,193 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-03-30 09:52:56,193 [ scc.git] DEBUG package.json | 2 +-
2025-03-30 09:52:56,193 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-03-30 09:52:56,424 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:56,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:52:56,578 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 09:52:56,617 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:52:56,617 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:56,619 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 09:52:56,657 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 09:52:56,661 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f915e8ee6d0> has no local changes
2025-03-30 09:52:56,662 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
Generated by OMERO-plugins-push#371 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/)'
2025-03-30 09:52:56,669 [ scc.git] DEBUG [detached HEAD a6b3a07] merge master -Dorg -Ssuccess-only
2025-03-30 09:52:56,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:52:56,669 [ scc.repo] DEBUG ## PRs found:
2025-03-30 09:52:56,829 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:57,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-03-30 09:52:57,041 [ scc.repo] DEBUG ## Branches found:
2025-03-30 09:52:57,041 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-30 09:52:57,041 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:52:57,041 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:57,043 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 09:52:57,046 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 09:52:57,046 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 09:52:57,049 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 09:52:57,052 [ scc.git] DEBUG Already up to date.
2025-03-30 09:52:57,052 [ scc.git] DEBUG ## Unique users: []
2025-03-30 09:52:57,052 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:52:57,052 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:57,054 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 09:52:57,092 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:52:57,092 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:57,095 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 09:52:57,132 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 09:52:57,135 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9158f42ed0> has no local changes
2025-03-30 09:52:57,135 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-prometheus-tools
Already up to date.
Generated by OMERO-plugins-push#371 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/)'
2025-03-30 09:52:57,141 [ scc.git] DEBUG [detached HEAD 4072761] merge master -Dorg -Ssuccess-only
2025-03-30 09:52:57,142 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:52:57,142 [ scc.repo] DEBUG ## PRs found:
2025-03-30 09:52:57,292 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:57,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-03-30 09:52:57,822 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:58,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-03-30 09:52:58,319 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:58,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-03-30 09:52:58,820 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:59,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-03-30 09:52:59,081 [ scc.repo] DEBUG ## Branches found:
2025-03-30 09:52:59,081 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-30 09:52:59,081 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:52:59,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:59,084 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 09:52:59,086 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 09:52:59,086 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 09:52:59,089 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 09:52:59,092 [ scc.git] DEBUG Already up to date.
2025-03-30 09:52:59,092 [ scc.git] DEBUG ## Unique users: []
2025-03-30 09:52:59,092 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:52:59,093 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:59,095 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 09:52:59,135 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:52:59,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:52:59,137 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 09:52:59,175 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 09:52:59,179 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f915c11d750> has no local changes
2025-03-30 09:52:59,179 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Generated by OMERO-plugins-push#371 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/)'
2025-03-30 09:52:59,185 [ scc.git] DEBUG [detached HEAD c64eec0] merge master -Dorg -Ssuccess-only
2025-03-30 09:52:59,185 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:52:59,185 [ scc.repo] DEBUG ## PRs found:
2025-03-30 09:52:59,331 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:52:59,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-03-30 09:52:59,878 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:00,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-03-30 09:53:00,362 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:00,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-03-30 09:53:00,852 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:01,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-30 09:53:01,386 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:01,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 09:53:01,861 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:02,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-30 09:53:02,443 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:02,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-03-30 09:53:02,615 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-30 09:53:02,615 [ scc.repo] DEBUG ## Branches found:
2025-03-30 09:53:02,615 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-30 09:53:02,615 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:02,615 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:02,618 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 09:53:02,621 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 09:53:02,621 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 09:53:02,624 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 09:53:02,627 [ scc.git] DEBUG Already up to date.
2025-03-30 09:53:02,627 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-03-30 09:53:02,941 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-03-30 09:53:02,941 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-03-30 09:53:02,945 [ scc.git] DEBUG ## Unique users: []
2025-03-30 09:53:02,945 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:02,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:02,947 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-30 09:53:02,950 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:02,953 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-30 09:53:02,962 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-03-30 09:53:02,962 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-03-30 09:53:02,962 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-03-30 09:53:02,962 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-03-30 09:53:02,962 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-03-30 09:53:02,962 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-03-30 09:53:02,962 [ scc.git] DEBUG Auto-merging setup.py
2025-03-30 09:53:02,962 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-03-30 09:53:02,962 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-30 09:53:02,962 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-30 09:53:02,965 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-30 09:53:02,970 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-03-30 09:53:02,971 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:03,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:03,143 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-30 09:53:03,147 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-30 09:53:03,150 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#371](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/views.py
- omero_signup/signup_settings.py
- setup.py
--conflicts
2025-03-30 09:53:03,152 [ scc.config] DEBUG Found github.token
2025-03-30 09:53:03,152 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-03-30 09:53:03,152 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 09:53:03,192 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:03,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:03,194 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 09:53:03,232 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 09:53:03,236 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9158f26690> has no local changes
2025-03-30 09:53:03,236 [ 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#371 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/)'
2025-03-30 09:53:03,242 [ scc.git] DEBUG [detached HEAD 9c85db0] merge master -Dorg -Ssuccess-only
2025-03-30 09:53:03,243 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:03,243 [ scc.repo] DEBUG ## PRs found:
2025-03-30 09:53:03,394 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:03,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-03-30 09:53:03,934 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:04,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-03-30 09:53:04,417 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:04,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-03-30 09:53:04,915 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:05,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-03-30 09:53:05,437 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:05,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 09:53:05,941 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:06,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-30 09:53:06,431 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:06,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-03-30 09:53:06,975 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:07,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-03-30 09:53:07,458 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:07,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-03-30 09:53:07,933 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:08,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-03-30 09:53:08,384 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:08,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-30 09:53:08,892 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:09,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 09:53:09,370 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:09,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-30 09:53:09,875 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:10,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-03-30 09:53:10,064 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-30 09:53:10,065 [ scc.repo] DEBUG ## Branches found:
2025-03-30 09:53:10,065 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-30 09:53:10,065 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:10,065 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:10,068 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 09:53:10,070 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 09:53:10,070 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 09:53:10,073 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 09:53:10,076 [ scc.git] DEBUG Already up to date.
2025-03-30 09:53:10,076 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-03-30 09:53:10,370 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-03-30 09:53:10,370 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-03-30 09:53:10,374 [ scc.git] DEBUG ## Unique users: []
2025-03-30 09:53:10,375 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:10,375 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:10,377 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-03-30 09:53:10,381 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:10,384 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2025-03-30 09:53:10,396 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-30 09:53:10,400 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-03-30 09:53:10,400 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-03-30 09:53:10,400 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-03-30 09:53:10,400 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-03-30 09:53:10,400 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-03-30 09:53:10,400 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-03-30 09:53:10,400 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-03-30 09:53:10,400 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-03-30 09:53:10,400 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-03-30 09:53:10,401 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-03-30 09:53:10,402 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:10,402 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-03-30 09:53:10,402 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-03-30 09:53:10,402 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-03-30 09:53:10,402 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-03-30 09:53:10,402 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-03-30 09:53:10,402 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-03-30 09:53:10,402 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-03-30 09:53:10,402 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-03-30 09:53:10,402 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-03-30 09:53:10,402 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-03-30 09:53:10,402 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-03-30 09:53:10,402 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-03-30 09:53:10,402 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-03-30 09:53:10,402 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-03-30 09:53:10,402 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-03-30 09:53:10,402 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-03-30 09:53:10,402 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-03-30 09:53:10,402 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-03-30 09:53:10,402 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-03-30 09:53:10,402 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-03-30 09:53:10,402 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-03-30 09:53:10,402 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-03-30 09:53:10,402 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-03-30 09:53:10,402 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-03-30 09:53:10,402 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-03-30 09:53:10,402 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-03-30 09:53:10,403 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-03-30 09:53:10,403 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-03-30 09:53:10,403 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-03-30 09:53:10,403 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-03-30 09:53:10,403 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-03-30 09:53:10,403 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-03-30 09:53:10,403 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-03-30 09:53:10,403 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-03-30 09:53:10,403 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-03-30 09:53:10,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:10,598 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 09:53:10,637 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:10,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:10,640 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 09:53:10,679 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 09:53:10,684 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f915c03f1d0> has no local changes
2025-03-30 09:53:10,684 [ 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#371 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/)'
2025-03-30 09:53:10,691 [ scc.git] DEBUG [detached HEAD 4474c21] merge master -Dorg -Ssuccess-only
2025-03-30 09:53:10,692 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:10,692 [ scc.repo] DEBUG ## PRs found:
2025-03-30 09:53:10,849 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:11,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-03-30 09:53:11,038 [ scc.repo] DEBUG ## Branches found:
2025-03-30 09:53:11,038 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-30 09:53:11,038 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:11,038 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:11,040 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 09:53:11,043 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 09:53:11,043 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 09:53:11,046 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 09:53:11,049 [ scc.git] DEBUG Already up to date.
2025-03-30 09:53:11,049 [ scc.git] DEBUG ## Unique users: []
2025-03-30 09:53:11,049 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:11,049 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:11,051 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 09:53:11,090 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:11,090 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:11,092 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 09:53:11,129 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 09:53:11,132 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f915c308fd0> has no local changes
2025-03-30 09:53:11,132 [ 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#371 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/)'
2025-03-30 09:53:11,139 [ scc.git] DEBUG [detached HEAD a381c41] merge master -Dorg -Ssuccess-only
2025-03-30 09:53:11,139 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:11,139 [ scc.repo] DEBUG ## PRs found:
2025-03-30 09:53:11,289 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:11,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-03-30 09:53:11,813 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:12,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-03-30 09:53:12,296 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:12,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-03-30 09:53:12,776 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:13,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-30 09:53:13,289 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:13,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 09:53:13,800 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:14,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-30 09:53:14,306 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:14,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-30 09:53:14,743 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:14,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-03-30 09:53:14,933 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-03-30 09:53:14,933 [ scc.repo] DEBUG ## Branches found:
2025-03-30 09:53:14,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-30 09:53:14,934 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:14,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:14,936 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 09:53:14,939 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 09:53:14,939 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 09:53:14,942 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 09:53:14,944 [ scc.git] DEBUG Already up to date.
2025-03-30 09:53:14,945 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-03-30 09:53:15,233 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-03-30 09:53:15,233 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-03-30 09:53:15,238 [ scc.git] DEBUG ## Unique users: []
2025-03-30 09:53:15,238 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:15,238 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:15,240 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-03-30 09:53:15,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:15,246 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-03-30 09:53:15,253 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-30 09:53:15,256 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-03-30 09:53:15,256 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-03-30 09:53:15,256 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-03-30 09:53:15,256 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-03-30 09:53:15,256 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-03-30 09:53:15,257 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:15,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:15,426 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 09:53:15,465 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:15,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:15,468 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 09:53:15,505 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 09:53:15,509 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f915c0eb910> has no local changes
2025-03-30 09:53:15,509 [ 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#371 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/)'
2025-03-30 09:53:15,515 [ scc.git] DEBUG [detached HEAD 8b8649c] merge master -Dorg -Ssuccess-only
2025-03-30 09:53:15,516 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:15,516 [ scc.git] INFO Overriding base-branch from master to main
2025-03-30 09:53:15,516 [ scc.repo] DEBUG ## PRs found:
2025-03-30 09:53:15,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:15,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-03-30 09:53:16,198 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:16,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-03-30 09:53:16,716 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:16,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-03-30 09:53:17,229 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:17,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-03-30 09:53:17,770 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:18,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 09:53:18,324 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:18,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-30 09:53:18,791 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:19,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-03-30 09:53:19,299 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:19,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-03-30 09:53:19,775 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:19,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-03-30 09:53:20,249 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:20,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-30 09:53:20,777 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:21,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 09:53:21,261 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:21,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-30 09:53:21,749 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:21,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-03-30 09:53:21,935 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-30 09:53:21,935 [ scc.repo] DEBUG ## Branches found:
2025-03-30 09:53:21,935 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-30 09:53:21,936 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:21,936 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:21,939 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-03-30 09:53:21,941 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 09:53:21,941 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-03-30 09:53:21,944 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-03-30 09:53:21,947 [ scc.git] DEBUG Already up to date.
2025-03-30 09:53:21,948 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-03-30 09:53:22,263 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-03-30 09:53:22,263 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-03-30 09:53:22,268 [ scc.git] DEBUG ## Unique users: []
2025-03-30 09:53:22,268 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:22,268 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:22,270 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-30 09:53:22,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:22,276 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-30 09:53:22,284 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-03-30 09:53:22,284 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-03-30 09:53:22,284 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-30 09:53:22,284 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-30 09:53:22,287 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-30 09:53:22,291 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-03-30 09:53:22,292 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:22,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:22,481 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-30 09:53:22,485 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-30 09:53:22,487 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#371](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-03-30 09:53:22,489 [ scc.config] DEBUG Found github.token
2025-03-30 09:53:22,489 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-03-30 09:53:22,490 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 09:53:22,528 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:22,528 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:22,530 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 09:53:22,569 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 09:53:22,572 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f915c112cd0> has no local changes
2025-03-30 09:53:22,572 [ 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#371 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/)'
2025-03-30 09:53:22,579 [ scc.git] DEBUG [detached HEAD b99411e] merge master -Dorg -Ssuccess-only
2025-03-30 09:53:22,579 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:22,579 [ scc.repo] DEBUG ## PRs found:
2025-03-30 09:53:22,732 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:22,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-03-30 09:53:22,923 [ scc.repo] DEBUG ## Branches found:
2025-03-30 09:53:22,923 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-30 09:53:22,923 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:22,923 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:22,925 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 09:53:22,928 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 09:53:22,928 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 09:53:22,931 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 09:53:22,934 [ scc.git] DEBUG Already up to date.
2025-03-30 09:53:22,934 [ scc.git] DEBUG ## Unique users: []
2025-03-30 09:53:22,934 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:22,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:22,936 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 09:53:22,976 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:22,976 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:22,978 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 09:53:23,015 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 09:53:23,019 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9158f9cf50> has no local changes
2025-03-30 09:53:23,019 [ 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#371 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/)'
2025-03-30 09:53:23,025 [ scc.git] DEBUG [detached HEAD afee09c] merge master -Dorg -Ssuccess-only
2025-03-30 09:53:23,025 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:23,026 [ scc.repo] DEBUG ## PRs found:
2025-03-30 09:53:23,174 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:23,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-03-30 09:53:23,367 [ scc.repo] DEBUG ## Branches found:
2025-03-30 09:53:23,367 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-30 09:53:23,367 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:23,367 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:23,370 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 09:53:23,372 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 09:53:23,372 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 09:53:23,375 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 09:53:23,378 [ scc.git] DEBUG Already up to date.
2025-03-30 09:53:23,378 [ scc.git] DEBUG ## Unique users: []
2025-03-30 09:53:23,378 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:23,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:23,380 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 09:53:23,419 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:23,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:23,422 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 09:53:23,459 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 09:53:23,463 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9158f5b190> has no local changes
2025-03-30 09:53:23,463 [ 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#371 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/)'
2025-03-30 09:53:23,469 [ scc.git] DEBUG [detached HEAD 266cb69] merge master -Dorg -Ssuccess-only
2025-03-30 09:53:23,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:23,469 [ scc.repo] DEBUG ## PRs found:
2025-03-30 09:53:23,618 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:23,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-03-30 09:53:24,102 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:24,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-03-30 09:53:24,590 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:24,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-03-30 09:53:25,043 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:25,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-30 09:53:25,569 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:25,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 09:53:26,070 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:26,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-30 09:53:26,598 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:26,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-03-30 09:53:26,786 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-03-30 09:53:26,786 [ scc.repo] DEBUG ## Branches found:
2025-03-30 09:53:26,786 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-30 09:53:26,786 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:26,786 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:26,789 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-30 09:53:26,791 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 09:53:26,791 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-30 09:53:26,794 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-30 09:53:26,797 [ scc.git] DEBUG Already up to date.
2025-03-30 09:53:26,797 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-03-30 09:53:27,068 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-03-30 09:53:27,068 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-03-30 09:53:27,072 [ scc.git] DEBUG ## Unique users: []
2025-03-30 09:53:27,072 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:27,072 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:27,074 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-30 09:53:27,077 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:27,079 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-30 09:53:27,088 [ scc.git] DEBUG Auto-merging Dockerfile
2025-03-30 09:53:27,088 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-03-30 09:53:27,088 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-30 09:53:27,089 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-30 09:53:27,092 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-30 09:53:27,096 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-03-30 09:53:27,098 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:27,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:27,249 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-30 09:53:27,252 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-30 09:53:27,255 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#371](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-03-30 09:53:27,257 [ scc.config] DEBUG Found github.token
2025-03-30 09:53:27,257 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-03-30 09:53:27,257 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 09:53:27,295 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:27,295 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:27,297 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 09:53:27,334 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 09:53:27,338 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9158fd8450> has no local changes
2025-03-30 09:53:27,338 [ 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#371 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/)'
2025-03-30 09:53:27,345 [ scc.git] DEBUG [detached HEAD 6b4c59a] merge master -Dorg -Ssuccess-only
2025-03-30 09:53:27,345 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:27,345 [ scc.git] INFO Overriding base-branch from master to develop
2025-03-30 09:53:27,345 [ scc.repo] DEBUG ## PRs found:
2025-03-30 09:53:27,500 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:27,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-03-30 09:53:28,013 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:28,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-03-30 09:53:28,490 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:28,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-03-30 09:53:28,960 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:29,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-30 09:53:29,434 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:29,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 09:53:29,902 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:30,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-30 09:53:30,369 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:30,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-30 09:53:30,806 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:30,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-03-30 09:53:30,985 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-30 09:53:31,236 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:31,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-03-30 09:53:31,726 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:31,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-03-30 09:53:32,181 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:32,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-30 09:53:32,632 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:32,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-30 09:53:33,070 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:33,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-30 09:53:33,559 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:33,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-03-30 09:53:33,722 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-30 09:53:33,973 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:34,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-03-30 09:53:34,460 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:34,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-03-30 09:53:34,974 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:35,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-03-30 09:53:35,459 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:35,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-03-30 09:53:35,721 [ scc.repo] DEBUG ## Branches found:
2025-03-30 09:53:35,721 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-30 09:53:35,721 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:35,721 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:35,724 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-03-30 09:53:35,727 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-30 09:53:35,727 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-03-30 09:53:35,730 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-03-30 09:53:35,738 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-03-30 09:53:35,971 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:36,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-03-30 09:53:36,325 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-03-30 09:53:36,653 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-30 09:53:36,654 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-03-30 09:53:36,658 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-03-30 09:53:36,943 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-30 09:53:36,943 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-03-30 09:53:36,947 [ scc.git] DEBUG ## Unique users: []
2025-03-30 09:53:36,947 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:36,948 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:36,950 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-30 09:53:36,956 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:36,958 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-30 09:53:36,969 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-03-30 09:53:36,969 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-30 09:53:36,970 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-30 09:53:36,972 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-03-30 09:53:36,976 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-03-30 09:53:36,977 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:37,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:37,135 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-30 09:53:37,140 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-03-30 09:53:37,144 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#371](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-03-30 09:53:37,146 [ scc.config] DEBUG Found github.token
2025-03-30 09:53:37,146 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-03-30 09:53:37,147 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-30 09:53:37,151 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:37,153 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-30 09:53:37,163 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-30 09:53:37,166 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-03-30 09:53:37,166 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-03-30 09:53:37,386 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:37,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:37,559 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-30 09:53:37,598 [ scc.git] DEBUG Get sha1 of %s
2025-03-30 09:53:37,598 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-30 09:53:37,600 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 09:53:37,640 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 09:53:37,644 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f915cb83a50> has no local changes
2025-03-30 09:53:37,644 [ 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)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
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#371 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/)'
2025-03-30 09:53:37,651 [ scc.git] DEBUG [detached HEAD 4c80c27] merge master -Dorg -Ssuccess-only
2025-03-30 09:53:37,651 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:37,651 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-30 09:53:37,728 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-03-30 09:53:37,811 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:37,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:37,976 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-03-30 09:53:37,978 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-03-30 09:53:38,222 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:38,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:38,383 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-03-30 09:53:38,385 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-03-30 09:53:38,630 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:38,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:38,801 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-03-30 09:53:38,803 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-03-30 09:53:39,047 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:39,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:39,238 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-03-30 09:53:39,483 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:39,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:39,645 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-03-30 09:53:39,647 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-03-30 09:53:39,892 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:40,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:40,055 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-03-30 09:53:40,057 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-03-30 09:53:40,302 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:40,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:40,468 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-03-30 09:53:40,470 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-03-30 09:53:40,715 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:40,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:40,887 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-03-30 09:53:40,889 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-03-30 09:53:41,133 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:41,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:41,304 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-03-30 09:53:41,307 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-03-30 09:53:41,551 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:41,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:41,717 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-03-30 09:53:41,719 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-03-30 09:53:41,964 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:42,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:42,133 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-03-30 09:53:42,135 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-03-30 09:53:42,380 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:42,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:42,548 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-03-30 09:53:42,550 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-03-30 09:53:42,794 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:42,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:42,960 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-03-30 09:53:43,204 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:43,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:43,374 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-03-30 09:53:43,618 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:43,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:43,795 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-03-30 09:53:43,797 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-03-30 09:53:44,041 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:44,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:44,217 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-03-30 09:53:44,462 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:44,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:44,635 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-03-30 09:53:44,880 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:45,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:45,051 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-03-30 09:53:45,054 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-03-30 09:53:45,297 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:45,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:45,460 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-03-30 09:53:45,462 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-03-30 09:53:45,707 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:45,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:45,868 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-03-30 09:53:45,870 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-03-30 09:53:46,115 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:46,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:46,286 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-03-30 09:53:46,288 [ scc.config] DEBUG Found submodule.scripts.url
2025-03-30 09:53:46,533 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-30 09:53:46,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-30 09:53:46,695 [ scc.config] DEBUG Found submodule.scripts.branch
2025-03-30 09:53:46,695 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-30 09:53:46,786 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f915c20ae10> has local changes
2025-03-30 09:53:46,786 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
- PR 167 dominikl 'Add extinfo command'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
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#371 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/371/)'
2025-03-30 09:53:46,800 [ scc.git] DEBUG [detached HEAD 5baec52] merge master -Dorg -Ssuccess-only
2025-03-30 09:53:46,800 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-03-30 09:53:46,801 [ scc.merge] INFO Repository: ome/omero-plugins
2025-03-30 09:53:46,801 [ scc.merge] INFO Already up to date.
2025-03-30 09:53:46,801 [ scc.merge] INFO
2025-03-30 09:53:46,801 [ scc.merge] INFO Merged PRs:
2025-03-30 09:53:46,801 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-03-30 09:53:46,801 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-03-30 09:53:46,801 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-03-30 09:53:46,801 [ scc.merge] INFO
2025-03-30 09:53:46,801 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-03-30 09:53:46,801 [ scc.merge] INFO Already up to date.
2025-03-30 09:53:46,801 [ scc.merge] INFO
2025-03-30 09:53:46,801 [ scc.merge] INFO
2025-03-30 09:53:46,801 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-03-30 09:53:46,801 [ scc.merge] INFO Excluded PRs:
2025-03-30 09:53:46,801 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-03-30 09:53:46,801 [ scc.merge] INFO Already up to date.
2025-03-30 09:53:46,801 [ scc.merge] INFO
2025-03-30 09:53:46,801 [ scc.merge] INFO
2025-03-30 09:53:46,801 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-03-30 09:53:46,801 [ scc.merge] INFO Excluded PRs:
2025-03-30 09:53:46,801 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-03-30 09:53:46,801 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-03-30 09:53:46,801 [ scc.merge] INFO Already up to date.
2025-03-30 09:53:46,801 [ scc.merge] INFO
2025-03-30 09:53:46,801 [ scc.merge] INFO Merged PRs:
2025-03-30 09:53:46,801 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-03-30 09:53:46,801 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-03-30 09:53:46,801 [ scc.merge] INFO
2025-03-30 09:53:46,801 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-03-30 09:53:46,801 [ scc.merge] INFO Excluded PRs:
2025-03-30 09:53:46,801 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-03-30 09:53:46,801 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-30 09:53:46,802 [ scc.merge] INFO Already up to date.
2025-03-30 09:53:46,802 [ scc.merge] INFO
2025-03-30 09:53:46,802 [ scc.merge] INFO Merged PRs:
2025-03-30 09:53:46,802 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-03-30 09:53:46,802 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-03-30 09:53:46,802 [ scc.merge] INFO
2025-03-30 09:53:46,802 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-30 09:53:46,802 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-03-30 09:53:46,802 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-03-30 09:53:46,802 [ scc.merge] INFO
2025-03-30 09:53:46,802 [ scc.merge] INFO Repository: ome/omero-figure
2025-03-30 09:53:46,802 [ scc.merge] INFO Excluded PRs:
2025-03-30 09:53:46,802 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-03-30 09:53:46,802 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-03-30 09:53:46,802 [ scc.merge] INFO Already up to date.
2025-03-30 09:53:46,802 [ scc.merge] INFO
2025-03-30 09:53:46,802 [ scc.merge] INFO Merged PRs:
2025-03-30 09:53:46,802 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-03-30 09:53:46,802 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-03-30 09:53:46,802 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-03-30 09:53:46,802 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-03-30 09:53:46,802 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-03-30 09:53:46,802 [ scc.merge] INFO
2025-03-30 09:53:46,802 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-30 09:53:46,802 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-03-30 09:53:46,802 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-03-30 09:53:46,802 [ scc.merge] INFO
2025-03-30 09:53:46,802 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-03-30 09:53:46,802 [ scc.merge] INFO Already up to date.
2025-03-30 09:53:46,802 [ scc.merge] INFO
2025-03-30 09:53:46,802 [ scc.merge] INFO Merged PRs:
2025-03-30 09:53:46,802 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-03-30 09:53:46,802 [ scc.merge] INFO
2025-03-30 09:53:46,802 [ scc.merge] INFO Repository: ome/omero-gallery
2025-03-30 09:53:46,802 [ scc.merge] INFO Already up to date.
2025-03-30 09:53:46,802 [ scc.merge] INFO
2025-03-30 09:53:46,802 [ scc.merge] INFO Merged PRs:
2025-03-30 09:53:46,803 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-03-30 09:53:46,803 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-03-30 09:53:46,803 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-03-30 09:53:46,803 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-03-30 09:53:46,803 [ scc.merge] INFO
2025-03-30 09:53:46,803 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-30 09:53:46,803 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-03-30 09:53:46,803 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-03-30 09:53:46,803 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-03-30 09:53:46,803 [ scc.merge] INFO
2025-03-30 09:53:46,803 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-03-30 09:53:46,803 [ scc.merge] INFO Excluded PRs:
2025-03-30 09:53:46,803 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-03-30 09:53:46,803 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-03-30 09:53:46,803 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-03-30 09:53:46,803 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-03-30 09:53:46,803 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-03-30 09:53:46,803 [ scc.merge] INFO Already up to date.
2025-03-30 09:53:46,803 [ scc.merge] INFO
2025-03-30 09:53:46,803 [ scc.merge] INFO Merged PRs:
2025-03-30 09:53:46,803 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-03-30 09:53:46,803 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-03-30 09:53:46,803 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-30 09:53:46,803 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-30 09:53:46,803 [ scc.merge] INFO
2025-03-30 09:53:46,803 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-30 09:53:46,803 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-30 09:53:46,803 [ scc.merge] INFO
2025-03-30 09:53:46,803 [ scc.merge] INFO Repository: ome/omero-mapr
2025-03-30 09:53:46,803 [ scc.merge] INFO Excluded PRs:
2025-03-30 09:53:46,803 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-03-30 09:53:46,803 [ scc.merge] INFO Already up to date.
2025-03-30 09:53:46,803 [ scc.merge] INFO
2025-03-30 09:53:46,803 [ scc.merge] INFO Merged PRs:
2025-03-30 09:53:46,803 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-03-30 09:53:46,803 [ scc.merge] INFO
2025-03-30 09:53:46,803 [ scc.merge] INFO Repository: ome/omero-metadata
2025-03-30 09:53:46,804 [ scc.merge] INFO Already up to date.
2025-03-30 09:53:46,804 [ scc.merge] INFO
2025-03-30 09:53:46,804 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-30 09:53:46,804 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-30 09:53:46,804 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-30 09:53:46,804 [ scc.merge] INFO
2025-03-30 09:53:46,804 [ scc.merge] INFO Repository: ome/omero-parade
2025-03-30 09:53:46,804 [ scc.merge] INFO Excluded PRs:
2025-03-30 09:53:46,804 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-03-30 09:53:46,804 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-03-30 09:53:46,804 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-03-30 09:53:46,804 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-03-30 09:53:46,804 [ scc.merge] INFO Already up to date.
2025-03-30 09:53:46,804 [ scc.merge] INFO
2025-03-30 09:53:46,804 [ scc.merge] INFO Merged PRs:
2025-03-30 09:53:46,804 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-30 09:53:46,804 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-30 09:53:46,804 [ scc.merge] INFO
2025-03-30 09:53:46,804 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-03-30 09:53:46,804 [ scc.merge] INFO Already up to date.
2025-03-30 09:53:46,804 [ scc.merge] INFO
2025-03-30 09:53:46,804 [ scc.merge] INFO
2025-03-30 09:53:46,804 [ scc.merge] INFO Repository: ome/omero-rois
2025-03-30 09:53:46,804 [ scc.merge] INFO Excluded PRs:
2025-03-30 09:53:46,804 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-03-30 09:53:46,804 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-30 09:53:46,804 [ scc.merge] INFO Already up to date.
2025-03-30 09:53:46,804 [ scc.merge] INFO
2025-03-30 09:53:46,804 [ scc.merge] INFO
2025-03-30 09:53:46,804 [ scc.merge] INFO Repository: ome/omero-signup
2025-03-30 09:53:46,804 [ scc.merge] INFO Already up to date.
2025-03-30 09:53:46,804 [ scc.merge] INFO
2025-03-30 09:53:46,804 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-30 09:53:46,804 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-30 09:53:46,804 [ scc.merge] INFO
2025-03-30 09:53:46,804 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-03-30 09:53:46,804 [ scc.merge] INFO Excluded PRs:
2025-03-30 09:53:46,804 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-03-30 09:53:46,805 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-03-30 09:53:46,805 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-03-30 09:53:46,805 [ scc.merge] INFO Already up to date.
2025-03-30 09:53:46,805 [ scc.merge] INFO
2025-03-30 09:53:46,805 [ scc.merge] INFO Merged PRs:
2025-03-30 09:53:46,805 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-30 09:53:46,805 [ scc.merge] INFO
2025-03-30 09:53:46,805 [ scc.merge] INFO Repository: ome/omero-upload
2025-03-30 09:53:46,805 [ scc.merge] INFO Already up to date.
2025-03-30 09:53:46,805 [ scc.merge] INFO
2025-03-30 09:53:46,805 [ scc.merge] INFO
2025-03-30 09:53:46,805 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-03-30 09:53:46,805 [ scc.merge] INFO Already up to date.
2025-03-30 09:53:46,805 [ scc.merge] INFO
2025-03-30 09:53:46,805 [ scc.merge] INFO Merged PRs:
2025-03-30 09:53:46,805 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-03-30 09:53:46,805 [ scc.merge] INFO
2025-03-30 09:53:46,805 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-03-30 09:53:46,805 [ scc.merge] INFO Excluded PRs:
2025-03-30 09:53:46,805 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-03-30 09:53:46,805 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-03-30 09:53:46,805 [ scc.merge] INFO Already up to date.
2025-03-30 09:53:46,805 [ scc.merge] INFO
2025-03-30 09:53:46,805 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-30 09:53:46,805 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-30 09:53:46,805 [ scc.merge] INFO
2025-03-30 09:53:46,805 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-03-30 09:53:46,805 [ scc.merge] INFO Already up to date.
2025-03-30 09:53:46,805 [ scc.merge] INFO
2025-03-30 09:53:46,805 [ scc.merge] INFO
2025-03-30 09:53:46,805 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-03-30 09:53:46,805 [ scc.merge] INFO Already up to date.
2025-03-30 09:53:46,805 [ scc.merge] INFO
2025-03-30 09:53:46,805 [ scc.merge] INFO
2025-03-30 09:53:46,805 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-03-30 09:53:46,805 [ scc.merge] INFO Already up to date.
2025-03-30 09:53:46,805 [ scc.merge] INFO
2025-03-30 09:53:46,805 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-30 09:53:46,806 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-03-30 09:53:46,806 [ scc.merge] INFO
2025-03-30 09:53:46,806 [ scc.merge] INFO Repository: ome/scripts
2025-03-30 09:53:46,806 [ scc.merge] INFO Excluded PRs:
2025-03-30 09:53:46,806 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-03-30 09:53:46,806 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-03-30 09:53:46,806 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-03-30 09:53:46,806 [ scc.merge] INFO Previously merged:
2025-03-30 09:53:46,806 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-03-30 09:53:46,806 [ scc.merge] INFO
2025-03-30 09:53:46,806 [ scc.merge] INFO Merged PRs:
2025-03-30 09:53:46,806 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-30 09:53:46,806 [ scc.merge] INFO
2025-03-30 09:53:46,806 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-30 09:53:46,806 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-30 09:53:46,806 [ scc.merge] INFO
2025-03-30 09:53:46,806 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-03-30 09:53:46,806 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 09:53:46,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-03-30 09:53:46,808 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 09:53:46,810 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:46,810 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-03-30 09:53:46,810 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 09:53:46,813 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:46,813 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-03-30 09:53:46,813 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 09:53:46,815 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:46,815 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-03-30 09:53:46,815 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 09:53:46,817 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:46,817 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-03-30 09:53:46,817 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 09:53:46,819 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:46,819 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-03-30 09:53:46,819 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 09:53:46,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:46,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-03-30 09:53:46,822 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 09:53:46,824 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:46,824 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-30 09:53:46,824 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 09:53:46,826 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:46,826 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-30 09:53:46,826 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 09:53:46,828 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:46,828 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-30 09:53:46,828 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 09:53:46,831 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:46,831 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-30 09:53:46,831 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 09:53:46,833 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:46,833 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-30 09:53:46,833 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 09:53:46,835 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:46,835 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-30 09:53:46,835 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 09:53:46,837 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:46,837 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-30 09:53:46,837 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 09:53:46,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:46,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-30 09:53:46,840 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 09:53:46,842 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:46,842 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-30 09:53:46,842 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 09:53:46,844 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:46,844 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-30 09:53:46,844 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 09:53:46,846 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:46,846 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-30 09:53:46,846 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 09:53:46,848 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:46,849 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-30 09:53:46,849 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 09:53:46,851 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:46,851 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-30 09:53:46,851 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 09:53:46,853 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:46,853 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-30 09:53:46,853 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 09:53:46,855 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-30 09:53:46,855 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-30 09:53:46,855 [ scc.git] DEBUG Calling 'git remote'
2025-03-30 09:53:46,857 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: 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.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: 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.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
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
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3.11: 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
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3.11: 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.3-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 fedd68d] 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 7409bf2] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-03-30 09:54:35,436 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2025-03-30 09:54:44,973 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2025-03-30 09:54:47,434 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-30 09:54:52,238 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-30 09:55:33,319 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts (hide)
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/316c2b55/images/svgs/logo.svg){kind=logo}
