Skipping 112 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-08-24 00:41:55,240 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-08-24 00:41:55,240 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 ++++++++++++-
2024-08-24 00:41:55,240 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-08-24 00:41:55,240 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-08-24 00:41:55,240 [ scc.git] DEBUG src/js/views/right_panel_view.js | 79 ++++++++++++++++++++++++++++++-
2024-08-24 00:41:55,240 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-08-24 00:41:55,240 [ scc.git] DEBUG src/templates/rois_form.template.html | 87 +++++++++++++++++++++++++++++++++++
2024-08-24 00:41:55,240 [ scc.git] DEBUG 10 files changed, 364 insertions(+), 5 deletions(-)
2024-08-24 00:41:55,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:41:55,371 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-24 00:41:55,381 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:41:55,387 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-08-24 00:41:55,541 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-24 00:41:55,542 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-24 00:41:55,542 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-08-24 00:41:55,542 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-08-24 00:41:55,542 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-24 00:41:55,549 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-08-24 00:41:55,549 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-08-24 00:41:55,549 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-08-24 00:41:55,549 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-08-24 00:41:55,549 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-08-24 00:41:55,550 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-08-24 00:41:55,550 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-08-24 00:41:55,550 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-08-24 00:41:55,550 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-08-24 00:41:55,550 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-08-24 00:41:55,550 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-08-24 00:41:55,550 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-08-24 00:41:55,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:41:55,750 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...996699f155d2df664d08ff1b8b01c8f6305074be'
2024-08-24 00:41:55,761 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:41:55,767 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 560 (Max projection bytes) 996699f155d2df664d08ff1b8b01c8f6305074be'
2024-08-24 00:41:55,857 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2024-08-24 00:41:55,857 [ scc.git] DEBUG Auto-merging src/css/figure.css
2024-08-24 00:41:55,857 [ scc.git] DEBUG Auto-merging src/index.html
2024-08-24 00:41:55,857 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-08-24 00:41:55,857 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-08-24 00:41:55,857 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2024-08-24 00:41:55,858 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-24 00:41:55,866 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 24 +++++++--
2024-08-24 00:41:55,866 [ scc.git] DEBUG omero_figure/urls.py | 10 +++-
2024-08-24 00:41:55,866 [ scc.git] DEBUG omero_figure/views.py | 58 ++++++++++++++++++++++
2024-08-24 00:41:55,866 [ scc.git] DEBUG src/css/figure.css | 5 --
2024-08-24 00:41:55,866 [ scc.git] DEBUG src/index.html | 1 +
2024-08-24 00:41:55,866 [ scc.git] DEBUG src/js/models/figure_model.js | 29 ++++++++++-
2024-08-24 00:41:55,866 [ scc.git] DEBUG src/js/models/panel_model.js | 29 ++++++++++-
2024-08-24 00:41:55,866 [ scc.git] DEBUG src/js/views/info_panel_view.js | 3 +-
2024-08-24 00:41:55,866 [ scc.git] DEBUG src/js/views/modal_views.js | 2 +
2024-08-24 00:41:55,866 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2024-08-24 00:41:55,866 [ scc.git] DEBUG src/js/views/right_panel_view.js | 5 ++
2024-08-24 00:41:55,866 [ scc.git] DEBUG src/js/views/scalebar_form_view.js | 3 +-
2024-08-24 00:41:55,866 [ scc.git] DEBUG src/templates/image_display_options.template.html | 6 ++-
2024-08-24 00:41:55,866 [ scc.git] DEBUG src/templates/info_panel.template.html | 2 +
2024-08-24 00:41:55,866 [ scc.git] DEBUG 14 files changed, 163 insertions(+), 16 deletions(-)
2024-08-24 00:41:56,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:41:56,132 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-24 00:41:56,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:41:56,147 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py) 15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-08-24 00:41:56,177 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-24 00:41:56,180 [ scc.git] DEBUG setup.py | 2 +-
2024-08-24 00:41:56,180 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-08-24 00:41:56,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:41:56,518 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-24 00:41:56,571 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:41:56,571 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:41:56,579 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-24 00:41:56,624 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-24 00:41:56,633 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f49684d74f0> has no local changes
2024-08-24 00:41:56,633 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View' (user: MinaEnayat)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (user: Rdornier)
- PR 577 Rdornier 'Fill rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
Generated by OMERO-plugins-push#162 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/)'
2024-08-24 00:41:56,646 [ scc.git] DEBUG [detached HEAD 61b501a8] merge master -Dorg -Ssuccess-only
2024-08-24 00:41:56,646 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:41:56,647 [ scc.repo] DEBUG ## PRs found:
2024-08-24 00:41:57,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-08-24 00:41:57,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-08-24 00:41:57,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-08-24 00:41:58,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-24 00:41:58,896 [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-08-24 00:41:59,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-08-24 00:41:59,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-08-24 00:41:59,816 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-08-24 00:41:59,816 [ scc.repo] DEBUG ## Branches found:
2024-08-24 00:41:59,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-24 00:41:59,817 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:41:59,817 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:41:59,827 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-24 00:41:59,837 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-24 00:41:59,837 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-24 00:41:59,848 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-24 00:41:59,858 [ scc.git] DEBUG Already up to date.
2024-08-24 00:41:59,858 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-08-24 00:42:00,245 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-08-24 00:42:00,245 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-08-24 00:42:00,251 [ scc.git] DEBUG ## Unique users: []
2024-08-24 00:42:00,251 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:42:00,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:00,258 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-24 00:42:00,266 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:00,275 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-08-24 00:42:00,314 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-08-24 00:42:00,315 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-24 00:42:00,318 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-08-24 00:42:00,318 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-08-24 00:42:00,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:42:00,461 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-24 00:42:00,509 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:42:00,510 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:00,517 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-24 00:42:00,561 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-24 00:42:00,570 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f496852e220> has no local changes
2024-08-24 00:42:00,570 [ 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#162 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/)'
2024-08-24 00:42:00,581 [ scc.git] DEBUG [detached HEAD 162286e] merge master -Dorg -Ssuccess-only
2024-08-24 00:42:00,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:42:00,582 [ scc.repo] DEBUG ## PRs found:
2024-08-24 00:42:00,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-08-24 00:42:01,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-08-24 00:42:01,370 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-24 00:42:01,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-24 00:42:02,374 [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-08-24 00:42:02,858 [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-08-24 00:42:03,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-08-24 00:42:03,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-08-24 00:42:03,826 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-24 00:42:03,827 [ scc.repo] DEBUG ## Branches found:
2024-08-24 00:42:03,827 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-24 00:42:03,827 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:42:03,827 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:03,833 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-24 00:42:03,838 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-24 00:42:03,838 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-24 00:42:03,844 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-24 00:42:03,851 [ scc.git] DEBUG Already up to date.
2024-08-24 00:42:03,851 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-08-24 00:42:04,170 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-08-24 00:42:04,170 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-08-24 00:42:04,175 [ scc.git] DEBUG ## Unique users: []
2024-08-24 00:42:04,175 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:42:04,175 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:04,181 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-08-24 00:42:04,187 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:04,193 [ 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-08-24 00:42:04,205 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-24 00:42:04,209 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-08-24 00:42:04,210 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-08-24 00:42:04,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:42:04,359 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-24 00:42:04,406 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:42:04,407 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:04,413 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-24 00:42:04,455 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-24 00:42:04,464 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4968565b50> has no local changes
2024-08-24 00:42:04,464 [ 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#162 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/)'
2024-08-24 00:42:04,476 [ scc.git] DEBUG [detached HEAD 80d6a63] merge master -Dorg -Ssuccess-only
2024-08-24 00:42:04,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:42:04,478 [ scc.repo] DEBUG ## PRs found:
2024-08-24 00:42:04,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-08-24 00:42:05,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482 HTTP/1.1" 200 None
2024-08-24 00:42:05,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-08-24 00:42:06,329 [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-08-24 00:42:06,818 [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-08-24 00:42:07,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-08-24 00:42:07,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b?per_page=1 HTTP/1.1" 200 2
2024-08-24 00:42:07,715 [ scc.repo] DEBUG - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-08-24 00:42:08,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-08-24 00:42:08,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-08-24 00:42:08,624 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-24 00:42:09,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-24 00:42:09,682 [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-08-24 00:42:10,133 [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-08-24 00:42:10,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-08-24 00:42:11,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-08-24 00:42:11,126 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-24 00:42:11,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-08-24 00:42:11,579 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-24 00:42:12,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-24 00:42:12,603 [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-08-24 00:42:13,133 [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-08-24 00:42:13,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-08-24 00:42:14,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-08-24 00:42:14,065 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-24 00:42:14,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-08-24 00:42:14,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-08-24 00:42:15,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-24 00:42:15,913 [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-08-24 00:42:16,344 [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-08-24 00:42:16,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-08-24 00:42:17,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-08-24 00:42:17,317 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-24 00:42:17,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-08-24 00:42:18,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-08-24 00:42:18,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-24 00:42:19,171 [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-08-24 00:42:19,631 [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-08-24 00:42:20,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-08-24 00:42:20,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-08-24 00:42:20,436 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-08-24 00:42:20,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-08-24 00:42:21,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-08-24 00:42:21,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-24 00:42:22,204 [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-08-24 00:42:22,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-08-24 00:42:23,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-08-24 00:42:23,068 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-08-24 00:42:23,069 [ scc.repo] DEBUG ## Branches found:
2024-08-24 00:42:23,069 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-24 00:42:23,069 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:42:23,069 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:23,076 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-24 00:42:23,082 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-24 00:42:23,083 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-24 00:42:23,089 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-24 00:42:23,096 [ scc.git] DEBUG Already up to date.
2024-08-24 00:42:23,097 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-08-24 00:42:23,406 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-24 00:42:23,406 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-08-24 00:42:23,411 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-08-24 00:42:24,336 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-24 00:42:24,337 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-08-24 00:42:24,342 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-08-24 00:42:24,711 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-24 00:42:24,711 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-08-24 00:42:24,717 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-08-24 00:42:24,988 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-24 00:42:24,989 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-08-24 00:42:24,993 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-08-24 00:42:25,293 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-24 00:42:25,293 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-08-24 00:42:25,299 [ scc.git] DEBUG Calling 'git fetch origin pull/482/head'
2024-08-24 00:42:25,728 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-08-24 00:42:25,728 [ scc.git] DEBUG * branch refs/pull/482/head -> FETCH_HEAD
2024-08-24 00:42:25,731 [ scc.git] DEBUG ## Unique users: []
2024-08-24 00:42:25,731 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:42:25,731 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:25,736 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-24 00:42:25,742 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:25,748 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-08-24 00:42:25,835 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-24 00:42:25,836 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-24 00:42:25,841 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-08-24 00:42:25,841 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-08-24 00:42:25,841 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-08-24 00:42:25,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:42:25,978 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-24 00:42:25,985 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:25,990 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-08-24 00:42:26,145 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-08-24 00:42:26,145 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-24 00:42:26,145 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-24 00:42:26,145 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-08-24 00:42:26,146 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-24 00:42:26,150 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-08-24 00:42:26,150 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-08-24 00:42:26,150 [ scc.git] DEBUG src/app/header.html | 5 +
2024-08-24 00:42:26,150 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-08-24 00:42:26,151 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-08-24 00:42:26,151 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-08-24 00:42:26,151 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-08-24 00:42:26,151 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-08-24 00:42:26,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:42:26,366 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-24 00:42:26,374 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:26,379 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-08-24 00:42:26,428 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-08-24 00:42:26,429 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-24 00:42:26,433 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-08-24 00:42:26,433 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-08-24 00:42:26,433 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-08-24 00:42:26,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:42:26,755 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-24 00:42:26,781 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:26,787 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-08-24 00:42:26,820 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-24 00:42:26,830 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-08-24 00:42:26,830 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-08-24 00:42:27,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:42:27,135 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-08-24 00:42:27,146 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:27,153 [ 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-08-24 00:42:27,187 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-24 00:42:27,188 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-24 00:42:27,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:42:27,521 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-08-24 00:42:27,530 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:27,535 [ 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-08-24 00:42:27,556 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-08-24 00:42:27,557 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-08-24 00:42:27,557 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-08-24 00:42:27,557 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-24 00:42:27,562 [ scc.git] DEBUG src/app/context.js | 12 +++++++++++
2024-08-24 00:42:27,562 [ scc.git] DEBUG src/app/index.js | 5 +----
2024-08-24 00:42:27,562 [ scc.git] DEBUG src/model/image_info.js | 1 -
2024-08-24 00:42:27,562 [ scc.git] DEBUG src/utils/constants.js | 5 ++++-
2024-08-24 00:42:27,562 [ scc.git] DEBUG src/utils/ui.js | 44 ++++++++++++++++++++++----------------
2024-08-24 00:42:27,563 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 1 -
2024-08-24 00:42:27,563 [ scc.git] DEBUG 6 files changed, 42 insertions(+), 26 deletions(-)
2024-08-24 00:42:27,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:42:27,909 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-24 00:42:27,956 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:42:27,957 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:27,964 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-24 00:42:28,012 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-24 00:42:28,023 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4968532d60> has no local changes
2024-08-24 00:42:28,023 [ 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'
Generated by OMERO-plugins-push#162 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/)'
2024-08-24 00:42:28,033 [ scc.git] DEBUG [detached HEAD dbf1704] merge master -Dorg -Ssuccess-only
2024-08-24 00:42:28,034 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:42:28,034 [ scc.repo] DEBUG ## PRs found:
2024-08-24 00:42:28,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-08-24 00:42:28,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/85 HTTP/1.1" 200 None
2024-08-24 00:42:29,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/85/comments HTTP/1.1" 200 None
2024-08-24 00:42:29,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/5166040a15b493631009b9e446f25b6a724289e3 HTTP/1.1" 200 None
2024-08-24 00:42:30,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/5166040a15b493631009b9e446f25b6a724289e3/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-24 00:42:30,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/5166040a15b493631009b9e446f25b6a724289e3/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-08-24 00:42:31,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-08-24 00:42:31,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-08-24 00:42:32,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-24 00:42:32,667 [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-08-24 00:42:33,115 [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-08-24 00:42:33,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-08-24 00:42:33,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-08-24 00:42:33,960 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-08-24 00:42:33,960 [ scc.repo] DEBUG ## Branches found:
2024-08-24 00:42:33,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-24 00:42:33,960 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:42:33,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:33,967 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-24 00:42:33,972 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-24 00:42:33,972 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-24 00:42:33,978 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-24 00:42:33,983 [ scc.git] DEBUG Already up to date.
2024-08-24 00:42:33,984 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-08-24 00:42:34,298 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-08-24 00:42:34,298 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-08-24 00:42:34,305 [ scc.git] DEBUG ## Unique users: []
2024-08-24 00:42:34,305 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:42:34,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:34,312 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-24 00:42:34,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:34,325 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-08-24 00:42:34,336 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-24 00:42:34,338 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-08-24 00:42:34,338 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-08-24 00:42:34,338 [ scc.git] DEBUG requirements.txt | 2 +-
2024-08-24 00:42:34,338 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-08-24 00:42:34,338 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-08-24 00:42:34,339 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-08-24 00:42:34,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:42:34,487 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-24 00:42:34,533 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:42:34,534 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:34,540 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-24 00:42:34,588 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-24 00:42:34,596 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f496854af10> has no local changes
2024-08-24 00:42:34,597 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 85 sbesson 'Add support for OMERO.web 5.27.0' (status: failure)
- 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#162 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/)'
2024-08-24 00:42:34,608 [ scc.git] DEBUG [detached HEAD 2b2d8e0] merge master -Dorg -Ssuccess-only
2024-08-24 00:42:34,609 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:42:34,609 [ scc.repo] DEBUG ## PRs found:
2024-08-24 00:42:35,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-08-24 00:42:35,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-08-24 00:42:35,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-08-24 00:42:36,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-24 00:42:36,920 [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-08-24 00:42:37,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-08-24 00:42:37,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-08-24 00:42:37,804 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-24 00:42:38,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-08-24 00:42:38,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-08-24 00:42:39,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-24 00:42:39,652 [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-08-24 00:42:40,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-08-24 00:42:40,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-08-24 00:42:40,528 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-24 00:42:40,528 [ scc.repo] DEBUG ## Branches found:
2024-08-24 00:42:40,528 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-24 00:42:40,528 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:42:40,528 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:40,535 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-24 00:42:40,542 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-24 00:42:40,542 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-24 00:42:40,549 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-24 00:42:40,557 [ scc.git] DEBUG Already up to date.
2024-08-24 00:42:40,558 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-08-24 00:42:41,081 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-24 00:42:41,082 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-08-24 00:42:41,089 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-08-24 00:42:41,626 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-08-24 00:42:41,627 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-08-24 00:42:41,632 [ scc.git] DEBUG ## Unique users: []
2024-08-24 00:42:41,632 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:42:41,632 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:41,638 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-24 00:42:41,646 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:41,652 [ 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-08-24 00:42:41,712 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-08-24 00:42:41,712 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-08-24 00:42:41,712 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-24 00:42:41,713 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-24 00:42:41,713 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-24 00:42:41,713 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-24 00:42:41,720 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-24 00:42:41,728 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-24 00:42:41,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:42:41,865 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-08-24 00:42:41,873 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-24 00:42:41,879 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#162](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-08-24 00:42:41,888 [ scc.config] DEBUG Found github.token
2024-08-24 00:42:41,888 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-08-24 00:42:41,889 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-24 00:42:41,895 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:41,900 [ 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-08-24 00:42:41,934 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-08-24 00:42:41,934 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-08-24 00:42:41,934 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-08-24 00:42:41,934 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-24 00:42:41,935 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-24 00:42:41,942 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-24 00:42:41,950 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-08-24 00:42:42,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:42:42,239 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-08-24 00:42:42,246 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-08-24 00:42:42,252 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#162](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/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-08-24 00:42:42,257 [ scc.config] DEBUG Found github.token
2024-08-24 00:42:42,258 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-08-24 00:42:42,258 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-24 00:42:42,299 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:42:42,299 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:42,304 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-24 00:42:42,348 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-24 00:42:42,355 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4968503f40> has no local changes
2024-08-24 00:42:42,356 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Generated by OMERO-plugins-push#162 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/)'
2024-08-24 00:42:42,364 [ scc.git] DEBUG [detached HEAD 86a2590] merge master -Dorg -Ssuccess-only
2024-08-24 00:42:42,365 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:42:42,365 [ scc.repo] DEBUG ## PRs found:
2024-08-24 00:42:42,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-08-24 00:42:43,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-08-24 00:42:43,188 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-24 00:42:43,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-24 00:42:44,310 [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-08-24 00:42:44,812 [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-08-24 00:42:45,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-08-24 00:42:45,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-08-24 00:42:45,720 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-24 00:42:46,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-08-24 00:42:46,156 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-24 00:42:46,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-24 00:42:47,262 [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-08-24 00:42:47,698 [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-08-24 00:42:48,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-08-24 00:42:48,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-08-24 00:42:48,521 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-24 00:42:48,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-08-24 00:42:48,966 [ scc.repo] DEBUG # ... Include label: dependencies
2024-08-24 00:42:49,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-24 00:42:49,970 [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-08-24 00:42:50,463 [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-08-24 00:42:51,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-08-24 00:42:51,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-08-24 00:42:51,458 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-24 00:42:51,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-08-24 00:42:52,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-08-24 00:42:52,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-08-24 00:42:53,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-08-24 00:42:53,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-08-24 00:42:54,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-08-24 00:42:54,236 [ scc.repo] DEBUG ## Branches found:
2024-08-24 00:42:54,236 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-24 00:42:54,236 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:42:54,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:54,243 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-24 00:42:54,249 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-24 00:42:54,250 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-24 00:42:54,256 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-24 00:42:54,263 [ scc.git] DEBUG Already up to date.
2024-08-24 00:42:54,263 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-08-24 00:42:54,565 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-24 00:42:54,566 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-08-24 00:42:54,573 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-08-24 00:42:54,862 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-24 00:42:54,862 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-08-24 00:42:54,867 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-08-24 00:42:55,160 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-08-24 00:42:55,160 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-08-24 00:42:55,165 [ scc.git] DEBUG ## Unique users: []
2024-08-24 00:42:55,165 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:42:55,165 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:55,171 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-08-24 00:42:55,176 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:55,180 [ 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-08-24 00:42:55,189 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-24 00:42:55,192 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-08-24 00:42:55,193 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-08-24 00:42:55,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:42:55,319 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-08-24 00:42:55,325 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:55,330 [ 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-08-24 00:42:55,439 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-24 00:42:55,440 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-24 00:42:55,444 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-08-24 00:42:55,444 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-08-24 00:42:55,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:42:55,694 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-08-24 00:42:55,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:55,707 [ 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-08-24 00:42:55,739 [ scc.git] DEBUG Auto-merging package-lock.json
2024-08-24 00:42:55,741 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-24 00:42:55,744 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-08-24 00:42:55,744 [ scc.git] DEBUG package.json | 2 +-
2024-08-24 00:42:55,744 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-08-24 00:42:56,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:42:56,081 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-24 00:42:56,127 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:42:56,127 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:56,134 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-24 00:42:56,180 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-24 00:42:56,188 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f49684c7580> has no local changes
2024-08-24 00:42:56,189 [ 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#162 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/)'
2024-08-24 00:42:56,199 [ scc.git] DEBUG [detached HEAD 720a532] merge master -Dorg -Ssuccess-only
2024-08-24 00:42:56,200 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:42:56,200 [ scc.repo] DEBUG ## PRs found:
2024-08-24 00:42:56,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-08-24 00:42:57,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-08-24 00:42:57,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-24 00:42:58,045 [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-08-24 00:42:58,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-08-24 00:42:58,910 [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-08-24 00:42:58,911 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-08-24 00:42:58,911 [ scc.repo] DEBUG ## Branches found:
2024-08-24 00:42:58,911 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-24 00:42:58,911 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:42:58,911 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:58,917 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-24 00:42:58,923 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-24 00:42:58,923 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-24 00:42:58,929 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-24 00:42:58,935 [ scc.git] DEBUG Already up to date.
2024-08-24 00:42:58,935 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-24 00:42:59,260 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-08-24 00:42:59,260 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-24 00:42:59,265 [ scc.git] DEBUG ## Unique users: []
2024-08-24 00:42:59,266 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:42:59,266 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:59,272 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-24 00:42:59,277 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:59,281 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-08-24 00:42:59,290 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-24 00:42:59,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:42:59,430 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-24 00:42:59,472 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:42:59,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:42:59,478 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-24 00:42:59,517 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-24 00:42:59,524 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4968536e80> has no local changes
2024-08-24 00:42:59,524 [ 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#162 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/)'
2024-08-24 00:42:59,532 [ scc.git] DEBUG [detached HEAD 5859209] merge master -Dorg -Ssuccess-only
2024-08-24 00:42:59,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:42:59,533 [ scc.repo] DEBUG ## PRs found:
2024-08-24 00:42:59,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-08-24 00:43:00,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-08-24 00:43:00,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-08-24 00:43:01,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-08-24 00:43:01,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-24 00:43:02,209 [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-08-24 00:43:02,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-08-24 00:43:03,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-08-24 00:43:03,098 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-24 00:43:03,098 [ scc.repo] DEBUG ## Branches found:
2024-08-24 00:43:03,098 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-24 00:43:03,098 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:03,099 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:03,105 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-24 00:43:03,111 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-24 00:43:03,112 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-24 00:43:03,118 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-24 00:43:03,125 [ scc.git] DEBUG Already up to date.
2024-08-24 00:43:03,125 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-08-24 00:43:03,433 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-08-24 00:43:03,433 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-08-24 00:43:03,437 [ scc.git] DEBUG ## Unique users: []
2024-08-24 00:43:03,438 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:03,438 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:03,445 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-08-24 00:43:03,452 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:03,457 [ 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-08-24 00:43:03,468 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-08-24 00:43:03,469 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-24 00:43:03,472 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-08-24 00:43:03,472 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-08-24 00:43:03,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:03,635 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-24 00:43:03,681 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:03,682 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:03,689 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-24 00:43:03,735 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-24 00:43:03,743 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f496845ab50> has no local changes
2024-08-24 00:43:03,744 [ 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#162 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/)'
2024-08-24 00:43:03,755 [ scc.git] DEBUG [detached HEAD 683dab1] merge master -Dorg -Ssuccess-only
2024-08-24 00:43:03,755 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:03,755 [ scc.repo] DEBUG ## PRs found:
2024-08-24 00:43:04,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-08-24 00:43:04,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-08-24 00:43:05,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-08-24 00:43:05,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-24 00:43:06,007 [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-08-24 00:43:06,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-08-24 00:43:06,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-08-24 00:43:06,909 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-24 00:43:06,909 [ scc.repo] DEBUG ## Branches found:
2024-08-24 00:43:06,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-24 00:43:06,909 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:06,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:06,916 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-24 00:43:06,921 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-24 00:43:06,921 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-24 00:43:06,926 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-24 00:43:06,932 [ scc.git] DEBUG Already up to date.
2024-08-24 00:43:06,932 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-08-24 00:43:07,303 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-08-24 00:43:07,303 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-08-24 00:43:07,310 [ scc.git] DEBUG ## Unique users: []
2024-08-24 00:43:07,310 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:07,310 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:07,316 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-24 00:43:07,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:07,328 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-24 00:43:07,404 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-08-24 00:43:07,405 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-08-24 00:43:07,405 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-08-24 00:43:07,405 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-08-24 00:43:07,405 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-08-24 00:43:07,405 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-08-24 00:43:07,405 [ scc.git] DEBUG Auto-merging setup.py
2024-08-24 00:43:07,405 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-08-24 00:43:07,405 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-24 00:43:07,405 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-24 00:43:07,412 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-24 00:43:07,419 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-08-24 00:43:07,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:07,570 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-08-24 00:43:07,578 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-08-24 00:43:07,584 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#162](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
- setup.py
--conflicts
2024-08-24 00:43:07,588 [ scc.config] DEBUG Found github.token
2024-08-24 00:43:07,588 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-08-24 00:43:07,589 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-24 00:43:07,628 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:07,628 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:07,634 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-24 00:43:07,672 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-24 00:43:07,680 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f49684c7730> has no local changes
2024-08-24 00:43:07,680 [ 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#162 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/)'
2024-08-24 00:43:07,688 [ scc.git] DEBUG [detached HEAD 80ac426] merge master -Dorg -Ssuccess-only
2024-08-24 00:43:07,688 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:07,688 [ scc.repo] DEBUG ## PRs found:
2024-08-24 00:43:08,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-08-24 00:43:08,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-08-24 00:43:08,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-08-24 00:43:09,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-24 00:43:09,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-24 00:43:10,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-08-24 00:43:10,666 [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-08-24 00:43:10,667 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-24 00:43:10,667 [ scc.repo] DEBUG ## Branches found:
2024-08-24 00:43:10,667 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-24 00:43:10,667 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:10,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:10,674 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-24 00:43:10,679 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-24 00:43:10,679 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-24 00:43:10,685 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-24 00:43:10,690 [ scc.git] DEBUG Already up to date.
2024-08-24 00:43:10,691 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-08-24 00:43:11,104 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-08-24 00:43:11,105 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-08-24 00:43:11,110 [ scc.git] DEBUG ## Unique users: []
2024-08-24 00:43:11,110 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:11,110 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:11,116 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-08-24 00:43:11,123 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:11,127 [ 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-08-24 00:43:11,174 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-08-24 00:43:11,177 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-08-24 00:43:11,177 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-08-24 00:43:11,177 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-08-24 00:43:11,177 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-08-24 00:43:11,177 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-08-24 00:43:11,177 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-08-24 00:43:11,178 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-08-24 00:43:11,178 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-08-24 00:43:11,180 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-08-24 00:43:11,181 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-08-24 00:43:11,181 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-08-24 00:43:11,181 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-08-24 00:43:11,181 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-08-24 00:43:11,181 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-08-24 00:43:11,181 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-08-24 00:43:11,181 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-08-24 00:43:11,181 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-08-24 00:43:11,181 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-08-24 00:43:11,181 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-08-24 00:43:11,181 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-08-24 00:43:11,181 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-08-24 00:43:11,181 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-08-24 00:43:11,181 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-08-24 00:43:11,181 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-08-24 00:43:11,181 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-08-24 00:43:11,181 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-08-24 00:43:11,181 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-08-24 00:43:11,181 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-08-24 00:43:11,181 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-08-24 00:43:11,181 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-08-24 00:43:11,181 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-08-24 00:43:11,181 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-08-24 00:43:11,181 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-08-24 00:43:11,181 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-08-24 00:43:11,181 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-08-24 00:43:11,181 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-08-24 00:43:11,181 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-08-24 00:43:11,182 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-08-24 00:43:11,182 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-08-24 00:43:11,182 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-08-24 00:43:11,182 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-08-24 00:43:11,182 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-08-24 00:43:11,182 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-08-24 00:43:11,182 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-08-24 00:43:11,182 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-08-24 00:43:11,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:11,313 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-24 00:43:11,358 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:11,359 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:11,364 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-24 00:43:11,410 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-24 00:43:11,419 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4968494640> has no local changes
2024-08-24 00:43:11,419 [ 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#162 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/)'
2024-08-24 00:43:11,432 [ scc.git] DEBUG [detached HEAD 2ef09df] merge master -Dorg -Ssuccess-only
2024-08-24 00:43:11,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:11,433 [ scc.repo] DEBUG ## PRs found:
2024-08-24 00:43:11,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-08-24 00:43:11,766 [ scc.repo] DEBUG ## Branches found:
2024-08-24 00:43:11,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-24 00:43:11,767 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:11,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:11,773 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-24 00:43:11,779 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-24 00:43:11,779 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-24 00:43:11,786 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-24 00:43:11,792 [ scc.git] DEBUG Already up to date.
2024-08-24 00:43:11,792 [ scc.git] DEBUG ## Unique users: []
2024-08-24 00:43:11,793 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:11,793 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:11,798 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-24 00:43:11,838 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:11,839 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:11,845 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-24 00:43:11,887 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-24 00:43:11,894 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4968430e80> has no local changes
2024-08-24 00:43:11,895 [ 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#162 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/)'
2024-08-24 00:43:11,903 [ scc.git] DEBUG [detached HEAD 012bf0e] merge master -Dorg -Ssuccess-only
2024-08-24 00:43:11,903 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:11,903 [ scc.repo] DEBUG ## PRs found:
2024-08-24 00:43:12,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-08-24 00:43:12,177 [ scc.repo] DEBUG ## Branches found:
2024-08-24 00:43:12,177 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-24 00:43:12,177 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:12,177 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:12,184 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-24 00:43:12,189 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-24 00:43:12,190 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-24 00:43:12,195 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-24 00:43:12,200 [ scc.git] DEBUG Already up to date.
2024-08-24 00:43:12,200 [ scc.git] DEBUG ## Unique users: []
2024-08-24 00:43:12,200 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:12,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:12,205 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-24 00:43:12,247 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:12,247 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:12,253 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-24 00:43:12,294 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-24 00:43:12,301 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f496847dd30> has no local changes
2024-08-24 00:43:12,301 [ 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#162 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/)'
2024-08-24 00:43:12,310 [ scc.git] DEBUG [detached HEAD c6cdb3f] merge master -Dorg -Ssuccess-only
2024-08-24 00:43:12,311 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:12,311 [ scc.git] INFO Overriding base-branch from master to main
2024-08-24 00:43:12,311 [ scc.repo] DEBUG ## PRs found:
2024-08-24 00:43:12,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-08-24 00:43:13,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-08-24 00:43:13,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-08-24 00:43:14,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-08-24 00:43:14,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-24 00:43:15,026 [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-08-24 00:43:15,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-08-24 00:43:15,924 [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-08-24 00:43:15,925 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-24 00:43:15,925 [ scc.repo] DEBUG ## Branches found:
2024-08-24 00:43:15,925 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-24 00:43:15,925 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:15,926 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:15,932 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-08-24 00:43:15,937 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-24 00:43:15,938 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-08-24 00:43:15,944 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-08-24 00:43:15,950 [ scc.git] DEBUG Already up to date.
2024-08-24 00:43:15,951 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-08-24 00:43:16,247 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-08-24 00:43:16,247 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-08-24 00:43:16,253 [ scc.git] DEBUG ## Unique users: []
2024-08-24 00:43:16,254 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:16,254 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:16,261 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-24 00:43:16,268 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:16,274 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-24 00:43:16,317 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-08-24 00:43:16,317 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-08-24 00:43:16,317 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-24 00:43:16,318 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-24 00:43:16,325 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-24 00:43:16,331 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-08-24 00:43:16,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:16,476 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-08-24 00:43:16,483 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-08-24 00:43:16,488 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#162](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-08-24 00:43:16,493 [ scc.config] DEBUG Found github.token
2024-08-24 00:43:16,493 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-08-24 00:43:16,494 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-24 00:43:16,537 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:16,539 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:16,548 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-24 00:43:16,593 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-24 00:43:16,601 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4968477f40> has no local changes
2024-08-24 00:43:16,601 [ 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#162 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/)'
2024-08-24 00:43:16,611 [ scc.git] DEBUG [detached HEAD 4af3131] merge master -Dorg -Ssuccess-only
2024-08-24 00:43:16,612 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:16,612 [ scc.repo] DEBUG ## PRs found:
2024-08-24 00:43:16,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-08-24 00:43:16,876 [ scc.repo] DEBUG ## Branches found:
2024-08-24 00:43:16,876 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-24 00:43:16,876 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:16,876 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:16,882 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-24 00:43:16,888 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-24 00:43:16,888 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-24 00:43:16,893 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-24 00:43:16,899 [ scc.git] DEBUG Already up to date.
2024-08-24 00:43:16,899 [ scc.git] DEBUG ## Unique users: []
2024-08-24 00:43:16,899 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:16,899 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:16,904 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-24 00:43:16,945 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:16,946 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:16,951 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-24 00:43:16,997 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-24 00:43:17,004 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f496841e7c0> has no local changes
2024-08-24 00:43:17,005 [ 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#162 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/)'
2024-08-24 00:43:17,014 [ scc.git] DEBUG [detached HEAD 017c076] merge master -Dorg -Ssuccess-only
2024-08-24 00:43:17,014 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:17,014 [ scc.repo] DEBUG ## PRs found:
2024-08-24 00:43:17,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-08-24 00:43:17,279 [ scc.repo] DEBUG ## Branches found:
2024-08-24 00:43:17,279 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-24 00:43:17,279 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:17,279 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:17,285 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-24 00:43:17,291 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-24 00:43:17,291 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-24 00:43:17,303 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-24 00:43:17,312 [ scc.git] DEBUG Already up to date.
2024-08-24 00:43:17,312 [ scc.git] DEBUG ## Unique users: []
2024-08-24 00:43:17,312 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:17,312 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:17,318 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-24 00:43:17,362 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:17,362 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:17,368 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-24 00:43:17,411 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-24 00:43:17,419 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f49683d6490> has no local changes
2024-08-24 00:43:17,419 [ 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#162 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/)'
2024-08-24 00:43:17,429 [ scc.git] DEBUG [detached HEAD c60af29] merge master -Dorg -Ssuccess-only
2024-08-24 00:43:17,429 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:17,429 [ scc.repo] DEBUG ## PRs found:
2024-08-24 00:43:17,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-08-24 00:43:18,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-08-24 00:43:18,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-08-24 00:43:19,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-24 00:43:19,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-08-24 00:43:20,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-08-24 00:43:20,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-08-24 00:43:20,440 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-08-24 00:43:20,440 [ scc.repo] DEBUG ## Branches found:
2024-08-24 00:43:20,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-24 00:43:20,440 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:20,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:20,450 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-08-24 00:43:20,461 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-24 00:43:20,462 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-08-24 00:43:20,472 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-08-24 00:43:20,482 [ scc.git] DEBUG Already up to date.
2024-08-24 00:43:20,483 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-08-24 00:43:20,858 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-08-24 00:43:20,858 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-08-24 00:43:20,865 [ scc.git] DEBUG ## Unique users: []
2024-08-24 00:43:20,865 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:20,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:20,875 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-24 00:43:20,885 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:20,894 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-24 00:43:20,926 [ scc.git] DEBUG Auto-merging Dockerfile
2024-08-24 00:43:20,927 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-08-24 00:43:20,927 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-24 00:43:20,927 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-24 00:43:20,939 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-24 00:43:20,950 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-08-24 00:43:21,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:21,079 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-08-24 00:43:21,088 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-08-24 00:43:21,098 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#162](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-08-24 00:43:21,107 [ scc.config] DEBUG Found github.token
2024-08-24 00:43:21,108 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-08-24 00:43:21,108 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-24 00:43:21,157 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:21,158 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:21,167 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-24 00:43:21,230 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-24 00:43:21,243 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f49683f98b0> has no local changes
2024-08-24 00:43:21,243 [ 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#162 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/)'
2024-08-24 00:43:21,256 [ scc.git] DEBUG [detached HEAD 77ed9cd] merge master -Dorg -Ssuccess-only
2024-08-24 00:43:21,256 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:21,257 [ scc.git] INFO Overriding base-branch from master to develop
2024-08-24 00:43:21,257 [ scc.repo] DEBUG ## PRs found:
2024-08-24 00:43:21,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-08-24 00:43:22,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-08-24 00:43:22,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-08-24 00:43:23,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-08-24 00:43:23,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-08-24 00:43:23,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-08-24 00:43:24,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-08-24 00:43:24,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-24 00:43:25,210 [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-08-24 00:43:25,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-08-24 00:43:26,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-08-24 00:43:26,141 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-24 00:43:26,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-08-24 00:43:27,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-08-24 00:43:27,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-08-24 00:43:27,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-08-24 00:43:27,957 [ scc.repo] DEBUG ## Branches found:
2024-08-24 00:43:27,958 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-24 00:43:27,958 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:27,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:27,965 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-08-24 00:43:27,971 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-08-24 00:43:27,972 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-08-24 00:43:27,979 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-08-24 00:43:27,987 [ scc.git] DEBUG Already up to date.
2024-08-24 00:43:27,987 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-08-24 00:43:28,485 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-08-24 00:43:28,485 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-08-24 00:43:28,491 [ scc.git] DEBUG ## Unique users: []
2024-08-24 00:43:28,491 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:28,491 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:28,499 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-24 00:43:28,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:28,513 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-24 00:43:28,554 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-08-24 00:43:28,554 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-08-24 00:43:28,555 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-08-24 00:43:28,555 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-08-24 00:43:28,563 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-24 00:43:28,570 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-08-24 00:43:28,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:28,733 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-08-24 00:43:28,742 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-08-24 00:43:28,749 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#162](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-08-24 00:43:28,755 [ scc.config] DEBUG Found github.token
2024-08-24 00:43:28,755 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-08-24 00:43:28,755 [ scc.git] DEBUG Calling 'git submodule update'
2024-08-24 00:43:28,800 [ scc.git] DEBUG Get sha1 of %s
2024-08-24 00:43:28,800 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-08-24 00:43:28,811 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-24 00:43:28,855 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-24 00:43:28,864 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f49683f95b0> has no local changes
2024-08-24 00:43:28,864 [ 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#162 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/)'
2024-08-24 00:43:28,874 [ scc.git] DEBUG [detached HEAD db06f68] merge master -Dorg -Ssuccess-only
2024-08-24 00:43:28,875 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:28,875 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-08-24 00:43:28,968 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-08-24 00:43:29,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:29,127 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-08-24 00:43:29,132 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-08-24 00:43:29,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:29,513 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-08-24 00:43:29,518 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-08-24 00:43:29,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:29,905 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-08-24 00:43:29,912 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-08-24 00:43:30,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:30,281 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-08-24 00:43:30,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:30,664 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-08-24 00:43:30,672 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-08-24 00:43:31,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:31,059 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-08-24 00:43:31,065 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-08-24 00:43:31,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:31,466 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-08-24 00:43:31,471 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-08-24 00:43:31,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:31,850 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-08-24 00:43:31,858 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-08-24 00:43:32,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:32,241 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-08-24 00:43:32,247 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-08-24 00:43:32,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:32,625 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-08-24 00:43:32,630 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-08-24 00:43:32,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:33,014 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-08-24 00:43:33,018 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-08-24 00:43:33,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:33,402 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-08-24 00:43:33,408 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-08-24 00:43:33,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:33,820 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-08-24 00:43:34,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:34,202 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-08-24 00:43:34,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:34,580 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-08-24 00:43:34,585 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-08-24 00:43:34,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:34,971 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-08-24 00:43:35,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:35,365 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-08-24 00:43:35,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:35,750 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-08-24 00:43:35,759 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-08-24 00:43:36,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:36,198 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-08-24 00:43:36,204 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-08-24 00:43:36,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:36,587 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-08-24 00:43:36,595 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-08-24 00:43:36,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:36,991 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-08-24 00:43:36,999 [ scc.config] DEBUG Found submodule.scripts.url
2024-08-24 00:43:37,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-08-24 00:43:37,374 [ scc.config] DEBUG Found submodule.scripts.branch
2024-08-24 00:43:37,374 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-08-24 00:43:37,477 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f496962d790> has local changes
2024-08-24 00:43:37,478 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 387 dependabot[bot] 'Bump omero-figure from `47f4948` to `cbdd365`'
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 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View' (user: MinaEnayat)
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 578 Rdornier 'Image outline' (user: Rdornier)
- PR 577 Rdornier 'Fill rois' (user: Rdornier)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 560 will-moore 'Max projection bytes'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
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'
Repository: ome/omero-mapr
Excluded PRs:
- PR 85 sbesson 'Add support for OMERO.web 5.27.0' (status: failure)
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 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#162 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/162/)'
2024-08-24 00:43:37,495 [ scc.git] DEBUG [detached HEAD 27ab7a0] merge master -Dorg -Ssuccess-only
2024-08-24 00:43:37,496 [ scc.merge] INFO Repository: ome/omero-plugins
2024-08-24 00:43:37,496 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-08-24 00:43:37,496 [ scc.merge] INFO Already up to date.
2024-08-24 00:43:37,496 [ scc.merge] INFO
2024-08-24 00:43:37,496 [ scc.merge] INFO Merged PRs:
2024-08-24 00:43:37,497 [ scc.merge] INFO - PR 387 dependabot[bot] 'Bump omero-figure from `47f4948` to `cbdd365`'
2024-08-24 00:43:37,497 [ scc.merge] INFO
2024-08-24 00:43:37,497 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-08-24 00:43:37,497 [ scc.merge] INFO Already up to date.
2024-08-24 00:43:37,497 [ scc.merge] INFO
2024-08-24 00:43:37,497 [ scc.merge] INFO Merged PRs:
2024-08-24 00:43:37,497 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-08-24 00:43:37,497 [ scc.merge] INFO
2024-08-24 00:43:37,497 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-08-24 00:43:37,497 [ scc.merge] INFO Excluded PRs:
2024-08-24 00:43:37,497 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-08-24 00:43:37,497 [ scc.merge] INFO Already up to date.
2024-08-24 00:43:37,497 [ scc.merge] INFO
2024-08-24 00:43:37,497 [ scc.merge] INFO Merged PRs:
2024-08-24 00:43:37,497 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-08-24 00:43:37,497 [ scc.merge] INFO
2024-08-24 00:43:37,497 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-08-24 00:43:37,497 [ scc.merge] INFO Excluded PRs:
2024-08-24 00:43:37,497 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-08-24 00:43:37,497 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-08-24 00:43:37,497 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-08-24 00:43:37,497 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-08-24 00:43:37,497 [ scc.merge] INFO Already up to date.
2024-08-24 00:43:37,497 [ scc.merge] INFO
2024-08-24 00:43:37,497 [ scc.merge] INFO Merged PRs:
2024-08-24 00:43:37,497 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-08-24 00:43:37,498 [ scc.merge] INFO
2024-08-24 00:43:37,498 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-08-24 00:43:37,498 [ scc.merge] INFO Excluded PRs:
2024-08-24 00:43:37,498 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-24 00:43:37,498 [ scc.merge] INFO Already up to date.
2024-08-24 00:43:37,498 [ scc.merge] INFO
2024-08-24 00:43:37,498 [ scc.merge] INFO Merged PRs:
2024-08-24 00:43:37,498 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-08-24 00:43:37,498 [ scc.merge] INFO
2024-08-24 00:43:37,498 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-24 00:43:37,498 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-08-24 00:43:37,498 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-08-24 00:43:37,498 [ scc.merge] INFO
2024-08-24 00:43:37,498 [ scc.merge] INFO Repository: ome/omero-figure
2024-08-24 00:43:37,498 [ scc.merge] INFO Excluded PRs:
2024-08-24 00:43:37,498 [ scc.merge] INFO - PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View' (user: MinaEnayat)
2024-08-24 00:43:37,498 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-08-24 00:43:37,498 [ scc.merge] INFO - PR 578 Rdornier 'Image outline' (user: Rdornier)
2024-08-24 00:43:37,498 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois' (user: Rdornier)
2024-08-24 00:43:37,498 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-08-24 00:43:37,498 [ scc.merge] INFO Already up to date.
2024-08-24 00:43:37,498 [ scc.merge] INFO
2024-08-24 00:43:37,498 [ scc.merge] INFO Merged PRs:
2024-08-24 00:43:37,498 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-08-24 00:43:37,498 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-08-24 00:43:37,498 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes'
2024-08-24 00:43:37,499 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-08-24 00:43:37,499 [ scc.merge] INFO
2024-08-24 00:43:37,499 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-08-24 00:43:37,499 [ scc.merge] INFO Already up to date.
2024-08-24 00:43:37,499 [ scc.merge] INFO
2024-08-24 00:43:37,499 [ scc.merge] INFO Merged PRs:
2024-08-24 00:43:37,499 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-08-24 00:43:37,499 [ scc.merge] INFO
2024-08-24 00:43:37,499 [ scc.merge] INFO Repository: ome/omero-gallery
2024-08-24 00:43:37,499 [ scc.merge] INFO Already up to date.
2024-08-24 00:43:37,499 [ scc.merge] INFO
2024-08-24 00:43:37,499 [ scc.merge] INFO Merged PRs:
2024-08-24 00:43:37,499 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-08-24 00:43:37,499 [ scc.merge] INFO
2024-08-24 00:43:37,499 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-08-24 00:43:37,499 [ scc.merge] INFO Excluded PRs:
2024-08-24 00:43:37,499 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-08-24 00:43:37,499 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-08-24 00:43:37,499 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-08-24 00:43:37,499 [ scc.merge] INFO Already up to date.
2024-08-24 00:43:37,499 [ scc.merge] INFO
2024-08-24 00:43:37,499 [ scc.merge] INFO Merged PRs:
2024-08-24 00:43:37,499 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-08-24 00:43:37,499 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-08-24 00:43:37,499 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-08-24 00:43:37,499 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-08-24 00:43:37,500 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-08-24 00:43:37,500 [ scc.merge] INFO - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-08-24 00:43:37,500 [ scc.merge] INFO
2024-08-24 00:43:37,500 [ scc.merge] INFO Repository: ome/omero-mapr
2024-08-24 00:43:37,500 [ scc.merge] INFO Excluded PRs:
2024-08-24 00:43:37,500 [ scc.merge] INFO - PR 85 sbesson 'Add support for OMERO.web 5.27.0' (status: failure)
2024-08-24 00:43:37,500 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-08-24 00:43:37,500 [ scc.merge] INFO Already up to date.
2024-08-24 00:43:37,500 [ scc.merge] INFO
2024-08-24 00:43:37,500 [ scc.merge] INFO Merged PRs:
2024-08-24 00:43:37,500 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-08-24 00:43:37,500 [ scc.merge] INFO
2024-08-24 00:43:37,500 [ scc.merge] INFO Repository: ome/omero-metadata
2024-08-24 00:43:37,500 [ scc.merge] INFO Already up to date.
2024-08-24 00:43:37,500 [ scc.merge] INFO
2024-08-24 00:43:37,500 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-24 00:43:37,500 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-08-24 00:43:37,500 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-08-24 00:43:37,500 [ scc.merge] INFO
2024-08-24 00:43:37,500 [ scc.merge] INFO Repository: ome/omero-parade
2024-08-24 00:43:37,500 [ scc.merge] INFO Excluded PRs:
2024-08-24 00:43:37,500 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-08-24 00:43:37,500 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-08-24 00:43:37,500 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-08-24 00:43:37,501 [ scc.merge] INFO Already up to date.
2024-08-24 00:43:37,501 [ scc.merge] INFO
2024-08-24 00:43:37,501 [ scc.merge] INFO Merged PRs:
2024-08-24 00:43:37,501 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-08-24 00:43:37,501 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-08-24 00:43:37,501 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-08-24 00:43:37,501 [ scc.merge] INFO
2024-08-24 00:43:37,501 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-08-24 00:43:37,501 [ scc.merge] INFO Already up to date.
2024-08-24 00:43:37,501 [ scc.merge] INFO
2024-08-24 00:43:37,501 [ scc.merge] INFO Merged PRs:
2024-08-24 00:43:37,501 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-08-24 00:43:37,501 [ scc.merge] INFO
2024-08-24 00:43:37,501 [ scc.merge] INFO Repository: ome/omero-rois
2024-08-24 00:43:37,501 [ scc.merge] INFO Excluded PRs:
2024-08-24 00:43:37,501 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-08-24 00:43:37,501 [ scc.merge] INFO Already up to date.
2024-08-24 00:43:37,501 [ scc.merge] INFO
2024-08-24 00:43:37,501 [ scc.merge] INFO Merged PRs:
2024-08-24 00:43:37,501 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-08-24 00:43:37,501 [ scc.merge] INFO
2024-08-24 00:43:37,501 [ scc.merge] INFO Repository: ome/omero-signup
2024-08-24 00:43:37,501 [ scc.merge] INFO Already up to date.
2024-08-24 00:43:37,501 [ scc.merge] INFO
2024-08-24 00:43:37,501 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-24 00:43:37,502 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-08-24 00:43:37,502 [ scc.merge] INFO
2024-08-24 00:43:37,502 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-08-24 00:43:37,502 [ scc.merge] INFO Already up to date.
2024-08-24 00:43:37,502 [ scc.merge] INFO
2024-08-24 00:43:37,502 [ scc.merge] INFO Merged PRs:
2024-08-24 00:43:37,502 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-08-24 00:43:37,502 [ scc.merge] INFO
2024-08-24 00:43:37,502 [ scc.merge] INFO Repository: ome/omero-upload
2024-08-24 00:43:37,502 [ scc.merge] INFO Already up to date.
2024-08-24 00:43:37,502 [ scc.merge] INFO
2024-08-24 00:43:37,502 [ scc.merge] INFO
2024-08-24 00:43:37,502 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-08-24 00:43:37,502 [ scc.merge] INFO Already up to date.
2024-08-24 00:43:37,502 [ scc.merge] INFO
2024-08-24 00:43:37,502 [ scc.merge] INFO
2024-08-24 00:43:37,502 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-08-24 00:43:37,502 [ scc.merge] INFO Excluded PRs:
2024-08-24 00:43:37,502 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-08-24 00:43:37,502 [ scc.merge] INFO Already up to date.
2024-08-24 00:43:37,502 [ scc.merge] INFO
2024-08-24 00:43:37,502 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-24 00:43:37,502 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-08-24 00:43:37,502 [ scc.merge] INFO
2024-08-24 00:43:37,502 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-08-24 00:43:37,502 [ scc.merge] INFO Already up to date.
2024-08-24 00:43:37,503 [ scc.merge] INFO
2024-08-24 00:43:37,503 [ scc.merge] INFO
2024-08-24 00:43:37,503 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-08-24 00:43:37,503 [ scc.merge] INFO Already up to date.
2024-08-24 00:43:37,503 [ scc.merge] INFO
2024-08-24 00:43:37,503 [ scc.merge] INFO
2024-08-24 00:43:37,503 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-08-24 00:43:37,503 [ scc.merge] INFO Already up to date.
2024-08-24 00:43:37,503 [ scc.merge] INFO
2024-08-24 00:43:37,503 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-24 00:43:37,503 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-08-24 00:43:37,503 [ scc.merge] INFO
2024-08-24 00:43:37,503 [ scc.merge] INFO Repository: ome/scripts
2024-08-24 00:43:37,503 [ scc.merge] INFO Excluded PRs:
2024-08-24 00:43:37,503 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-08-24 00:43:37,503 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-08-24 00:43:37,503 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-08-24 00:43:37,503 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-08-24 00:43:37,503 [ scc.merge] INFO Already up to date.
2024-08-24 00:43:37,503 [ scc.merge] INFO
2024-08-24 00:43:37,503 [ scc.merge] INFO Conflicting PRs (not included):
2024-08-24 00:43:37,503 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-08-24 00:43:37,504 [ scc.merge] INFO
2024-08-24 00:43:37,504 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-08-24 00:43:37,504 [ scc.git] DEBUG Calling 'git remote'
2024-08-24 00:43:37,512 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-08-24 00:43:37,513 [ scc.git] DEBUG Calling 'git remote'
2024-08-24 00:43:37,522 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:37,522 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-08-24 00:43:37,522 [ scc.git] DEBUG Calling 'git remote'
2024-08-24 00:43:37,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:37,530 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-08-24 00:43:37,530 [ scc.git] DEBUG Calling 'git remote'
2024-08-24 00:43:37,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:37,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-08-24 00:43:37,536 [ scc.git] DEBUG Calling 'git remote'
2024-08-24 00:43:37,543 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:37,544 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-08-24 00:43:37,544 [ scc.git] DEBUG Calling 'git remote'
2024-08-24 00:43:37,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:37,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-08-24 00:43:37,551 [ scc.git] DEBUG Calling 'git remote'
2024-08-24 00:43:37,558 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:37,558 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-08-24 00:43:37,558 [ scc.git] DEBUG Calling 'git remote'
2024-08-24 00:43:37,565 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:37,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-08-24 00:43:37,566 [ scc.git] DEBUG Calling 'git remote'
2024-08-24 00:43:37,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:37,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-08-24 00:43:37,572 [ scc.git] DEBUG Calling 'git remote'
2024-08-24 00:43:37,578 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:37,578 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-08-24 00:43:37,578 [ scc.git] DEBUG Calling 'git remote'
2024-08-24 00:43:37,584 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:37,584 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-08-24 00:43:37,584 [ scc.git] DEBUG Calling 'git remote'
2024-08-24 00:43:37,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:37,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-08-24 00:43:37,590 [ scc.git] DEBUG Calling 'git remote'
2024-08-24 00:43:37,596 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:37,596 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-08-24 00:43:37,596 [ scc.git] DEBUG Calling 'git remote'
2024-08-24 00:43:37,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:37,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-08-24 00:43:37,602 [ scc.git] DEBUG Calling 'git remote'
2024-08-24 00:43:37,608 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:37,609 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-08-24 00:43:37,609 [ scc.git] DEBUG Calling 'git remote'
2024-08-24 00:43:37,614 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:37,615 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-08-24 00:43:37,615 [ scc.git] DEBUG Calling 'git remote'
2024-08-24 00:43:37,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:37,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-08-24 00:43:37,621 [ scc.git] DEBUG Calling 'git remote'
2024-08-24 00:43:37,628 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:37,629 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-08-24 00:43:37,629 [ scc.git] DEBUG Calling 'git remote'
2024-08-24 00:43:37,635 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:37,635 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-08-24 00:43:37,635 [ scc.git] DEBUG Calling 'git remote'
2024-08-24 00:43:37,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:37,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-08-24 00:43:37,641 [ scc.git] DEBUG Calling 'git remote'
2024-08-24 00:43:37,647 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:37,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-08-24 00:43:37,648 [ scc.git] DEBUG Calling 'git remote'
2024-08-24 00:43:37,655 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-08-24 00:43:37,655 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-08-24 00:43:37,655 [ scc.git] DEBUG Calling 'git remote'
2024-08-24 00:43:37,664 [ 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.3-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD 4228fa0] 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 cbdd3657
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 a37649d] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-08-24 00:44:23,710 [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-08-24 00:44:32,582 [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-08-24 00:44:34,861 [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-08-24 00:44:39,251 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-08-24 00:45:20,155 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/58f98332/images/svgs/logo.svg){kind=logo}
