Skipping 113 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-04-18 00:41:28,699 [ scc.git] DEBUG ...modal_roi.html => crop_modal_roi.template.html} | 0
2024-04-18 00:41:28,699 [ scc.git] DEBUG ...mplate.html => paper_setup_modal.template.html} | 103 +-
2024-04-18 00:41:28,699 [ scc.git] DEBUG ...mplate.html => preview_id_change.template.html} | 54 +-
2024-04-18 00:41:28,699 [ scc.git] DEBUG ..._modal_roi.html => roi_modal_roi.template.html} | 4 +-
2024-04-18 00:41:28,699 [ scc.git] DEBUG ...al_shape.html => roi_modal_shape.template.html} | 0
2024-04-18 00:41:28,699 [ scc.git] DEBUG ...t_buttons.html => roi_zt_buttons.template.html} | 4 +-
2024-04-18 00:41:28,699 [ scc.git] DEBUG src/templates/rois_form.template.html | 94 +
2024-04-18 00:41:28,699 [ scc.git] DEBUG src/templates/rois_form_template.html | 93 -
2024-04-18 00:41:28,699 [ scc.git] DEBUG src/templates/scalebar_form.template.html | 143 +
2024-04-18 00:41:28,699 [ scc.git] DEBUG src/templates/scalebar_form_template.html | 143 -
2024-04-18 00:41:28,699 [ scc.git] DEBUG ..._template.html => scalebar_panel.template.html} | 0
2024-04-18 00:41:28,699 [ scc.git] DEBUG ...r_template.html => shape_toolbar.template.html} | 62 +-
2024-04-18 00:41:28,699 [ scc.git] DEBUG src/templates/viewport.template.html | 5 +
2024-04-18 00:41:28,699 [ scc.git] DEBUG ..._template.html => viewport_inner.template.html} | 0
2024-04-18 00:41:28,699 [ scc.git] DEBUG src/templates/viewport_template.html | 9 -
2024-04-18 00:41:28,699 [ scc.git] DEBUG ...anel_template.html => xywh_panel.template.html} | 30 +-
2024-04-18 00:41:28,699 [ scc.git] DEBUG ..._crop_template.html => zoom_crop.template.html} | 10 +-
2024-04-18 00:41:28,699 [ scc.git] DEBUG vite.config.js | 21 +
2024-04-18 00:41:28,699 [ scc.git] DEBUG 136 files changed, 7924 insertions(+), 32992 deletions(-)
2024-04-18 00:41:28,699 [ scc.git] DEBUG delete mode 100644 Dockerfile
2024-04-18 00:41:28,699 [ scc.git] DEBUG delete mode 100644 Gruntfile.js
2024-04-18 00:41:28,699 [ scc.git] DEBUG create mode 100755 deploy_build.sh
2024-04-18 00:41:28,699 [ scc.git] DEBUG delete mode 100644 docs/demo/index.html
2024-04-18 00:41:28,699 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/backbone-1.0.0.js
2024-04-18 00:41:28,699 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/backbone.mousetrap/README.md
2024-04-18 00:41:28,699 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/css/bootstrap.css
2024-04-18 00:41:28,699 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/css/bootstrap.min.css
2024-04-18 00:41:28,699 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.eot
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.svg
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.ttf
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.woff
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/js/bootstrap.js
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/js/bootstrap.min.js
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.css
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.js
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-1.11.1/jquery.min.js
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.base.css
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.slider.css
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/jquery-ui.min.js
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/json2.js
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.js
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.min.js
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/mousetrap-1.5.3/mousetrap.min.js
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael-min.js
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael.js
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/scaleraphael.js
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/underscore-1.13.1-umd-min.js
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100644 omero_figure/templates/figure/index.html
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100644 spec/ViewportViewSpec.js
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100644 spec/images/testImage.png
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100644 spec/javascripts/PanelSpec.js
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100644 spec/javascripts/ViewportViewSpec.js
2024-04-18 00:41:28,700 [ scc.git] DEBUG delete mode 100644 spec/javascripts/fixtures/previewTab.html
2024-04-18 00:41:28,700 [ scc.git] DEBUG create mode 100644 src/.env
2024-04-18 00:41:28,700 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/css/figure.css (70%)
2024-04-18 00:41:28,700 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/arrow-icon-16.png (100%)
2024-04-18 00:41:28,700 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-04-18 00:41:28,701 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-04-18 00:41:28,701 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-04-18 00:41:28,701 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-04-18 00:41:28,701 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-04-18 00:41:28,701 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-04-18 00:41:28,701 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-04-18 00:41:28,701 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-04-18 00:41:28,701 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-04-18 00:41:28,701 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-18 00:41:28,701 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-04-18 00:41:28,701 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-04-18 00:41:28,701 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-04-18 00:41:28,701 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-04-18 00:41:28,701 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-04-18 00:41:28,701 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-04-18 00:41:28,701 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-04-18 00:41:28,701 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-04-18 00:41:28,701 [ scc.git] DEBUG create mode 100644 src/index.html
2024-04-18 00:41:28,701 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-04-18 00:41:28,701 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-04-18 00:41:28,701 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-04-18 00:41:28,701 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-04-18 00:41:28,701 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-04-18 00:41:28,701 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-04-18 00:41:28,701 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-04-18 00:41:28,701 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-04-18 00:41:28,701 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-04-18 00:41:28,701 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-18 00:41:28,701 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-04-18 00:41:28,701 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-04-18 00:41:28,701 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-04-18 00:41:28,701 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-04-18 00:41:28,701 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-04-18 00:41:28,701 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-04-18 00:41:28,701 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-04-18 00:41:28,702 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-04-18 00:41:28,702 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-04-18 00:41:28,702 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-04-18 00:41:28,702 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-04-18 00:41:28,702 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-04-18 00:41:28,702 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-04-18 00:41:28,702 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-04-18 00:41:28,702 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-04-18 00:41:28,702 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-04-18 00:41:28,702 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-04-18 00:41:28,702 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-04-18 00:41:28,702 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-04-18 00:41:28,702 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-04-18 00:41:28,702 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-04-18 00:41:28,702 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-04-18 00:41:28,702 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-04-18 00:41:28,702 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-04-18 00:41:28,702 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-04-18 00:41:28,702 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-04-18 00:41:28,702 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-04-18 00:41:28,702 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-04-18 00:41:28,702 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-04-18 00:41:28,702 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-04-18 00:41:28,702 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-04-18 00:41:28,702 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-04-18 00:41:28,702 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-04-18 00:41:28,702 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-04-18 00:41:28,702 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-04-18 00:41:28,702 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-04-18 00:41:28,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:41:28,862 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:41:28,906 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:41:28,906 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:41:28,912 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:41:28,962 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:41:28,977 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f661cbafbe0> has no local changes
2024-04-18 00:41:28,978 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 549 will-moore 'Inset feature' (stage: draft)
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
Generated by OMERO-plugins-push#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/)'
2024-04-18 00:41:28,995 [ scc.git] DEBUG [detached HEAD dcfe1d73] merge master -Dorg -Ssuccess-only
2024-04-18 00:41:28,996 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:41:28,996 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:41:29,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-04-18 00:41:29,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-04-18 00:41:30,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-04-18 00:41:30,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-18 00:41:31,265 [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-04-18 00:41:31,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-18 00:41:32,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:41:32,192 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-04-18 00:41:32,193 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:41:32,193 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-18 00:41:32,193 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:41:32,193 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:41:32,199 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:41:32,205 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:41:32,205 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:41:32,211 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:41:32,217 [ scc.git] DEBUG Already up to date.
2024-04-18 00:41:32,217 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-04-18 00:41:32,635 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-04-18 00:41:32,635 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-04-18 00:41:32,640 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:41:32,640 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:41:32,640 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:41:32,646 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-18 00:41:32,653 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:41:32,658 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-18 00:41:32,682 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-04-18 00:41:32,683 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:41:32,685 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-04-18 00:41:32,686 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-18 00:41:32,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:41:32,830 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:41:32,870 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:41:32,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:41:32,875 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:41:32,914 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:41:32,921 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f661cb66550> has no local changes
2024-04-18 00:41:32,921 [ 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/)'
2024-04-18 00:41:32,931 [ scc.git] DEBUG [detached HEAD 20dd45b] merge master -Dorg -Ssuccess-only
2024-04-18 00:41:32,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:41:32,932 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:41:33,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-04-18 00:41:33,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-04-18 00:41:33,786 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-18 00:41:34,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-18 00:41:34,835 [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-04-18 00:41:35,327 [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-04-18 00:41:35,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-18 00:41:36,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:41:36,282 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-18 00:41:36,282 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:41:36,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-18 00:41:36,282 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:41:36,282 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:41:36,288 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:41:36,295 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:41:36,296 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:41:36,303 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:41:36,310 [ scc.git] DEBUG Already up to date.
2024-04-18 00:41:36,311 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-04-18 00:41:36,728 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-04-18 00:41:36,729 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-04-18 00:41:36,733 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:41:36,733 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:41:36,733 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:41:36,739 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-18 00:41:36,746 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:41:36,753 [ 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-04-18 00:41:36,764 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:41:36,769 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-04-18 00:41:36,769 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-04-18 00:41:36,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:41:36,930 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:41:36,981 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:41:36,981 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:41:36,987 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:41:37,033 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:41:37,042 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f661cb6e820> has no local changes
2024-04-18 00:41:37,042 [ 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/)'
2024-04-18 00:41:37,054 [ scc.git] DEBUG [detached HEAD 5478364] merge master -Dorg -Ssuccess-only
2024-04-18 00:41:37,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:41:37,055 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:41:37,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-04-18 00:41:37,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470 HTTP/1.1" 200 None
2024-04-18 00:41:38,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470/comments HTTP/1.1" 200 None
2024-04-18 00:41:38,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/44025ed69514a02ecbc5d4655d3da7519ebf9170 HTTP/1.1" 200 None
2024-04-18 00:41:39,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/44025ed69514a02ecbc5d4655d3da7519ebf9170/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:41:39,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/44025ed69514a02ecbc5d4655d3da7519ebf9170/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-18 00:41:40,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/44025ed69514a02ecbc5d4655d3da7519ebf9170 HTTP/1.1" 200 None
2024-04-18 00:41:40,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/44025ed69514a02ecbc5d4655d3da7519ebf9170?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:41:40,680 [ scc.repo] DEBUG - PR 470 will-moore 'Movie playing waits for planes'
2024-04-18 00:41:41,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-04-18 00:41:41,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-18 00:41:42,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:41:42,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-18 00:41:42,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-18 00:41:43,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/ca8b5aabef9a5358f93add750f4cbb51c864b7fe?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:41:43,409 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-04-18 00:41:43,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-04-18 00:41:44,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-04-18 00:41:44,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-18 00:41:45,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:41:45,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-18 00:41:46,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-18 00:41:46,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/409c3429dd72d05fef895dcca6d133f8340eabf4?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:41:46,641 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-04-18 00:41:47,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-04-18 00:41:47,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-04-18 00:41:48,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-18 00:41:48,449 [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-04-18 00:41:48,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-18 00:41:49,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:41:49,317 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-04-18 00:41:49,317 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:41:49,317 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-18 00:41:49,317 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:41:49,318 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:41:49,323 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:41:49,329 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:41:49,330 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:41:49,336 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:41:49,342 [ scc.git] DEBUG Already up to date.
2024-04-18 00:41:49,343 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-04-18 00:41:49,772 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-18 00:41:49,773 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-04-18 00:41:49,778 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-04-18 00:41:50,596 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-18 00:41:50,596 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-04-18 00:41:50,602 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-04-18 00:41:51,022 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-18 00:41:51,023 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-04-18 00:41:51,028 [ scc.git] DEBUG Calling 'git fetch origin pull/470/head'
2024-04-18 00:41:51,729 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-18 00:41:51,730 [ scc.git] DEBUG * branch refs/pull/470/head -> FETCH_HEAD
2024-04-18 00:41:51,733 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:41:51,733 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:41:51,733 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:41:51,738 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-18 00:41:51,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:41:51,750 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-18 00:41:51,763 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:41:51,766 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-04-18 00:41:51,766 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-04-18 00:41:51,766 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-04-18 00:41:51,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:41:51,928 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-18 00:41:51,937 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:41:51,943 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-18 00:41:51,975 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:41:51,980 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-04-18 00:41:51,980 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-04-18 00:41:51,980 [ scc.git] DEBUG src/app/header.html | 5 +
2024-04-18 00:41:51,980 [ scc.git] DEBUG src/app/header.js | 46 ++++++++-
2024-04-18 00:41:51,980 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-04-18 00:41:51,980 [ scc.git] DEBUG src/utils/figure.js | 220 ++++++++++++++++++++++++++++++++++++++++++
2024-04-18 00:41:51,981 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 1 -
2024-04-18 00:41:51,981 [ scc.git] DEBUG 7 files changed, 294 insertions(+), 7 deletions(-)
2024-04-18 00:41:51,981 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-04-18 00:41:52,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:41:52,328 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-18 00:41:52,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:41:52,340 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-18 00:41:52,353 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:41:52,355 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-04-18 00:41:52,355 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-04-18 00:41:52,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:41:52,722 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...44025ed69514a02ecbc5d4655d3da7519ebf9170'
2024-04-18 00:41:52,729 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:41:52,735 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 470 (Movie playing waits for planes) 44025ed69514a02ecbc5d4655d3da7519ebf9170'
2024-04-18 00:41:52,753 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-04-18 00:41:52,753 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:41:52,759 [ scc.git] DEBUG css/app.css | 22 +++++
2024-04-18 00:41:52,759 [ scc.git] DEBUG src/events/events.js | 4 +
2024-04-18 00:41:52,759 [ scc.git] DEBUG src/index-dev.html | 6 +-
2024-04-18 00:41:52,759 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 2 +-
2024-04-18 00:41:52,760 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 160 ++++++++++++++++++++++++-------------
2024-04-18 00:41:52,760 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 42 +++++++++-
2024-04-18 00:41:52,760 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 15 +++-
2024-04-18 00:41:52,760 [ scc.git] DEBUG 7 files changed, 190 insertions(+), 61 deletions(-)
2024-04-18 00:41:53,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:41:53,127 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:41:53,167 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:41:53,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:41:53,172 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:41:53,212 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:41:53,222 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f661cb3d5b0> has no local changes
2024-04-18 00:41:53,223 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- 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 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
Generated by OMERO-plugins-push#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/)'
2024-04-18 00:41:53,233 [ scc.git] DEBUG [detached HEAD 1a4b3af] merge master -Dorg -Ssuccess-only
2024-04-18 00:41:53,233 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:41:53,233 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:41:53,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-04-18 00:41:54,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-04-18 00:41:54,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-04-18 00:41:55,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-18 00:41:55,721 [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-04-18 00:41:56,204 [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-04-18 00:41:56,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-18 00:41:57,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:41:57,106 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-04-18 00:41:57,106 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:41:57,106 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-18 00:41:57,106 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:41:57,107 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:41:57,113 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:41:57,118 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:41:57,118 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:41:57,124 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:41:57,130 [ scc.git] DEBUG Already up to date.
2024-04-18 00:41:57,130 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-04-18 00:41:57,514 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-04-18 00:41:57,514 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-04-18 00:41:57,519 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:41:57,519 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:41:57,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:41:57,525 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-18 00:41:57,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:41:57,538 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-18 00:41:57,549 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:41:57,552 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-04-18 00:41:57,552 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-04-18 00:41:57,552 [ scc.git] DEBUG requirements.txt | 2 +-
2024-04-18 00:41:57,552 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-04-18 00:41:57,552 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-04-18 00:41:57,552 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-04-18 00:41:57,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:41:57,713 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:41:57,749 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:41:57,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:41:57,755 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:41:57,794 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:41:57,802 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f661cb744f0> has no local changes
2024-04-18 00:41:57,803 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Generated by OMERO-plugins-push#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/)'
2024-04-18 00:41:57,814 [ scc.git] DEBUG [detached HEAD d875c8d] merge master -Dorg -Ssuccess-only
2024-04-18 00:41:57,814 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:41:57,815 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:41:58,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-04-18 00:41:58,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-04-18 00:41:59,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-04-18 00:41:59,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-18 00:42:00,183 [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-04-18 00:42:00,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-18 00:42:01,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:42:01,079 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-18 00:42:01,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-04-18 00:42:02,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-04-18 00:42:02,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-18 00:42:02,978 [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-04-18 00:42:03,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-18 00:42:03,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:42:03,860 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-18 00:42:03,860 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:42:03,860 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-18 00:42:03,860 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:03,860 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:03,866 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:42:03,871 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:42:03,871 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:42:03,877 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:42:03,883 [ scc.git] DEBUG Already up to date.
2024-04-18 00:42:03,884 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-04-18 00:42:04,430 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-18 00:42:04,430 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-04-18 00:42:04,435 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-04-18 00:42:04,963 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-18 00:42:04,963 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-04-18 00:42:04,968 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:42:04,968 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:04,968 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:04,974 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-18 00:42:04,982 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:04,987 [ 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-04-18 00:42:05,049 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-04-18 00:42:05,049 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-04-18 00:42:05,049 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-18 00:42:05,050 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-18 00:42:05,050 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-18 00:42:05,050 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-18 00:42:05,056 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-18 00:42:05,063 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-18 00:42:05,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:42:05,210 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-18 00:42:05,220 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-18 00:42:05,227 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#35](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-04-18 00:42:05,233 [ scc.config] DEBUG Found github.token
2024-04-18 00:42:05,234 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-04-18 00:42:05,234 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-18 00:42:05,242 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:05,248 [ 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-04-18 00:42:05,268 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-18 00:42:05,268 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-18 00:42:05,269 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-04-18 00:42:05,269 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-18 00:42:05,269 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-18 00:42:05,277 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-18 00:42:05,284 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-18 00:42:05,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:42:05,601 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-18 00:42:05,608 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-18 00:42:05,615 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#35](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/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-04-18 00:42:05,620 [ scc.config] DEBUG Found github.token
2024-04-18 00:42:05,620 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-04-18 00:42:05,620 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:42:05,659 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:05,660 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:05,666 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:42:05,707 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:42:05,716 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f661cb3d550> has no local changes
2024-04-18 00:42:05,716 [ 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/)'
2024-04-18 00:42:05,725 [ scc.git] DEBUG [detached HEAD 1c6d8b2] merge master -Dorg -Ssuccess-only
2024-04-18 00:42:05,726 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:42:05,726 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:42:06,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-04-18 00:42:06,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-04-18 00:42:06,659 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-18 00:42:07,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-18 00:42:07,722 [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-04-18 00:42:08,183 [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-04-18 00:42:08,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-18 00:42:09,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:42:09,201 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-18 00:42:09,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-04-18 00:42:09,665 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-18 00:42:10,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-18 00:42:10,733 [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-04-18 00:42:11,294 [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-04-18 00:42:11,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-18 00:42:12,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:42:12,271 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-18 00:42:12,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-04-18 00:42:12,761 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-18 00:42:13,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-18 00:42:13,767 [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-04-18 00:42:14,269 [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-04-18 00:42:14,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-18 00:42:15,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:42:15,237 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-18 00:42:15,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-04-18 00:42:16,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-04-18 00:42:16,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-04-18 00:42:17,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-04-18 00:42:17,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-04-18 00:42:18,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-04-18 00:42:18,056 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:42:18,057 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-18 00:42:18,057 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:18,057 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:18,064 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:42:18,070 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:42:18,070 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:42:18,077 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:42:18,089 [ scc.git] DEBUG Already up to date.
2024-04-18 00:42:18,089 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-04-18 00:42:18,481 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-18 00:42:18,481 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-04-18 00:42:18,487 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-04-18 00:42:18,887 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-18 00:42:18,888 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-04-18 00:42:18,895 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-18 00:42:19,330 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-18 00:42:19,330 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-18 00:42:19,338 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:42:19,338 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:19,338 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:19,348 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-18 00:42:19,360 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:19,368 [ 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-04-18 00:42:19,385 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:42:19,389 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-04-18 00:42:19,389 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-04-18 00:42:19,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:42:19,570 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-18 00:42:19,580 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:19,587 [ 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-04-18 00:42:19,627 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-18 00:42:19,628 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:42:19,634 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-04-18 00:42:19,634 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-04-18 00:42:19,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:42:19,994 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-18 00:42:20,001 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:20,009 [ 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-04-18 00:42:20,024 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-18 00:42:20,025 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:42:20,030 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-04-18 00:42:20,030 [ scc.git] DEBUG package.json | 2 +-
2024-04-18 00:42:20,030 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-04-18 00:42:20,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:42:20,396 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:42:20,443 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:20,443 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:20,450 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:42:20,499 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:42:20,512 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f661cb4ffd0> has no local changes
2024-04-18 00:42:20,512 [ 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/)'
2024-04-18 00:42:20,527 [ scc.git] DEBUG [detached HEAD a073bfe] merge master -Dorg -Ssuccess-only
2024-04-18 00:42:20,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:42:20,527 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:42:20,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-04-18 00:42:21,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-04-18 00:42:21,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-18 00:42:22,402 [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-04-18 00:42:22,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-18 00:42:23,315 [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-04-18 00:42:23,317 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-04-18 00:42:23,317 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:42:23,317 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-18 00:42:23,317 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:23,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:23,325 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:42:23,331 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:42:23,331 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:42:23,338 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:42:23,348 [ scc.git] DEBUG Already up to date.
2024-04-18 00:42:23,349 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-18 00:42:23,773 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-04-18 00:42:23,773 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-18 00:42:23,779 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:42:23,780 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:23,780 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:23,788 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-18 00:42:23,795 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:23,802 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-18 00:42:23,811 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:42:23,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:42:23,966 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:42:24,013 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:24,013 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:24,021 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:42:24,069 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:42:24,082 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f661c2d7340> has no local changes
2024-04-18 00:42:24,083 [ 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/)'
2024-04-18 00:42:24,096 [ scc.git] DEBUG [detached HEAD e43a0fe] merge master -Dorg -Ssuccess-only
2024-04-18 00:42:24,097 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:42:24,097 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:42:24,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-04-18 00:42:25,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-04-18 00:42:25,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-04-18 00:42:25,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-04-18 00:42:26,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-18 00:42:26,837 [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-04-18 00:42:27,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-18 00:42:27,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:42:27,761 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-18 00:42:27,761 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:42:27,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-18 00:42:27,761 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:27,761 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:27,767 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:42:27,771 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:42:27,771 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:42:27,776 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:42:27,781 [ scc.git] DEBUG Already up to date.
2024-04-18 00:42:27,781 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-04-18 00:42:28,274 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-04-18 00:42:28,274 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-04-18 00:42:28,279 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:42:28,279 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:28,279 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:28,286 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-18 00:42:28,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:28,298 [ 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-04-18 00:42:28,308 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-04-18 00:42:28,309 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:42:28,311 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-04-18 00:42:28,311 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-04-18 00:42:28,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:42:28,477 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:42:28,516 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:28,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:28,522 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:42:28,562 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:42:28,569 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f661c2f7a00> has no local changes
2024-04-18 00:42:28,569 [ 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/)'
2024-04-18 00:42:28,580 [ scc.git] DEBUG [detached HEAD bc29280] merge master -Dorg -Ssuccess-only
2024-04-18 00:42:28,580 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:42:28,581 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:42:28,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-04-18 00:42:29,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-04-18 00:42:29,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-04-18 00:42:30,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-18 00:42:30,883 [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-04-18 00:42:31,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-18 00:42:31,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:42:31,759 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-18 00:42:31,760 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:42:31,760 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-18 00:42:31,760 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:31,760 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:31,766 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:42:31,771 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:42:31,771 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:42:31,777 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:42:31,782 [ scc.git] DEBUG Already up to date.
2024-04-18 00:42:31,783 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-18 00:42:32,199 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-04-18 00:42:32,199 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-18 00:42:32,206 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:42:32,207 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:32,207 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:32,214 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-18 00:42:32,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:32,228 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-18 00:42:32,258 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-04-18 00:42:32,259 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-04-18 00:42:32,259 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-04-18 00:42:32,259 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-04-18 00:42:32,259 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-04-18 00:42:32,259 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-04-18 00:42:32,259 [ scc.git] DEBUG Auto-merging setup.py
2024-04-18 00:42:32,259 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-04-18 00:42:32,259 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-18 00:42:32,259 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-18 00:42:32,266 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-18 00:42:32,274 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-04-18 00:42:32,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:42:32,434 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-18 00:42:32,441 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-18 00:42:32,447 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#35](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/views.py
- setup.py
- omero_signup/signup_settings.py
--conflicts
2024-04-18 00:42:32,453 [ scc.config] DEBUG Found github.token
2024-04-18 00:42:32,453 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-04-18 00:42:32,454 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:42:32,503 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:32,504 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:32,510 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:42:32,549 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:42:32,556 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f661cb6edf0> has no local changes
2024-04-18 00:42:32,557 [ 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/)'
2024-04-18 00:42:32,566 [ scc.git] DEBUG [detached HEAD 3655ee3] merge master -Dorg -Ssuccess-only
2024-04-18 00:42:32,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:42:32,567 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:42:32,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-04-18 00:42:33,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-04-18 00:42:33,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-04-18 00:42:34,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-18 00:42:34,773 [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-04-18 00:42:35,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-18 00:42:35,675 [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-04-18 00:42:35,676 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-18 00:42:35,676 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:42:35,676 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-18 00:42:35,676 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:35,676 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:35,682 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:42:35,687 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:42:35,688 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:42:35,693 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:42:35,699 [ scc.git] DEBUG Already up to date.
2024-04-18 00:42:35,699 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-04-18 00:42:36,311 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-04-18 00:42:36,311 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-04-18 00:42:36,315 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:42:36,316 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:36,316 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:36,322 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-04-18 00:42:36,329 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:36,335 [ 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-04-18 00:42:36,348 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:42:36,351 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-04-18 00:42:36,351 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-04-18 00:42:36,351 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-04-18 00:42:36,351 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-04-18 00:42:36,351 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-04-18 00:42:36,351 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-04-18 00:42:36,351 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-04-18 00:42:36,351 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-04-18 00:42:36,351 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-04-18 00:42:36,351 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-04-18 00:42:36,351 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-04-18 00:42:36,353 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-04-18 00:42:36,353 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-04-18 00:42:36,353 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-04-18 00:42:36,354 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-04-18 00:42:36,354 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-04-18 00:42:36,354 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-04-18 00:42:36,354 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-04-18 00:42:36,354 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-04-18 00:42:36,354 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-04-18 00:42:36,354 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-04-18 00:42:36,354 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-04-18 00:42:36,354 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-04-18 00:42:36,354 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-04-18 00:42:36,354 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-04-18 00:42:36,354 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-04-18 00:42:36,354 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-04-18 00:42:36,354 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-04-18 00:42:36,354 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-04-18 00:42:36,354 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-04-18 00:42:36,355 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-04-18 00:42:36,355 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-04-18 00:42:36,355 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-04-18 00:42:36,355 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-04-18 00:42:36,355 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-04-18 00:42:36,355 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-04-18 00:42:36,355 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-04-18 00:42:36,355 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-04-18 00:42:36,355 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-04-18 00:42:36,355 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-04-18 00:42:36,355 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-04-18 00:42:36,355 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-04-18 00:42:36,355 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-04-18 00:42:36,355 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-04-18 00:42:36,355 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-04-18 00:42:36,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:42:36,512 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:42:36,556 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:36,556 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:36,562 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:42:36,601 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:42:36,608 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f661cb4fdf0> has no local changes
2024-04-18 00:42:36,609 [ 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/)'
2024-04-18 00:42:36,618 [ scc.git] DEBUG [detached HEAD e8ade2a] merge master -Dorg -Ssuccess-only
2024-04-18 00:42:36,618 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:42:36,618 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:42:36,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-04-18 00:42:36,931 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:42:36,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-18 00:42:36,931 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:36,932 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:36,938 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:42:36,943 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:42:36,943 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:42:36,949 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:42:36,955 [ scc.git] DEBUG Already up to date.
2024-04-18 00:42:36,955 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:42:36,956 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:36,956 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:36,961 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:42:36,999 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:36,999 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:37,010 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:42:37,054 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:42:37,061 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f661c324fa0> has no local changes
2024-04-18 00:42:37,061 [ 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/)'
2024-04-18 00:42:37,072 [ scc.git] DEBUG [detached HEAD 395616f] merge master -Dorg -Ssuccess-only
2024-04-18 00:42:37,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:42:37,073 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:42:37,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-04-18 00:42:37,355 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:42:37,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-18 00:42:37,355 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:37,355 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:37,362 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:42:37,367 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:42:37,367 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:42:37,373 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:42:37,379 [ scc.git] DEBUG Already up to date.
2024-04-18 00:42:37,379 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:42:37,379 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:37,379 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:37,384 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:42:37,424 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:37,424 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:37,430 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:42:37,473 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:42:37,480 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f661c2e4f70> has no local changes
2024-04-18 00:42:37,480 [ 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/)'
2024-04-18 00:42:37,488 [ scc.git] DEBUG [detached HEAD a5233b4] merge master -Dorg -Ssuccess-only
2024-04-18 00:42:37,489 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:42:37,489 [ scc.git] INFO Overriding base-branch from master to main
2024-04-18 00:42:37,489 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:42:37,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-04-18 00:42:38,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-04-18 00:42:38,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-04-18 00:42:39,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-04-18 00:42:39,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-18 00:42:40,251 [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-04-18 00:42:40,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-18 00:42:41,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-18 00:42:41,693 [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-04-18 00:42:41,694 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-18 00:42:41,694 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:42:41,694 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-18 00:42:41,695 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:41,695 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:41,701 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-04-18 00:42:41,707 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:42:41,708 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-04-18 00:42:41,715 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-04-18 00:42:41,725 [ scc.git] DEBUG Already up to date.
2024-04-18 00:42:41,725 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-18 00:42:42,212 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-04-18 00:42:42,212 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-18 00:42:42,217 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:42:42,217 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:42,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:42,223 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-18 00:42:42,230 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:42,237 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-18 00:42:42,264 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-04-18 00:42:42,264 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-04-18 00:42:42,264 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-18 00:42:42,265 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-18 00:42:42,272 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-18 00:42:42,278 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-04-18 00:42:42,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:42:42,440 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-18 00:42:42,447 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-18 00:42:42,454 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#35](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-04-18 00:42:42,460 [ scc.config] DEBUG Found github.token
2024-04-18 00:42:42,460 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-04-18 00:42:42,460 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:42:42,504 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:42,504 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:42,511 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:42:42,555 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:42:42,563 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f661c2acb50> has no local changes
2024-04-18 00:42:42,564 [ 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/)'
2024-04-18 00:42:42,574 [ scc.git] DEBUG [detached HEAD 94e724e] merge master -Dorg -Ssuccess-only
2024-04-18 00:42:42,575 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:42:42,575 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:42:42,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-04-18 00:42:42,883 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:42:42,883 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-18 00:42:42,883 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:42,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:42,892 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:42:42,897 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:42:42,898 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:42:42,903 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:42:42,910 [ scc.git] DEBUG Already up to date.
2024-04-18 00:42:42,910 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:42:42,910 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:42,911 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:42,916 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:42:42,959 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:42,959 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:42,966 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:42:43,008 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:42:43,016 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f661c2c2e50> has no local changes
2024-04-18 00:42:43,016 [ 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/)'
2024-04-18 00:42:43,026 [ scc.git] DEBUG [detached HEAD dbc098c] merge master -Dorg -Ssuccess-only
2024-04-18 00:42:43,026 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:42:43,027 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:42:43,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-04-18 00:42:43,318 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:42:43,318 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-18 00:42:43,318 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:43,318 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:43,325 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:42:43,331 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:42:43,331 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:42:43,340 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:42:43,347 [ scc.git] DEBUG Already up to date.
2024-04-18 00:42:43,347 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:42:43,347 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:43,347 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:43,353 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:42:43,398 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:43,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:43,405 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:42:43,450 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:42:43,457 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f661c1f7940> has no local changes
2024-04-18 00:42:43,458 [ 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/)'
2024-04-18 00:42:43,467 [ scc.git] DEBUG [detached HEAD 35533ed] merge master -Dorg -Ssuccess-only
2024-04-18 00:42:43,468 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:42:43,468 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:42:43,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-04-18 00:42:44,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-04-18 00:42:44,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-04-18 00:42:45,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-18 00:42:45,689 [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-04-18 00:42:46,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-18 00:42:46,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:42:46,615 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-04-18 00:42:46,615 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:42:46,615 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-18 00:42:46,616 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:46,616 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:46,621 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:42:46,625 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:42:46,626 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:42:46,630 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:42:46,635 [ scc.git] DEBUG Already up to date.
2024-04-18 00:42:46,636 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-04-18 00:42:47,056 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-04-18 00:42:47,056 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-04-18 00:42:47,061 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:42:47,061 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:47,061 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:47,067 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-18 00:42:47,073 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:47,078 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-18 00:42:47,108 [ scc.git] DEBUG Auto-merging Dockerfile
2024-04-18 00:42:47,109 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-04-18 00:42:47,109 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-18 00:42:47,109 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-18 00:42:47,115 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-18 00:42:47,122 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-04-18 00:42:47,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:42:47,271 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-18 00:42:47,277 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-18 00:42:47,282 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#35](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-04-18 00:42:47,286 [ scc.config] DEBUG Found github.token
2024-04-18 00:42:47,287 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-04-18 00:42:47,287 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:42:47,326 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:47,326 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:47,331 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:42:47,369 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:42:47,376 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f661c25b310> has no local changes
2024-04-18 00:42:47,376 [ 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/)'
2024-04-18 00:42:47,385 [ scc.git] DEBUG [detached HEAD 08ab8f0] merge master -Dorg -Ssuccess-only
2024-04-18 00:42:47,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:42:47,385 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-18 00:42:47,385 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:42:47,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-18 00:42:48,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-18 00:42:48,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-18 00:42:49,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-18 00:42:49,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-18 00:42:50,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-18 00:42:50,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-18 00:42:51,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-18 00:42:51,652 [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-04-18 00:42:52,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-18 00:42:52,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:42:52,533 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-18 00:42:52,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-18 00:42:53,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-18 00:42:53,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-18 00:42:54,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-18 00:42:54,462 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:42:54,463 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-18 00:42:54,463 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:54,463 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:54,469 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-18 00:42:54,475 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:42:54,475 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-18 00:42:54,481 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-18 00:42:54,488 [ scc.git] DEBUG Already up to date.
2024-04-18 00:42:54,488 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-18 00:42:54,925 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-04-18 00:42:54,925 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-18 00:42:54,931 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:42:54,931 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:54,931 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:54,937 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-18 00:42:54,944 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:54,950 [ 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-04-18 00:42:54,982 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-18 00:42:54,983 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-18 00:42:54,983 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-18 00:42:54,984 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-18 00:42:54,990 [ scc.git] DEBUG Calling 'git reset --hard 2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-18 00:42:54,998 [ scc.git] DEBUG HEAD is now at 2078ac7 Bump version: 5.8.0 → 5.8.1.dev0
2024-04-18 00:42:55,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:42:55,155 [ scc.git] DEBUG Calling 'git merge-base 2078ac72dbf11f2733e685000a274eff81c2ac2d 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-18 00:42:55,163 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-18 00:42:55,169 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#35](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-18 00:42:55,174 [ scc.config] DEBUG Found github.token
2024-04-18 00:42:55,175 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-18 00:42:55,175 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:42:55,212 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:42:55,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:42:55,218 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:42:55,256 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:42:55,263 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f661c1f7bb0> has no local changes
2024-04-18 00:42:55,263 [ 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/)'
2024-04-18 00:42:55,271 [ scc.git] DEBUG [detached HEAD 0d06e04] merge master -Dorg -Ssuccess-only
2024-04-18 00:42:55,272 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:42:55,272 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:42:55,348 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-04-18 00:42:55,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:42:55,568 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-04-18 00:42:55,574 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-04-18 00:42:55,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:42:55,980 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-04-18 00:42:55,986 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-04-18 00:42:56,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:42:56,392 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-04-18 00:42:56,398 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-04-18 00:42:56,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:42:56,804 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-04-18 00:42:57,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:42:57,204 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-04-18 00:42:57,210 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-04-18 00:42:57,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:42:57,608 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-04-18 00:42:57,613 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-04-18 00:42:57,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:42:58,002 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-04-18 00:42:58,007 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-04-18 00:42:58,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:42:58,406 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-04-18 00:42:58,411 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-04-18 00:42:58,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:42:58,811 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-04-18 00:42:58,817 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-04-18 00:42:59,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:42:59,216 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-04-18 00:42:59,221 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-04-18 00:42:59,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:42:59,625 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-04-18 00:42:59,629 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-04-18 00:43:00,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:43:00,026 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-04-18 00:43:00,033 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-04-18 00:43:00,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:43:00,433 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-04-18 00:43:00,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:43:00,846 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-04-18 00:43:01,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:43:01,322 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-04-18 00:43:01,328 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-04-18 00:43:01,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:43:01,737 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-04-18 00:43:02,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:43:02,140 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-04-18 00:43:02,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:43:02,554 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-04-18 00:43:02,559 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-04-18 00:43:02,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:43:02,953 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-04-18 00:43:02,959 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-04-18 00:43:03,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:43:03,362 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-04-18 00:43:03,367 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-04-18 00:43:03,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:43:03,771 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-04-18 00:43:03,779 [ scc.config] DEBUG Found submodule.scripts.url
2024-04-18 00:43:04,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:43:04,175 [ scc.config] DEBUG Found submodule.scripts.branch
2024-04-18 00:43:04,176 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:43:04,264 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6620007460> has local changes
2024-04-18 00:43:04,264 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
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 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
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 549 will-moore 'Inset feature' (stage: draft)
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
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 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 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/35/)'
2024-04-18 00:43:04,281 [ scc.git] DEBUG [detached HEAD 4787a6b] merge master -Dorg -Ssuccess-only
2024-04-18 00:43:04,281 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-04-18 00:43:04,281 [ scc.merge] INFO Repository: ome/omero-plugins
2024-04-18 00:43:04,281 [ scc.merge] INFO Already up to date.
2024-04-18 00:43:04,281 [ scc.merge] INFO
2024-04-18 00:43:04,282 [ scc.merge] INFO
2024-04-18 00:43:04,282 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-04-18 00:43:04,282 [ scc.merge] INFO Already up to date.
2024-04-18 00:43:04,282 [ scc.merge] INFO
2024-04-18 00:43:04,282 [ scc.merge] INFO
2024-04-18 00:43:04,282 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-04-18 00:43:04,282 [ scc.merge] INFO Excluded PRs:
2024-04-18 00:43:04,282 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-04-18 00:43:04,282 [ scc.merge] INFO Already up to date.
2024-04-18 00:43:04,282 [ scc.merge] INFO
2024-04-18 00:43:04,282 [ scc.merge] INFO Merged PRs:
2024-04-18 00:43:04,282 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-04-18 00:43:04,282 [ scc.merge] INFO
2024-04-18 00:43:04,282 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-04-18 00:43:04,282 [ scc.merge] INFO Excluded PRs:
2024-04-18 00:43:04,282 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-04-18 00:43:04,282 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-04-18 00:43:04,282 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-04-18 00:43:04,282 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-04-18 00:43:04,282 [ scc.merge] INFO Already up to date.
2024-04-18 00:43:04,282 [ scc.merge] INFO
2024-04-18 00:43:04,282 [ scc.merge] INFO Merged PRs:
2024-04-18 00:43:04,282 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-04-18 00:43:04,282 [ scc.merge] INFO
2024-04-18 00:43:04,282 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-04-18 00:43:04,282 [ scc.merge] INFO Excluded PRs:
2024-04-18 00:43:04,282 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-18 00:43:04,282 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-04-18 00:43:04,282 [ scc.merge] INFO Already up to date.
2024-04-18 00:43:04,282 [ scc.merge] INFO
2024-04-18 00:43:04,282 [ scc.merge] INFO Merged PRs:
2024-04-18 00:43:04,282 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-04-18 00:43:04,282 [ scc.merge] INFO
2024-04-18 00:43:04,282 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-18 00:43:04,282 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-04-18 00:43:04,282 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-04-18 00:43:04,282 [ scc.merge] INFO
2024-04-18 00:43:04,282 [ scc.merge] INFO Repository: ome/omero-figure
2024-04-18 00:43:04,282 [ scc.merge] INFO Excluded PRs:
2024-04-18 00:43:04,283 [ scc.merge] INFO - PR 549 will-moore 'Inset feature' (stage: draft)
2024-04-18 00:43:04,283 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-04-18 00:43:04,283 [ scc.merge] INFO Already up to date.
2024-04-18 00:43:04,283 [ scc.merge] INFO
2024-04-18 00:43:04,283 [ scc.merge] INFO Merged PRs:
2024-04-18 00:43:04,283 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-04-18 00:43:04,283 [ scc.merge] INFO
2024-04-18 00:43:04,283 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-04-18 00:43:04,283 [ scc.merge] INFO Already up to date.
2024-04-18 00:43:04,283 [ scc.merge] INFO
2024-04-18 00:43:04,283 [ scc.merge] INFO Merged PRs:
2024-04-18 00:43:04,283 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-04-18 00:43:04,283 [ scc.merge] INFO
2024-04-18 00:43:04,283 [ scc.merge] INFO Repository: ome/omero-gallery
2024-04-18 00:43:04,283 [ scc.merge] INFO Already up to date.
2024-04-18 00:43:04,283 [ scc.merge] INFO
2024-04-18 00:43:04,283 [ scc.merge] INFO Merged PRs:
2024-04-18 00:43:04,283 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-18 00:43:04,283 [ scc.merge] INFO
2024-04-18 00:43:04,283 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-04-18 00:43:04,283 [ scc.merge] INFO Excluded PRs:
2024-04-18 00:43:04,283 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-04-18 00:43:04,283 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-04-18 00:43:04,283 [ scc.merge] INFO Already up to date.
2024-04-18 00:43:04,283 [ scc.merge] INFO
2024-04-18 00:43:04,283 [ scc.merge] INFO Merged PRs:
2024-04-18 00:43:04,283 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-04-18 00:43:04,283 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-04-18 00:43:04,283 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-04-18 00:43:04,283 [ scc.merge] INFO - PR 470 will-moore 'Movie playing waits for planes'
2024-04-18 00:43:04,283 [ scc.merge] INFO
2024-04-18 00:43:04,283 [ scc.merge] INFO Repository: ome/omero-mapr
2024-04-18 00:43:04,283 [ scc.merge] INFO Excluded PRs:
2024-04-18 00:43:04,283 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-04-18 00:43:04,283 [ scc.merge] INFO Already up to date.
2024-04-18 00:43:04,283 [ scc.merge] INFO
2024-04-18 00:43:04,283 [ scc.merge] INFO Merged PRs:
2024-04-18 00:43:04,283 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-04-18 00:43:04,283 [ scc.merge] INFO
2024-04-18 00:43:04,283 [ scc.merge] INFO Repository: ome/omero-metadata
2024-04-18 00:43:04,284 [ scc.merge] INFO Already up to date.
2024-04-18 00:43:04,284 [ scc.merge] INFO
2024-04-18 00:43:04,284 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-18 00:43:04,284 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-18 00:43:04,284 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-18 00:43:04,284 [ scc.merge] INFO
2024-04-18 00:43:04,284 [ scc.merge] INFO Repository: ome/omero-parade
2024-04-18 00:43:04,284 [ scc.merge] INFO Excluded PRs:
2024-04-18 00:43:04,284 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-04-18 00:43:04,284 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-04-18 00:43:04,284 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-04-18 00:43:04,284 [ scc.merge] INFO Already up to date.
2024-04-18 00:43:04,284 [ scc.merge] INFO
2024-04-18 00:43:04,284 [ scc.merge] INFO Merged PRs:
2024-04-18 00:43:04,284 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-18 00:43:04,284 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-18 00:43:04,284 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-18 00:43:04,284 [ scc.merge] INFO
2024-04-18 00:43:04,284 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-04-18 00:43:04,284 [ scc.merge] INFO Already up to date.
2024-04-18 00:43:04,284 [ scc.merge] INFO
2024-04-18 00:43:04,284 [ scc.merge] INFO Merged PRs:
2024-04-18 00:43:04,284 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-04-18 00:43:04,284 [ scc.merge] INFO
2024-04-18 00:43:04,284 [ scc.merge] INFO Repository: ome/omero-rois
2024-04-18 00:43:04,284 [ scc.merge] INFO Excluded PRs:
2024-04-18 00:43:04,284 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-18 00:43:04,284 [ scc.merge] INFO Already up to date.
2024-04-18 00:43:04,284 [ scc.merge] INFO
2024-04-18 00:43:04,284 [ scc.merge] INFO Merged PRs:
2024-04-18 00:43:04,284 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-18 00:43:04,284 [ scc.merge] INFO
2024-04-18 00:43:04,284 [ scc.merge] INFO Repository: ome/omero-signup
2024-04-18 00:43:04,284 [ scc.merge] INFO Already up to date.
2024-04-18 00:43:04,284 [ scc.merge] INFO
2024-04-18 00:43:04,284 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-18 00:43:04,284 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-18 00:43:04,284 [ scc.merge] INFO
2024-04-18 00:43:04,284 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-04-18 00:43:04,284 [ scc.merge] INFO Already up to date.
2024-04-18 00:43:04,285 [ scc.merge] INFO
2024-04-18 00:43:04,285 [ scc.merge] INFO Merged PRs:
2024-04-18 00:43:04,285 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-18 00:43:04,285 [ scc.merge] INFO
2024-04-18 00:43:04,285 [ scc.merge] INFO Repository: ome/omero-upload
2024-04-18 00:43:04,285 [ scc.merge] INFO Already up to date.
2024-04-18 00:43:04,285 [ scc.merge] INFO
2024-04-18 00:43:04,285 [ scc.merge] INFO
2024-04-18 00:43:04,285 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-04-18 00:43:04,285 [ scc.merge] INFO Already up to date.
2024-04-18 00:43:04,285 [ scc.merge] INFO
2024-04-18 00:43:04,285 [ scc.merge] INFO
2024-04-18 00:43:04,285 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-04-18 00:43:04,285 [ scc.merge] INFO Excluded PRs:
2024-04-18 00:43:04,285 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-04-18 00:43:04,285 [ scc.merge] INFO Already up to date.
2024-04-18 00:43:04,285 [ scc.merge] INFO
2024-04-18 00:43:04,285 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-18 00:43:04,285 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-18 00:43:04,285 [ scc.merge] INFO
2024-04-18 00:43:04,285 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-04-18 00:43:04,285 [ scc.merge] INFO Already up to date.
2024-04-18 00:43:04,285 [ scc.merge] INFO
2024-04-18 00:43:04,285 [ scc.merge] INFO
2024-04-18 00:43:04,285 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-04-18 00:43:04,285 [ scc.merge] INFO Already up to date.
2024-04-18 00:43:04,285 [ scc.merge] INFO
2024-04-18 00:43:04,285 [ scc.merge] INFO
2024-04-18 00:43:04,285 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-04-18 00:43:04,285 [ scc.merge] INFO Already up to date.
2024-04-18 00:43:04,285 [ scc.merge] INFO
2024-04-18 00:43:04,285 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-18 00:43:04,285 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-04-18 00:43:04,285 [ scc.merge] INFO
2024-04-18 00:43:04,285 [ scc.merge] INFO Repository: ome/scripts
2024-04-18 00:43:04,285 [ scc.merge] INFO Excluded PRs:
2024-04-18 00:43:04,285 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-18 00:43:04,285 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-18 00:43:04,285 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-18 00:43:04,285 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-18 00:43:04,286 [ scc.merge] INFO Already up to date.
2024-04-18 00:43:04,286 [ scc.merge] INFO
2024-04-18 00:43:04,286 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-18 00:43:04,286 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-18 00:43:04,286 [ scc.merge] INFO
2024-04-18 00:43:04,286 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-18 00:43:04,286 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:43:04,291 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-04-18 00:43:04,291 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:43:04,295 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:43:04,296 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-04-18 00:43:04,296 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:43:04,300 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:43:04,301 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-04-18 00:43:04,301 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:43:04,307 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:43:04,307 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-04-18 00:43:04,307 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:43:04,313 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:43:04,314 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-04-18 00:43:04,314 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:43:04,320 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:43:04,320 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-18 00:43:04,320 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:43:04,327 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:43:04,327 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-18 00:43:04,327 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:43:04,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:43:04,334 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-18 00:43:04,334 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:43:04,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:43:04,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-18 00:43:04,340 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:43:04,347 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:43:04,348 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-18 00:43:04,348 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:43:04,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:43:04,356 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-18 00:43:04,356 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:43:04,362 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:43:04,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-18 00:43:04,363 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:43:04,369 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:43:04,369 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-18 00:43:04,369 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:43:04,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:43:04,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-18 00:43:04,380 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:43:04,390 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:43:04,390 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-18 00:43:04,390 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:43:04,398 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:43:04,398 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-18 00:43:04,398 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:43:04,404 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:43:04,404 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-18 00:43:04,404 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:43:04,411 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:43:04,411 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-18 00:43:04,411 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:43:04,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:43:04,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-18 00:43:04,417 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:43:04,423 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:43:04,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-18 00:43:04,424 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:43:04,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:43:04,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-18 00:43:04,430 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:43:04,436 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-18 00:43:04,436 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-18 00:43:04,436 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:43:04,442 [ 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.8.2 to 5.9.1-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD bbd7918] 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 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 2ca566b
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 ded0caab
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 9d8d147
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 a0148a6
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 2078ac7
nothing to commit, working tree clean
[detached HEAD ca45502] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-04-18 00:43:50,942 [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-04-18 00:43:59,958 [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-04-18 00:44:02,352 [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-04-18 00:44:06,982 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-18 00:44:54,293 [ 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/4be69ed6/images/svgs/logo.svg){kind=logo}
