Console Output
Skipping 99 KB..
Full Log scc.git] DEBUG Auto-merging src/css/figure.css
2024-09-05 00:43:21,277 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-09-05 00:43:21,278 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:43:21,285 [ scc.git] DEBUG .gitignore | 2 +
2024-09-05 00:43:21,285 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 53 ++++++++++++++---
2024-09-05 00:43:21,285 [ scc.git] DEBUG src/css/figure.css | 9 +++
2024-09-05 00:43:21,285 [ scc.git] DEBUG src/js/models/panel_model.js | 31 ++++++++++
2024-09-05 00:43:21,285 [ scc.git] DEBUG src/js/views/panel_view.js | 53 +++++++++++++++--
2024-09-05 00:43:21,285 [ scc.git] DEBUG src/js/views/right_panel_view.js | 56 +++++++++++++++++-
2024-09-05 00:43:21,285 [ scc.git] DEBUG src/js/views/roi_modal_view.js | 1 -
2024-09-05 00:43:21,285 [ scc.git] DEBUG src/templates/rois_form.template.html | 68 +++++++++++++++++++++-
2024-09-05 00:43:21,285 [ scc.git] DEBUG 8 files changed, 258 insertions(+), 15 deletions(-)
2024-09-05 00:43:21,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:43:21,546 [ scc.git] DEBUG Resolving previous conflict on Pull Request #578.
2024-09-05 00:43:21,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:43:22,774 [urllib3.conn] DEBUG https://api.github.com:443 "PATCH /repos/ome/omero-figure/issues/comments/2327693689 HTTP/1.1" 200 None
2024-09-05 00:43:22,775 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b47792851e0427c1d5fc7ba778783b8e09e21f47'
2024-09-05 00:43:22,785 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:43:22,790 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 583 (Add Hilo Checkbox for LUT Toggling in Channel Slider View) b47792851e0427c1d5fc7ba778783b8e09e21f47'
2024-09-05 00:43:22,818 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-09-05 00:43:22,819 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:43:22,824 [ scc.git] DEBUG src/js/models/panel_model.js | 10 +++++++++
2024-09-05 00:43:22,824 [ scc.git] DEBUG src/js/models/undo.js | 3 ++-
2024-09-05 00:43:22,824 [ scc.git] DEBUG src/js/views/channel_slider_view.js | 42 +++++++++++++++++++++++++++++++++---
2024-09-05 00:43:22,824 [ scc.git] DEBUG src/templates/checkbox_template.html | 4 ++++
2024-09-05 00:43:22,824 [ scc.git] DEBUG 4 files changed, 55 insertions(+), 4 deletions(-)
2024-09-05 00:43:22,824 [ scc.git] DEBUG create mode 100644 src/templates/checkbox_template.html
2024-09-05 00:43:23,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:43:23,157 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dfac0847f63cbc67445c85263c311e6b22e78c56'
2024-09-05 00:43:23,169 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:43:23,176 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 584 (Link url to image) dfac0847f63cbc67445c85263c311e6b22e78c56'
2024-09-05 00:43:23,214 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:43:23,219 [ scc.git] DEBUG omero_figure/views.py | 130 ++++++++++++++++++++++++++++++++++++------
2024-09-05 00:43:23,219 [ scc.git] DEBUG src/js/models/figure_model.js | 10 ++--
2024-09-05 00:43:23,219 [ scc.git] DEBUG src/js/views/figure_view.js | 10 ++--
2024-09-05 00:43:23,219 [ scc.git] DEBUG 3 files changed, 124 insertions(+), 26 deletions(-)
2024-09-05 00:43:23,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:43:23,560 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:43:23,606 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:43:23,606 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:43:23,612 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:43:23,657 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:43:23,667 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b444d6a90> has no local changes
2024-09-05 00:43:23,667 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 549 will-moore 'Inset feature' (status: failure)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 555 will-moore 'Points in shape editor'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 578 Rdornier 'Image outline'
- PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
- PR 584 Rdornier 'Link url to image'
Conflicting PRs (not included):
- PR 577 Rdornier 'Fill rois'
Generated by OMERO-plugins-push#175 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/)'
2024-09-05 00:43:23,679 [ scc.git] DEBUG [detached HEAD 3030f12c] merge master -Dorg -Ssuccess-only
2024-09-05 00:43:23,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:43:23,680 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:43:24,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-09-05 00:43:24,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-09-05 00:43:24,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-09-05 00:43:25,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-09-05 00:43:25,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-05 00:43:26,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-09-05 00:43:26,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-09-05 00:43:26,902 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-09-05 00:43:26,903 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:43:26,903 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-09-05 00:43:26,903 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:43:26,903 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:43:26,910 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-05 00:43:26,915 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:43:26,916 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-05 00:43:26,922 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-05 00:43:26,928 [ scc.git] DEBUG Already up to date.
2024-09-05 00:43:26,929 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-09-05 00:43:27,262 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-09-05 00:43:27,263 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-09-05 00:43:27,268 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:43:27,268 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:43:27,268 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:43:27,275 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-09-05 00:43:27,282 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:43:27,288 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-09-05 00:43:27,304 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-09-05 00:43:27,305 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:43:27,308 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-09-05 00:43:27,308 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-09-05 00:43:27,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:43:27,436 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:43:27,478 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:43:27,478 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:43:27,484 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:43:27,528 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:43:27,535 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b44536ee0> has no local changes
2024-09-05 00:43:27,535 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Generated by OMERO-plugins-push#175 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/)'
2024-09-05 00:43:27,544 [ scc.git] DEBUG [detached HEAD b4c7591] merge master -Dorg -Ssuccess-only
2024-09-05 00:43:27,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:43:27,545 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:43:27,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-09-05 00:43:28,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-09-05 00:43:28,372 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-05 00:43:28,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-09-05 00:43:29,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-05 00:43:29,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-05 00:43:30,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-09-05 00:43:30,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-09-05 00:43:30,830 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-09-05 00:43:30,830 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:43:30,830 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-09-05 00:43:30,830 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:43:30,830 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:43:30,837 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-05 00:43:30,842 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:43:30,842 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-05 00:43:30,848 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-05 00:43:30,854 [ scc.git] DEBUG Already up to date.
2024-09-05 00:43:30,855 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-09-05 00:43:31,147 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-09-05 00:43:31,148 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-09-05 00:43:31,152 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:43:31,152 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:43:31,152 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:43:31,158 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-09-05 00:43:31,164 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:43:31,170 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-09-05 00:43:31,181 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:43:31,185 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-09-05 00:43:31,185 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-09-05 00:43:31,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:43:31,323 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:43:31,362 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:43:31,363 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:43:31,368 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:43:31,407 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:43:31,415 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b444d6bb0> has no local changes
2024-09-05 00:43:31,415 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Generated by OMERO-plugins-push#175 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/)'
2024-09-05 00:43:31,424 [ scc.git] DEBUG [detached HEAD 13a8dd3] merge master -Dorg -Ssuccess-only
2024-09-05 00:43:31,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:43:31,424 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:43:31,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-09-05 00:43:32,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/483 HTTP/1.1" 200 None
2024-09-05 00:43:32,327 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-05 00:43:32,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-09-05 00:43:33,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-05 00:43:33,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-05 00:43:34,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-09-05 00:43:34,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/384771c9fd794e2b472a35dca65e6ed96be98c4d?per_page=1 HTTP/1.1" 200 2
2024-09-05 00:43:34,779 [ scc.repo] DEBUG - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-09-05 00:43:35,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482 HTTP/1.1" 200 None
2024-09-05 00:43:35,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482/comments HTTP/1.1" 200 None
2024-09-05 00:43:36,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-09-05 00:43:36,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-05 00:43:37,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-05 00:43:37,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-09-05 00:43:38,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b?per_page=1 HTTP/1.1" 200 2
2024-09-05 00:43:38,137 [ scc.repo] DEBUG - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-09-05 00:43:38,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-09-05 00:43:39,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-09-05 00:43:39,098 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-05 00:43:39,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-09-05 00:43:40,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-05 00:43:40,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-05 00:43:41,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-09-05 00:43:41,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-09-05 00:43:41,569 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-09-05 00:43:42,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-09-05 00:43:42,028 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-05 00:43:42,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-09-05 00:43:43,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-05 00:43:43,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-05 00:43:44,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-09-05 00:43:44,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-09-05 00:43:44,639 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-09-05 00:43:45,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-09-05 00:43:45,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-09-05 00:43:46,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-09-05 00:43:46,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-05 00:43:47,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-05 00:43:47,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-09-05 00:43:47,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-09-05 00:43:47,853 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-09-05 00:43:48,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-09-05 00:43:48,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-09-05 00:43:49,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-09-05 00:43:49,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-05 00:43:50,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-05 00:43:50,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-09-05 00:43:51,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-09-05 00:43:51,034 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-09-05 00:43:51,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-09-05 00:43:51,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-09-05 00:43:52,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-09-05 00:43:52,835 [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
2024-09-05 00:43:53,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-09-05 00:43:53,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-09-05 00:43:53,634 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-09-05 00:43:53,636 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:43:53,636 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-09-05 00:43:53,636 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:43:53,636 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:43:53,653 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-05 00:43:53,667 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:43:53,667 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-05 00:43:53,772 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-05 00:43:53,779 [ scc.git] DEBUG Already up to date.
2024-09-05 00:43:53,779 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-09-05 00:43:54,320 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-05 00:43:54,320 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-09-05 00:43:54,325 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-09-05 00:43:55,346 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-05 00:43:55,346 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-09-05 00:43:55,352 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-09-05 00:43:55,713 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-05 00:43:55,713 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-09-05 00:43:55,718 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-09-05 00:43:56,020 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-05 00:43:56,020 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-09-05 00:43:56,025 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-09-05 00:43:56,314 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-05 00:43:56,314 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-09-05 00:43:56,322 [ scc.git] DEBUG Calling 'git fetch origin pull/482/head'
2024-09-05 00:43:56,669 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-05 00:43:56,670 [ scc.git] DEBUG * branch refs/pull/482/head -> FETCH_HEAD
2024-09-05 00:43:56,676 [ scc.git] DEBUG Calling 'git fetch origin pull/483/head'
2024-09-05 00:43:56,987 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-05 00:43:56,987 [ scc.git] DEBUG * branch refs/pull/483/head -> FETCH_HEAD
2024-09-05 00:43:56,996 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:43:56,996 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:43:56,996 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:43:57,007 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-09-05 00:43:57,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:43:57,024 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-09-05 00:43:57,060 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-09-05 00:43:57,062 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:43:57,066 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-09-05 00:43:57,066 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-09-05 00:43:57,066 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-09-05 00:43:57,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:43:57,222 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-09-05 00:43:57,231 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:43:57,238 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-09-05 00:43:57,338 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-09-05 00:43:57,339 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-09-05 00:43:57,339 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-09-05 00:43:57,339 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-09-05 00:43:57,340 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:43:57,362 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-09-05 00:43:57,363 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-09-05 00:43:57,363 [ scc.git] DEBUG src/app/header.html | 5 +
2024-09-05 00:43:57,363 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-09-05 00:43:57,363 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-09-05 00:43:57,363 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-09-05 00:43:57,363 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-09-05 00:43:57,363 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-09-05 00:43:57,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:43:57,605 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-09-05 00:43:57,614 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:43:57,621 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-09-05 00:43:57,667 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-09-05 00:43:57,668 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:43:57,674 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-09-05 00:43:57,675 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-09-05 00:43:57,675 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-09-05 00:43:58,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:43:58,010 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-09-05 00:43:58,059 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:43:58,068 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-09-05 00:43:58,111 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:43:58,122 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-09-05 00:43:58,122 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-09-05 00:43:58,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:43:58,394 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-09-05 00:43:58,421 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:43:58,430 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-09-05 00:43:58,502 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-05 00:43:58,503 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:43:58,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:43:58,780 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-09-05 00:43:58,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:43:58,802 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 482 (Support ?collapse_left/right and ?full_page=true) 7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-09-05 00:43:58,865 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-09-05 00:43:58,866 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-09-05 00:43:58,866 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-09-05 00:43:58,866 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:43:58,871 [ scc.git] DEBUG src/app/context.js | 12 +++++++++++
2024-09-05 00:43:58,871 [ scc.git] DEBUG src/app/index.js | 5 +----
2024-09-05 00:43:58,872 [ scc.git] DEBUG src/model/image_info.js | 1 -
2024-09-05 00:43:58,872 [ scc.git] DEBUG src/utils/constants.js | 5 ++++-
2024-09-05 00:43:58,872 [ scc.git] DEBUG src/utils/ui.js | 44 ++++++++++++++++++++++----------------
2024-09-05 00:43:58,872 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 1 -
2024-09-05 00:43:58,872 [ scc.git] DEBUG 6 files changed, 42 insertions(+), 26 deletions(-)
2024-09-05 00:43:59,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:43:59,162 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-09-05 00:43:59,181 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:43:59,188 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 483 (Bump webpack from 5.82.0 to 5.94.0) 384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-09-05 00:43:59,292 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-05 00:43:59,293 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:43:59,306 [ scc.git] DEBUG package-lock.json | 686 ++++++++++++++++++++++++++----------------------------
2024-09-05 00:43:59,306 [ scc.git] DEBUG package.json | 2 +-
2024-09-05 00:43:59,307 [ scc.git] DEBUG 2 files changed, 329 insertions(+), 359 deletions(-)
2024-09-05 00:43:59,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:43:59,553 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:43:59,655 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:43:59,655 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:43:59,664 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:43:59,726 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:43:59,747 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b444f8be0> has no local changes
2024-09-05 00:43:59,748 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
- PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
- PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
Generated by OMERO-plugins-push#175 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/)'
2024-09-05 00:43:59,765 [ scc.git] DEBUG [detached HEAD 92fbbab] merge master -Dorg -Ssuccess-only
2024-09-05 00:43:59,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:43:59,766 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:44:00,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-09-05 00:44:00,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-09-05 00:44:01,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-09-05 00:44:01,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-09-05 00:44:02,124 [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
2024-09-05 00:44:02,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-05 00:44:03,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-09-05 00:44:03,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-09-05 00:44:03,604 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-09-05 00:44:03,605 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:44:03,605 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-09-05 00:44:03,605 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:03,605 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:03,612 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-05 00:44:03,618 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:44:03,619 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-05 00:44:03,625 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-05 00:44:03,632 [ scc.git] DEBUG Already up to date.
2024-09-05 00:44:03,632 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-09-05 00:44:03,982 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-09-05 00:44:03,983 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-09-05 00:44:03,993 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:44:03,994 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:03,994 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:04,001 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-09-05 00:44:04,011 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:04,018 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-09-05 00:44:04,030 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:44:04,034 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-09-05 00:44:04,035 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-09-05 00:44:04,035 [ scc.git] DEBUG requirements.txt | 2 +-
2024-09-05 00:44:04,035 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-09-05 00:44:04,035 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-09-05 00:44:04,037 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-09-05 00:44:04,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:44:04,175 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:44:04,225 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:04,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:04,235 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:44:04,289 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:44:04,297 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b444a07f0> has no local changes
2024-09-05 00:44:04,297 [ 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#175 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/)'
2024-09-05 00:44:04,308 [ scc.git] DEBUG [detached HEAD e2305da] merge master -Dorg -Ssuccess-only
2024-09-05 00:44:04,309 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:44:04,309 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:44:04,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-09-05 00:44:05,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86 HTTP/1.1" 200 None
2024-09-05 00:44:05,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86/comments HTTP/1.1" 200 None
2024-09-05 00:44:06,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-09-05 00:44:06,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-05 00:44:07,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-09-05 00:44:07,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/d222577494040c63f4ce3c1a266d43257c9f1c61?per_page=1 HTTP/1.1" 200 2
2024-09-05 00:44:07,452 [ scc.repo] DEBUG - PR 86 dominikl 'Add tablename option'
2024-09-05 00:44:07,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-09-05 00:44:08,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-09-05 00:44:08,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-09-05 00:44:09,380 [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
2024-09-05 00:44:09,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-09-05 00:44:10,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-09-05 00:44:10,201 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-09-05 00:44:10,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-09-05 00:44:11,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-09-05 00:44:11,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-09-05 00:44:12,048 [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
2024-09-05 00:44:12,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-09-05 00:44:12,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-09-05 00:44:12,944 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-09-05 00:44:12,944 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:44:12,944 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-09-05 00:44:12,944 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:12,944 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:12,950 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-05 00:44:12,955 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:44:12,955 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-05 00:44:12,960 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-05 00:44:12,966 [ scc.git] DEBUG Already up to date.
2024-09-05 00:44:12,966 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-09-05 00:44:13,374 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-05 00:44:13,374 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-09-05 00:44:13,379 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-09-05 00:44:13,847 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-05 00:44:13,848 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-09-05 00:44:13,855 [ scc.git] DEBUG Calling 'git fetch origin pull/86/head'
2024-09-05 00:44:14,152 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-05 00:44:14,152 [ scc.git] DEBUG * branch refs/pull/86/head -> FETCH_HEAD
2024-09-05 00:44:14,157 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:44:14,157 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:14,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:14,165 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-09-05 00:44:14,173 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:14,179 [ 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'
2024-09-05 00:44:14,241 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-09-05 00:44:14,241 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-09-05 00:44:14,241 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-09-05 00:44:14,241 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-09-05 00:44:14,242 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-05 00:44:14,243 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-05 00:44:14,251 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-05 00:44:14,258 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-09-05 00:44:14,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:44:14,407 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-09-05 00:44:14,415 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-05 00:44:14,420 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#175](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-09-05 00:44:14,425 [ scc.config] DEBUG Found github.token
2024-09-05 00:44:14,425 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-09-05 00:44:14,425 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-09-05 00:44:14,432 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:14,436 [ 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'
2024-09-05 00:44:14,455 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-09-05 00:44:14,455 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-09-05 00:44:14,455 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-09-05 00:44:14,455 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-05 00:44:14,456 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-05 00:44:14,462 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-05 00:44:14,469 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-09-05 00:44:14,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:44:14,791 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-09-05 00:44:14,799 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-05 00:44:14,804 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#175](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/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
2024-09-05 00:44:14,809 [ scc.config] DEBUG Found github.token
2024-09-05 00:44:14,809 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-09-05 00:44:14,810 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-09-05 00:44:14,815 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:14,821 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 86 (Add tablename option) d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-09-05 00:44:14,835 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:44:14,838 [ scc.git] DEBUG src/omero_metadata/cli.py | 10 ++++++++--
2024-09-05 00:44:14,838 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 2 deletions(-)
2024-09-05 00:44:15,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:44:15,199 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:44:15,240 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:15,240 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:15,247 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:44:15,291 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:44:15,299 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b444a0580> has no local changes
2024-09-05 00:44:15,300 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
Merged PRs:
- PR 86 dominikl 'Add tablename option'
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#175 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/)'
2024-09-05 00:44:15,317 [ scc.git] DEBUG [detached HEAD 8de98cb] merge master -Dorg -Ssuccess-only
2024-09-05 00:44:15,318 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:44:15,318 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:44:15,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-09-05 00:44:16,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-09-05 00:44:16,239 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-05 00:44:16,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-09-05 00:44:17,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-05 00:44:17,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-05 00:44:18,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-09-05 00:44:18,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-09-05 00:44:18,697 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-09-05 00:44:19,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-09-05 00:44:19,158 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-05 00:44:19,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-09-05 00:44:20,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-05 00:44:20,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-05 00:44:21,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-09-05 00:44:21,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-09-05 00:44:21,745 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-09-05 00:44:22,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-09-05 00:44:22,180 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-05 00:44:22,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-09-05 00:44:23,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-05 00:44:23,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-05 00:44:24,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-09-05 00:44:24,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-09-05 00:44:24,630 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-09-05 00:44:25,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-09-05 00:44:25,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-09-05 00:44:25,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-09-05 00:44:26,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-09-05 00:44:26,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-09-05 00:44:27,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-09-05 00:44:27,415 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:44:27,415 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-09-05 00:44:27,415 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:27,415 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:27,421 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-05 00:44:27,426 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:44:27,426 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-05 00:44:27,433 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-05 00:44:27,439 [ scc.git] DEBUG Already up to date.
2024-09-05 00:44:27,439 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-09-05 00:44:27,774 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-05 00:44:27,774 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-09-05 00:44:27,779 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-09-05 00:44:28,074 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-05 00:44:28,074 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-09-05 00:44:28,079 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-09-05 00:44:28,360 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-05 00:44:28,361 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-09-05 00:44:28,365 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:44:28,366 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:28,366 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:28,372 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-09-05 00:44:28,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:28,384 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-09-05 00:44:28,395 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:44:28,398 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-09-05 00:44:28,398 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-09-05 00:44:28,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:44:28,545 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-09-05 00:44:28,552 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:28,557 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-09-05 00:44:28,600 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-05 00:44:28,601 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:44:28,604 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-09-05 00:44:28,604 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-09-05 00:44:28,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:44:28,944 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-09-05 00:44:28,951 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:28,957 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-09-05 00:44:28,969 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-05 00:44:28,969 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:44:28,972 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-09-05 00:44:28,972 [ scc.git] DEBUG package.json | 2 +-
2024-09-05 00:44:28,972 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-09-05 00:44:29,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:44:29,336 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:44:29,377 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:29,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:29,383 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:44:29,422 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:44:29,430 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b44504c70> has no local changes
2024-09-05 00:44:29,430 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- 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 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Generated by OMERO-plugins-push#175 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/)'
2024-09-05 00:44:29,438 [ scc.git] DEBUG [detached HEAD 0e6be74] merge master -Dorg -Ssuccess-only
2024-09-05 00:44:29,439 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:44:29,439 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:44:29,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-09-05 00:44:30,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-09-05 00:44:30,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-09-05 00:44:31,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-05 00:44:31,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-09-05 00:44:32,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-09-05 00:44:32,136 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-09-05 00:44:32,136 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:44:32,136 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-09-05 00:44:32,136 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:32,136 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:32,143 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-05 00:44:32,149 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:44:32,149 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-05 00:44:32,155 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-05 00:44:32,162 [ scc.git] DEBUG Already up to date.
2024-09-05 00:44:32,162 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-09-05 00:44:32,456 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-09-05 00:44:32,457 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-09-05 00:44:32,460 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:44:32,460 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:32,461 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:32,466 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-09-05 00:44:32,471 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:32,477 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-09-05 00:44:32,488 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:44:32,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:44:32,630 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:44:32,674 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:32,674 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:32,680 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:44:32,721 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:44:32,728 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b444f9e20> has no local changes
2024-09-05 00:44:32,729 [ 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.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Generated by OMERO-plugins-push#175 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/)'
2024-09-05 00:44:32,738 [ scc.git] DEBUG [detached HEAD 38a4b30] merge master -Dorg -Ssuccess-only
2024-09-05 00:44:32,738 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:44:32,739 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:44:33,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-09-05 00:44:33,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-09-05 00:44:34,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-09-05 00:44:34,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-09-05 00:44:35,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-09-05 00:44:35,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-05 00:44:35,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-09-05 00:44:36,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-09-05 00:44:36,368 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-09-05 00:44:36,368 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:44:36,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-09-05 00:44:36,368 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:36,368 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:36,374 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-05 00:44:36,379 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:44:36,379 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-05 00:44:36,384 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-05 00:44:36,389 [ scc.git] DEBUG Already up to date.
2024-09-05 00:44:36,389 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-09-05 00:44:36,852 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-09-05 00:44:36,853 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-09-05 00:44:36,857 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:44:36,857 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:36,857 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:36,863 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-09-05 00:44:36,869 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:36,873 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-09-05 00:44:36,882 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-09-05 00:44:36,883 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:44:36,885 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-09-05 00:44:36,885 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-09-05 00:44:37,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:44:37,027 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:44:37,065 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:37,065 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:37,071 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:44:37,111 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:44:37,117 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b444fea60> has no local changes
2024-09-05 00:44:37,117 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Generated by OMERO-plugins-push#175 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/)'
2024-09-05 00:44:37,129 [ scc.git] DEBUG [detached HEAD ef60a05] merge master -Dorg -Ssuccess-only
2024-09-05 00:44:37,129 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:44:37,129 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:44:37,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-09-05 00:44:38,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-09-05 00:44:38,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-09-05 00:44:39,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-09-05 00:44:39,498 [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
2024-09-05 00:44:39,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-09-05 00:44:40,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-09-05 00:44:40,321 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-09-05 00:44:40,322 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:44:40,322 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-09-05 00:44:40,322 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:40,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:40,328 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-05 00:44:40,332 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:44:40,332 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-05 00:44:40,337 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-05 00:44:40,342 [ scc.git] DEBUG Already up to date.
2024-09-05 00:44:40,343 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-09-05 00:44:40,667 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-09-05 00:44:40,667 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-09-05 00:44:40,672 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:44:40,672 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:40,672 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:40,678 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-05 00:44:40,683 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:40,688 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-05 00:44:40,744 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-09-05 00:44:40,744 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-09-05 00:44:40,744 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-09-05 00:44:40,744 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-09-05 00:44:40,744 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-09-05 00:44:40,744 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-09-05 00:44:40,744 [ scc.git] DEBUG Auto-merging setup.py
2024-09-05 00:44:40,744 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-09-05 00:44:40,744 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-05 00:44:40,744 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-05 00:44:40,750 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-09-05 00:44:40,757 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-09-05 00:44:40,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:44:40,898 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-05 00:44:40,904 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-09-05 00:44:40,910 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#175](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- setup.py
- omero_signup/views.py
- omero_signup/signup_settings.py
--conflicts
2024-09-05 00:44:40,914 [ scc.config] DEBUG Found github.token
2024-09-05 00:44:40,914 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-09-05 00:44:40,915 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:44:40,952 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:40,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:40,957 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:44:40,996 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:44:41,002 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b444684c0> has no local changes
2024-09-05 00:44:41,003 [ 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#175 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/)'
2024-09-05 00:44:41,010 [ scc.git] DEBUG [detached HEAD 4808cb5] merge master -Dorg -Ssuccess-only
2024-09-05 00:44:41,011 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:44:41,011 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:44:41,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-09-05 00:44:41,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-09-05 00:44:42,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-09-05 00:44:42,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-09-05 00:44:43,258 [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
2024-09-05 00:44:43,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-09-05 00:44:44,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-09-05 00:44:44,195 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-09-05 00:44:44,195 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:44:44,195 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-09-05 00:44:44,195 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:44,195 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:44,202 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-05 00:44:44,207 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:44:44,208 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-05 00:44:44,214 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-05 00:44:44,222 [ scc.git] DEBUG Already up to date.
2024-09-05 00:44:44,223 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-09-05 00:44:44,619 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-09-05 00:44:44,619 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-09-05 00:44:44,624 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:44:44,624 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:44,624 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:44,631 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-09-05 00:44:44,639 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:44,646 [ 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'
2024-09-05 00:44:44,661 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:44:44,665 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-09-05 00:44:44,665 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-09-05 00:44:44,665 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-09-05 00:44:44,665 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-09-05 00:44:44,665 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-09-05 00:44:44,665 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-09-05 00:44:44,665 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-09-05 00:44:44,667 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-09-05 00:44:44,667 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-09-05 00:44:44,667 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-09-05 00:44:44,667 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-09-05 00:44:44,667 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-09-05 00:44:44,667 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-09-05 00:44:44,667 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-09-05 00:44:44,667 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-09-05 00:44:44,667 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-09-05 00:44:44,667 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-09-05 00:44:44,667 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-09-05 00:44:44,668 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-09-05 00:44:44,668 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-09-05 00:44:44,668 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-09-05 00:44:44,668 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-09-05 00:44:44,668 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-09-05 00:44:44,668 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-09-05 00:44:44,668 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-09-05 00:44:44,668 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-09-05 00:44:44,668 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-09-05 00:44:44,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-09-05 00:44:44,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-09-05 00:44:44,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-09-05 00:44:44,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-09-05 00:44:44,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-09-05 00:44:44,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-09-05 00:44:44,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-09-05 00:44:44,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-09-05 00:44:44,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-09-05 00:44:44,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-09-05 00:44:44,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-09-05 00:44:44,668 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-09-05 00:44:44,668 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-09-05 00:44:44,668 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-09-05 00:44:44,668 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-09-05 00:44:44,668 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-09-05 00:44:44,668 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-09-05 00:44:44,668 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-09-05 00:44:44,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:44:44,795 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:44:44,837 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:44,837 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:44,844 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:44:44,888 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:44:44,896 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b444aff40> has no local changes
2024-09-05 00:44:44,896 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#175 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/)'
2024-09-05 00:44:44,907 [ scc.git] DEBUG [detached HEAD baac0b2] merge master -Dorg -Ssuccess-only
2024-09-05 00:44:44,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:44:44,908 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:44:45,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-09-05 00:44:45,209 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:44:45,209 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-09-05 00:44:45,209 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:45,209 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:45,216 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-05 00:44:45,222 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:44:45,222 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-05 00:44:45,228 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-05 00:44:45,234 [ scc.git] DEBUG Already up to date.
2024-09-05 00:44:45,234 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:44:45,234 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:45,234 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:45,240 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:44:45,281 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:45,281 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:45,287 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:44:45,334 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:44:45,340 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b4446cf10> has no local changes
2024-09-05 00:44:45,341 [ 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#175 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/)'
2024-09-05 00:44:45,350 [ scc.git] DEBUG [detached HEAD e1adac2] merge master -Dorg -Ssuccess-only
2024-09-05 00:44:45,350 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:44:45,351 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:44:45,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-09-05 00:44:45,631 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:44:45,631 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-09-05 00:44:45,632 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:45,632 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:45,638 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-05 00:44:45,644 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:44:45,644 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-05 00:44:45,651 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-05 00:44:45,657 [ scc.git] DEBUG Already up to date.
2024-09-05 00:44:45,658 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:44:45,658 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:45,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:45,663 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:44:45,700 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:45,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:45,706 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:44:45,745 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:44:45,751 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b4440e940> has no local changes
2024-09-05 00:44:45,751 [ 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.
Generated by OMERO-plugins-push#175 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/)'
2024-09-05 00:44:45,760 [ scc.git] DEBUG [detached HEAD f277c87] merge master -Dorg -Ssuccess-only
2024-09-05 00:44:45,760 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:44:45,760 [ scc.git] INFO Overriding base-branch from master to main
2024-09-05 00:44:45,760 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:44:46,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-09-05 00:44:46,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-09-05 00:44:47,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-09-05 00:44:47,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-09-05 00:44:47,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-09-05 00:44:48,429 [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
2024-09-05 00:44:48,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-09-05 00:44:49,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-09-05 00:44:49,350 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-09-05 00:44:49,350 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:44:49,350 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-09-05 00:44:49,350 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:49,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:49,359 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-09-05 00:44:49,367 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:44:49,368 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-09-05 00:44:49,377 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-09-05 00:44:49,386 [ scc.git] DEBUG Already up to date.
2024-09-05 00:44:49,386 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-09-05 00:44:49,748 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-09-05 00:44:49,748 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-09-05 00:44:49,753 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:44:49,753 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:49,753 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:49,760 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-05 00:44:49,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:49,782 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-05 00:44:49,805 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-09-05 00:44:49,806 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-09-05 00:44:49,806 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-05 00:44:49,806 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-05 00:44:49,814 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-09-05 00:44:49,822 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-09-05 00:44:49,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:44:49,956 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-05 00:44:49,964 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-09-05 00:44:49,972 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#175](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-09-05 00:44:49,979 [ scc.config] DEBUG Found github.token
2024-09-05 00:44:49,979 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-09-05 00:44:49,980 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:44:50,025 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:50,025 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:50,032 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:44:50,071 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:44:50,078 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b4443f670> has no local changes
2024-09-05 00:44:50,079 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web-zarr
Excluded PRs:
- 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#175 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/)'
2024-09-05 00:44:50,090 [ scc.git] DEBUG [detached HEAD 58cd8c0] merge master -Dorg -Ssuccess-only
2024-09-05 00:44:50,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:44:50,091 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:44:50,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-09-05 00:44:50,372 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:44:50,372 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-09-05 00:44:50,372 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:50,372 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:50,379 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-05 00:44:50,393 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:44:50,394 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-05 00:44:50,402 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-05 00:44:50,411 [ scc.git] DEBUG Already up to date.
2024-09-05 00:44:50,412 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:44:50,412 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:50,412 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:50,419 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:44:50,466 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:50,466 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:50,473 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:44:50,518 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:44:50,525 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b4443de80> has no local changes
2024-09-05 00:44:50,525 [ 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#175 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/)'
2024-09-05 00:44:50,535 [ scc.git] DEBUG [detached HEAD 965ee46] merge master -Dorg -Ssuccess-only
2024-09-05 00:44:50,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:44:50,536 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:44:50,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-09-05 00:44:50,765 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:44:50,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-09-05 00:44:50,766 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:50,766 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:50,776 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-05 00:44:50,784 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:44:50,784 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-05 00:44:50,793 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-05 00:44:50,801 [ scc.git] DEBUG Already up to date.
2024-09-05 00:44:50,802 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:44:50,802 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:50,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:50,809 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:44:50,856 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:50,857 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:50,863 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:44:50,909 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:44:50,917 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b443e6640> has no local changes
2024-09-05 00:44:50,918 [ 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#175 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/)'
2024-09-05 00:44:50,928 [ scc.git] DEBUG [detached HEAD 9cddf73] merge master -Dorg -Ssuccess-only
2024-09-05 00:44:50,928 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:44:50,929 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:44:51,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-09-05 00:44:51,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-09-05 00:44:52,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-09-05 00:44:52,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-09-05 00:44:53,136 [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
2024-09-05 00:44:53,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-09-05 00:44:53,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-09-05 00:44:53,944 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-09-05 00:44:53,944 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:44:53,944 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-09-05 00:44:53,945 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:53,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:53,951 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-05 00:44:53,956 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:44:53,956 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-05 00:44:53,961 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-05 00:44:53,967 [ scc.git] DEBUG Already up to date.
2024-09-05 00:44:53,967 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-09-05 00:44:54,345 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-09-05 00:44:54,345 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-09-05 00:44:54,349 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:44:54,350 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:54,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:54,355 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-05 00:44:54,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:54,366 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-05 00:44:54,403 [ scc.git] DEBUG Auto-merging Dockerfile
2024-09-05 00:44:54,403 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-09-05 00:44:54,403 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-05 00:44:54,403 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-05 00:44:54,410 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-09-05 00:44:54,417 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-09-05 00:44:54,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:44:54,554 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-05 00:44:54,561 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-09-05 00:44:54,566 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#175](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-09-05 00:44:54,571 [ scc.config] DEBUG Found github.token
2024-09-05 00:44:54,571 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-09-05 00:44:54,571 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:44:54,614 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:44:54,614 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:44:54,621 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:44:54,665 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:44:54,673 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b443f7d90> has no local changes
2024-09-05 00:44:54,673 [ 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#175 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/)'
2024-09-05 00:44:54,683 [ scc.git] DEBUG [detached HEAD 8655744] merge master -Dorg -Ssuccess-only
2024-09-05 00:44:54,684 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:44:54,684 [ scc.git] INFO Overriding base-branch from master to develop
2024-09-05 00:44:54,684 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:44:55,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-09-05 00:44:55,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-09-05 00:44:56,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-09-05 00:44:56,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-09-05 00:44:56,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-09-05 00:44:57,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-09-05 00:44:57,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-09-05 00:44:58,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-05 00:44:58,677 [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
2024-09-05 00:44:59,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-05 00:44:59,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-09-05 00:44:59,486 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-05 00:44:59,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-09-05 00:45:00,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-09-05 00:45:00,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-09-05 00:45:01,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-09-05 00:45:01,381 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:45:01,381 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-09-05 00:45:01,381 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:45:01,381 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:45:01,387 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-09-05 00:45:01,393 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:45:01,394 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-09-05 00:45:01,400 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-09-05 00:45:01,406 [ scc.git] DEBUG Already up to date.
2024-09-05 00:45:01,407 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-09-05 00:45:01,830 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-09-05 00:45:01,830 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-09-05 00:45:01,835 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:45:01,835 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:45:01,836 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:45:01,842 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-05 00:45:01,849 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:45:01,854 [ 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'
2024-09-05 00:45:01,912 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-09-05 00:45:01,912 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-09-05 00:45:01,912 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-05 00:45:01,913 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-05 00:45:01,919 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-05 00:45:01,925 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-05 00:45:02,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:45:02,061 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-05 00:45:02,069 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-05 00:45:02,075 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#175](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-09-05 00:45:02,079 [ scc.config] DEBUG Found github.token
2024-09-05 00:45:02,080 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-09-05 00:45:02,080 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:45:02,118 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:45:02,118 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:45:02,123 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:45:02,161 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:45:02,168 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b4444de20> has no local changes
2024-09-05 00:45:02,168 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#175 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/)'
2024-09-05 00:45:02,176 [ scc.git] DEBUG [detached HEAD b2ccffa] merge master -Dorg -Ssuccess-only
2024-09-05 00:45:02,177 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:45:02,177 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:45:02,253 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-09-05 00:45:02,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:45:02,461 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-09-05 00:45:02,466 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-09-05 00:45:02,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:45:02,850 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-09-05 00:45:02,856 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-09-05 00:45:03,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:45:03,244 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-09-05 00:45:03,250 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-09-05 00:45:03,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:45:03,640 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-09-05 00:45:04,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:45:04,035 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-09-05 00:45:04,041 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-09-05 00:45:04,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:45:04,423 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-09-05 00:45:04,428 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-09-05 00:45:04,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:45:04,824 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-09-05 00:45:04,829 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-09-05 00:45:05,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:45:05,205 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-09-05 00:45:05,211 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-09-05 00:45:05,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:45:05,609 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-09-05 00:45:05,615 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-09-05 00:45:05,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:45:05,991 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-09-05 00:45:05,996 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-09-05 00:45:06,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:45:06,390 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-09-05 00:45:06,394 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-09-05 00:45:06,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:45:06,805 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-09-05 00:45:06,809 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-09-05 00:45:07,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:45:07,197 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-09-05 00:45:07,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:45:07,591 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-09-05 00:45:08,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:45:08,012 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-09-05 00:45:08,017 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-09-05 00:45:08,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:45:08,407 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-09-05 00:45:08,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:45:08,811 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-09-05 00:45:09,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:45:09,187 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-09-05 00:45:09,193 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-09-05 00:45:09,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:45:09,579 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-09-05 00:45:09,585 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-09-05 00:45:09,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:45:09,969 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-09-05 00:45:09,974 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-09-05 00:45:10,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:45:10,398 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-09-05 00:45:10,403 [ scc.config] DEBUG Found submodule.scripts.url
2024-09-05 00:45:10,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:45:10,880 [ scc.config] DEBUG Found submodule.scripts.branch
2024-09-05 00:45:10,880 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:45:10,977 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9b45b2be50> has local changes
2024-09-05 00:45:10,977 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Merged PRs:
- PR 66 jburel 'Gateway 5 9 2'
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.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 549 will-moore 'Inset feature' (status: failure)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 555 will-moore 'Points in shape editor'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 578 Rdornier 'Image outline'
- PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
- PR 584 Rdornier 'Link url to image'
Conflicting PRs (not included):
- PR 577 Rdornier 'Fill rois'
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 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
- PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
- PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
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.
Merged PRs:
- PR 86 dominikl 'Add tablename option'
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 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 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
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
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.
Repository: ome/omero-web-zarr
Excluded PRs:
- 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 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#175 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/175/)'
2024-09-05 00:45:10,992 [ scc.git] DEBUG [detached HEAD 69c18fd] merge master -Dorg -Ssuccess-only
2024-09-05 00:45:10,992 [ scc.merge] INFO Repository: ome/omero-plugins
2024-09-05 00:45:10,992 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-09-05 00:45:10,992 [ scc.merge] INFO Already up to date.
2024-09-05 00:45:10,993 [ scc.merge] INFO
2024-09-05 00:45:10,993 [ scc.merge] INFO
2024-09-05 00:45:10,993 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-09-05 00:45:10,993 [ scc.merge] INFO Already up to date.
2024-09-05 00:45:10,993 [ scc.merge] INFO
2024-09-05 00:45:10,993 [ scc.merge] INFO Merged PRs:
2024-09-05 00:45:10,993 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-09-05 00:45:10,993 [ scc.merge] INFO
2024-09-05 00:45:10,993 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-09-05 00:45:10,993 [ scc.merge] INFO Excluded PRs:
2024-09-05 00:45:10,993 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-09-05 00:45:10,993 [ scc.merge] INFO Already up to date.
2024-09-05 00:45:10,993 [ scc.merge] INFO
2024-09-05 00:45:10,993 [ scc.merge] INFO Merged PRs:
2024-09-05 00:45:10,993 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-09-05 00:45:10,993 [ scc.merge] INFO
2024-09-05 00:45:10,993 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-09-05 00:45:10,993 [ scc.merge] INFO Excluded PRs:
2024-09-05 00:45:10,993 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-09-05 00:45:10,993 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-09-05 00:45:10,993 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-09-05 00:45:10,993 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-09-05 00:45:10,993 [ scc.merge] INFO Already up to date.
2024-09-05 00:45:10,993 [ scc.merge] INFO
2024-09-05 00:45:10,993 [ scc.merge] INFO Merged PRs:
2024-09-05 00:45:10,993 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-09-05 00:45:10,993 [ scc.merge] INFO
2024-09-05 00:45:10,993 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-09-05 00:45:10,993 [ scc.merge] INFO Excluded PRs:
2024-09-05 00:45:10,993 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-09-05 00:45:10,993 [ scc.merge] INFO Already up to date.
2024-09-05 00:45:10,994 [ scc.merge] INFO
2024-09-05 00:45:10,994 [ scc.merge] INFO Merged PRs:
2024-09-05 00:45:10,994 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-09-05 00:45:10,994 [ scc.merge] INFO
2024-09-05 00:45:10,994 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-05 00:45:10,994 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-09-05 00:45:10,994 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-09-05 00:45:10,994 [ scc.merge] INFO
2024-09-05 00:45:10,994 [ scc.merge] INFO Repository: ome/omero-figure
2024-09-05 00:45:10,994 [ scc.merge] INFO Excluded PRs:
2024-09-05 00:45:10,994 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-09-05 00:45:10,994 [ scc.merge] INFO - PR 549 will-moore 'Inset feature' (status: failure)
2024-09-05 00:45:10,994 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-09-05 00:45:10,994 [ scc.merge] INFO Already up to date.
2024-09-05 00:45:10,994 [ scc.merge] INFO
2024-09-05 00:45:10,994 [ scc.merge] INFO Merged PRs:
2024-09-05 00:45:10,994 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-09-05 00:45:10,994 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-09-05 00:45:10,994 [ scc.merge] INFO - PR 578 Rdornier 'Image outline'
2024-09-05 00:45:10,994 [ scc.merge] INFO - PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
2024-09-05 00:45:10,994 [ scc.merge] INFO - PR 584 Rdornier 'Link url to image'
2024-09-05 00:45:10,994 [ scc.merge] INFO
2024-09-05 00:45:10,994 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-05 00:45:10,994 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois'
2024-09-05 00:45:10,994 [ scc.merge] INFO
2024-09-05 00:45:10,994 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-09-05 00:45:10,994 [ scc.merge] INFO Already up to date.
2024-09-05 00:45:10,994 [ scc.merge] INFO
2024-09-05 00:45:10,994 [ scc.merge] INFO Merged PRs:
2024-09-05 00:45:10,994 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-09-05 00:45:10,994 [ scc.merge] INFO
2024-09-05 00:45:10,994 [ scc.merge] INFO Repository: ome/omero-gallery
2024-09-05 00:45:10,994 [ scc.merge] INFO Already up to date.
2024-09-05 00:45:10,994 [ scc.merge] INFO
2024-09-05 00:45:10,994 [ scc.merge] INFO Merged PRs:
2024-09-05 00:45:10,994 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-09-05 00:45:10,994 [ scc.merge] INFO
2024-09-05 00:45:10,995 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-09-05 00:45:10,995 [ scc.merge] INFO Excluded PRs:
2024-09-05 00:45:10,995 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-09-05 00:45:10,995 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-09-05 00:45:10,995 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-09-05 00:45:10,995 [ scc.merge] INFO Already up to date.
2024-09-05 00:45:10,995 [ scc.merge] INFO
2024-09-05 00:45:10,995 [ scc.merge] INFO Merged PRs:
2024-09-05 00:45:10,995 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-09-05 00:45:10,995 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-09-05 00:45:10,995 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-09-05 00:45:10,995 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-09-05 00:45:10,995 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-09-05 00:45:10,995 [ scc.merge] INFO - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-09-05 00:45:10,995 [ scc.merge] INFO - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-09-05 00:45:10,995 [ scc.merge] INFO
2024-09-05 00:45:10,995 [ scc.merge] INFO Repository: ome/omero-mapr
2024-09-05 00:45:10,995 [ scc.merge] INFO Excluded PRs:
2024-09-05 00:45:10,995 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-09-05 00:45:10,995 [ scc.merge] INFO Already up to date.
2024-09-05 00:45:10,995 [ scc.merge] INFO
2024-09-05 00:45:10,995 [ scc.merge] INFO Merged PRs:
2024-09-05 00:45:10,995 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-09-05 00:45:10,995 [ scc.merge] INFO
2024-09-05 00:45:10,995 [ scc.merge] INFO Repository: ome/omero-metadata
2024-09-05 00:45:10,995 [ scc.merge] INFO Already up to date.
2024-09-05 00:45:10,995 [ scc.merge] INFO
2024-09-05 00:45:10,995 [ scc.merge] INFO Merged PRs:
2024-09-05 00:45:10,995 [ scc.merge] INFO - PR 86 dominikl 'Add tablename option'
2024-09-05 00:45:10,995 [ scc.merge] INFO
2024-09-05 00:45:10,995 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-05 00:45:10,995 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-09-05 00:45:10,995 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-09-05 00:45:10,995 [ scc.merge] INFO
2024-09-05 00:45:10,995 [ scc.merge] INFO Repository: ome/omero-parade
2024-09-05 00:45:10,995 [ scc.merge] INFO Excluded PRs:
2024-09-05 00:45:10,995 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-09-05 00:45:10,996 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-09-05 00:45:10,996 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-09-05 00:45:10,996 [ scc.merge] INFO Already up to date.
2024-09-05 00:45:10,996 [ scc.merge] INFO
2024-09-05 00:45:10,996 [ scc.merge] INFO Merged PRs:
2024-09-05 00:45:10,996 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-09-05 00:45:10,996 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-09-05 00:45:10,996 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-09-05 00:45:10,996 [ scc.merge] INFO
2024-09-05 00:45:10,996 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-09-05 00:45:10,996 [ scc.merge] INFO Already up to date.
2024-09-05 00:45:10,996 [ scc.merge] INFO
2024-09-05 00:45:10,996 [ scc.merge] INFO Merged PRs:
2024-09-05 00:45:10,996 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-09-05 00:45:10,996 [ scc.merge] INFO
2024-09-05 00:45:10,996 [ scc.merge] INFO Repository: ome/omero-rois
2024-09-05 00:45:10,996 [ scc.merge] INFO Excluded PRs:
2024-09-05 00:45:10,996 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-09-05 00:45:10,996 [ scc.merge] INFO Already up to date.
2024-09-05 00:45:10,996 [ scc.merge] INFO
2024-09-05 00:45:10,996 [ scc.merge] INFO Merged PRs:
2024-09-05 00:45:10,996 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-09-05 00:45:10,996 [ scc.merge] INFO
2024-09-05 00:45:10,996 [ scc.merge] INFO Repository: ome/omero-signup
2024-09-05 00:45:10,996 [ scc.merge] INFO Already up to date.
2024-09-05 00:45:10,996 [ scc.merge] INFO
2024-09-05 00:45:10,996 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-05 00:45:10,996 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-09-05 00:45:10,996 [ scc.merge] INFO
2024-09-05 00:45:10,996 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-09-05 00:45:10,996 [ scc.merge] INFO Already up to date.
2024-09-05 00:45:10,996 [ scc.merge] INFO
2024-09-05 00:45:10,996 [ scc.merge] INFO Merged PRs:
2024-09-05 00:45:10,996 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-09-05 00:45:10,996 [ scc.merge] INFO
2024-09-05 00:45:10,996 [ scc.merge] INFO Repository: ome/omero-upload
2024-09-05 00:45:10,996 [ scc.merge] INFO Already up to date.
2024-09-05 00:45:10,997 [ scc.merge] INFO
2024-09-05 00:45:10,997 [ scc.merge] INFO
2024-09-05 00:45:10,997 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-09-05 00:45:10,997 [ scc.merge] INFO Already up to date.
2024-09-05 00:45:10,997 [ scc.merge] INFO
2024-09-05 00:45:10,997 [ scc.merge] INFO
2024-09-05 00:45:10,997 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-09-05 00:45:10,997 [ scc.merge] INFO Excluded PRs:
2024-09-05 00:45:10,997 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-09-05 00:45:10,997 [ scc.merge] INFO Already up to date.
2024-09-05 00:45:10,997 [ scc.merge] INFO
2024-09-05 00:45:10,997 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-05 00:45:10,997 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-09-05 00:45:10,997 [ scc.merge] INFO
2024-09-05 00:45:10,997 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-09-05 00:45:10,997 [ scc.merge] INFO Already up to date.
2024-09-05 00:45:10,997 [ scc.merge] INFO
2024-09-05 00:45:10,997 [ scc.merge] INFO
2024-09-05 00:45:10,997 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-09-05 00:45:10,997 [ scc.merge] INFO Already up to date.
2024-09-05 00:45:10,997 [ scc.merge] INFO
2024-09-05 00:45:10,997 [ scc.merge] INFO
2024-09-05 00:45:10,997 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-09-05 00:45:10,997 [ scc.merge] INFO Already up to date.
2024-09-05 00:45:10,997 [ scc.merge] INFO
2024-09-05 00:45:10,997 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-05 00:45:10,997 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-09-05 00:45:10,997 [ scc.merge] INFO
2024-09-05 00:45:10,997 [ scc.merge] INFO Repository: ome/scripts
2024-09-05 00:45:10,997 [ scc.merge] INFO Excluded PRs:
2024-09-05 00:45:10,997 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-09-05 00:45:10,997 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-09-05 00:45:10,997 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-09-05 00:45:10,997 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-09-05 00:45:10,997 [ scc.merge] INFO Already up to date.
2024-09-05 00:45:10,997 [ scc.merge] INFO
2024-09-05 00:45:10,997 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-05 00:45:10,998 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-05 00:45:10,998 [ scc.merge] INFO
2024-09-05 00:45:10,998 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-05 00:45:10,998 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:45:11,004 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-09-05 00:45:11,004 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:45:11,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:45:11,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-09-05 00:45:11,010 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:45:11,014 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:45:11,015 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-09-05 00:45:11,015 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:45:11,020 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:45:11,021 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-09-05 00:45:11,021 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:45:11,026 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:45:11,027 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-09-05 00:45:11,027 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:45:11,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:45:11,033 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-09-05 00:45:11,033 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:45:11,038 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:45:11,039 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-09-05 00:45:11,039 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:45:11,044 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:45:11,044 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-09-05 00:45:11,044 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:45:11,049 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:45:11,050 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-09-05 00:45:11,050 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:45:11,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:45:11,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-09-05 00:45:11,055 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:45:11,060 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:45:11,060 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-09-05 00:45:11,060 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:45:11,065 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:45:11,065 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-09-05 00:45:11,065 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:45:11,071 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:45:11,071 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-09-05 00:45:11,071 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:45:11,077 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:45:11,077 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-09-05 00:45:11,077 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:45:11,083 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:45:11,083 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-09-05 00:45:11,083 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:45:11,089 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:45:11,089 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-09-05 00:45:11,089 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:45:11,095 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:45:11,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-09-05 00:45:11,096 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:45:11,101 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:45:11,101 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-09-05 00:45:11,101 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:45:11,107 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:45:11,107 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-09-05 00:45:11,107 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:45:11,113 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:45:11,113 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-09-05 00:45:11,113 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:45:11,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:45:11,119 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-09-05 00:45:11,119 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:45:11,124 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-05 00:45:11,124 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-09-05 00:45:11,125 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:45:11,130 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.9.2 to 5.9.4-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 7756371] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 173cac0
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 9b73dd9
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 5f623996
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from a8f380f
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
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 aca9e9c
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 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
[detached HEAD ea084ff] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-09-05 00:45:57,142 [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
2024-09-05 00:46:06,042 [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
2024-09-05 00:46:08,370 [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
2024-09-05 00:46:12,836 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-09-05 00:46:53,945 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
