Console Output
Skipping 107 KB..
Full Log | 5 +
2024-04-12 06:35:06,652 [ scc.git] DEBUG ..._template.html => viewport_inner.template.html} | 0
2024-04-12 06:35:06,652 [ scc.git] DEBUG src/templates/viewport_template.html | 9 -
2024-04-12 06:35:06,652 [ scc.git] DEBUG ...anel_template.html => xywh_panel.template.html} | 30 +-
2024-04-12 06:35:06,652 [ scc.git] DEBUG ..._crop_template.html => zoom_crop.template.html} | 10 +-
2024-04-12 06:35:06,652 [ scc.git] DEBUG vite.config.js | 21 +
2024-04-12 06:35:06,652 [ scc.git] DEBUG 136 files changed, 7923 insertions(+), 32992 deletions(-)
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100644 Dockerfile
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100644 Gruntfile.js
2024-04-12 06:35:06,652 [ scc.git] DEBUG create mode 100755 deploy_build.sh
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100644 docs/demo/index.html
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/backbone-1.0.0.js
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/backbone.mousetrap/README.md
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/css/bootstrap.css
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/css/bootstrap.min.css
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.eot
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.svg
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.ttf
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.woff
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/js/bootstrap.js
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/js/bootstrap.min.js
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.css
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.js
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-1.11.1/jquery.min.js
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.base.css
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.slider.css
2024-04-12 06:35:06,652 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/jquery-ui.min.js
2024-04-12 06:35:06,653 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/json2.js
2024-04-12 06:35:06,653 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.js
2024-04-12 06:35:06,653 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.min.js
2024-04-12 06:35:06,653 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/mousetrap-1.5.3/mousetrap.min.js
2024-04-12 06:35:06,653 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael-min.js
2024-04-12 06:35:06,653 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael.js
2024-04-12 06:35:06,653 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/scaleraphael.js
2024-04-12 06:35:06,653 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/underscore-1.13.1-umd-min.js
2024-04-12 06:35:06,653 [ scc.git] DEBUG delete mode 100644 omero_figure/templates/figure/index.html
2024-04-12 06:35:06,653 [ scc.git] DEBUG delete mode 100644 spec/ViewportViewSpec.js
2024-04-12 06:35:06,653 [ scc.git] DEBUG delete mode 100644 spec/images/testImage.png
2024-04-12 06:35:06,653 [ scc.git] DEBUG delete mode 100644 spec/javascripts/PanelSpec.js
2024-04-12 06:35:06,653 [ scc.git] DEBUG delete mode 100644 spec/javascripts/ViewportViewSpec.js
2024-04-12 06:35:06,653 [ scc.git] DEBUG delete mode 100644 spec/javascripts/fixtures/previewTab.html
2024-04-12 06:35:06,653 [ scc.git] DEBUG create mode 100644 src/.env
2024-04-12 06:35:06,653 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/css/figure.css (70%)
2024-04-12 06:35:06,653 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/arrow-icon-16.png (100%)
2024-04-12 06:35:06,653 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-04-12 06:35:06,653 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-04-12 06:35:06,653 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-04-12 06:35:06,653 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-04-12 06:35:06,653 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-04-12 06:35:06,653 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-04-12 06:35:06,653 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-04-12 06:35:06,653 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-04-12 06:35:06,653 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-04-12 06:35:06,653 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-12 06:35:06,653 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-04-12 06:35:06,653 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-04-12 06:35:06,653 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-04-12 06:35:06,653 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-04-12 06:35:06,653 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-04-12 06:35:06,653 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-04-12 06:35:06,653 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-04-12 06:35:06,654 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-04-12 06:35:06,654 [ scc.git] DEBUG create mode 100644 src/index.html
2024-04-12 06:35:06,654 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-04-12 06:35:06,654 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-04-12 06:35:06,654 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-04-12 06:35:06,654 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-04-12 06:35:06,654 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-04-12 06:35:06,654 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-04-12 06:35:06,654 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-04-12 06:35:06,654 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-04-12 06:35:06,654 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-04-12 06:35:06,654 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-12 06:35:06,654 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-04-12 06:35:06,654 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-04-12 06:35:06,654 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-04-12 06:35:06,654 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-04-12 06:35:06,654 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-04-12 06:35:06,654 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-04-12 06:35:06,654 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-04-12 06:35:06,654 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-04-12 06:35:06,654 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-04-12 06:35:06,654 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-04-12 06:35:06,654 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-04-12 06:35:06,654 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-04-12 06:35:06,654 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-04-12 06:35:06,654 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-04-12 06:35:06,654 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-04-12 06:35:06,654 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-04-12 06:35:06,654 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-04-12 06:35:06,654 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-04-12 06:35:06,654 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-04-12 06:35:06,654 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-04-12 06:35:06,654 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-04-12 06:35:06,655 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-04-12 06:35:06,655 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-04-12 06:35:06,655 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-04-12 06:35:06,655 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-04-12 06:35:06,655 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-04-12 06:35:06,655 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-04-12 06:35:06,655 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-04-12 06:35:06,655 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-04-12 06:35:06,655 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-04-12 06:35:06,655 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-04-12 06:35:06,655 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-04-12 06:35:06,655 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-04-12 06:35:06,655 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-04-12 06:35:06,655 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-04-12 06:35:06,655 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-04-12 06:35:06,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:35:06,810 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...32b0ccd55ce3c95dabcf8ebf817b032e4b864438'
2024-04-12 06:35:06,822 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:06,829 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 548 (Fix cropping of panel labels and float usage for shape labels) 32b0ccd55ce3c95dabcf8ebf817b032e4b864438'
2024-04-12 06:35:06,858 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-12 06:35:06,864 [ scc.git] DEBUG omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 6 +++---
2024-04-12 06:35:06,864 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-04-12 06:35:07,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:35:07,232 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5c3378fc77523b5998227b3a1b0a8a5b6dfdef74'
2024-04-12 06:35:07,254 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:07,265 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 550 (Don't update zoom to undefined on setId) 5c3378fc77523b5998227b3a1b0a8a5b6dfdef74'
2024-04-12 06:35:07,313 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-04-12 06:35:07,314 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-12 06:35:07,318 [ scc.git] DEBUG src/js/models/panel_model.js | 1 -
2024-04-12 06:35:07,319 [ scc.git] DEBUG 1 file changed, 1 deletion(-)
2024-04-12 06:35:07,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:35:07,646 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-12 06:35:07,706 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:35:07,706 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:07,713 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-12 06:35:07,761 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-12 06:35:07,774 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d13cabe0> has no local changes
2024-04-12 06:35:07,774 [ 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'
- PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
- PR 550 will-moore 'Don't update zoom to undefined on setId'
Generated by OMERO-plugins-push#29 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/)'
2024-04-12 06:35:07,787 [ scc.git] DEBUG [detached HEAD a5fcce3b] merge master -Dorg -Ssuccess-only
2024-04-12 06:35:07,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:35:07,788 [ scc.repo] DEBUG ## PRs found:
2024-04-12 06:35:08,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-04-12 06:35:08,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-04-12 06:35:09,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-04-12 06:35:09,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-12 06:35:10,079 [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-12 06:35:10,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-12 06:35:11,073 [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-12 06:35:11,074 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-04-12 06:35:11,074 [ scc.repo] DEBUG ## Branches found:
2024-04-12 06:35:11,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-12 06:35:11,074 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:35:11,074 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:11,082 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-12 06:35:11,088 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-12 06:35:11,088 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-12 06:35:11,101 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-12 06:35:11,111 [ scc.git] DEBUG Already up to date.
2024-04-12 06:35:11,111 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-04-12 06:35:11,566 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-04-12 06:35:11,566 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-04-12 06:35:11,574 [ scc.git] DEBUG ## Unique users: []
2024-04-12 06:35:11,575 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:35:11,575 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:11,582 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-12 06:35:11,588 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:11,592 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-12 06:35:11,613 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-04-12 06:35:11,614 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-12 06:35:11,617 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-04-12 06:35:11,617 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-12 06:35:11,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:35:11,771 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-12 06:35:11,815 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:35:11,815 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:11,822 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-12 06:35:11,870 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-12 06:35:11,881 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d137e550> has no local changes
2024-04-12 06:35:11,882 [ 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#29 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/)'
2024-04-12 06:35:11,902 [ scc.git] DEBUG [detached HEAD e08d59c] merge master -Dorg -Ssuccess-only
2024-04-12 06:35:11,903 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:35:11,904 [ scc.repo] DEBUG ## PRs found:
2024-04-12 06:35:12,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-04-12 06:35:12,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-04-12 06:35:12,787 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-12 06:35:13,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-12 06:35:13,897 [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-12 06:35:14,402 [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-12 06:35:15,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-12 06:35:15,438 [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-12 06:35:15,440 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-12 06:35:15,440 [ scc.repo] DEBUG ## Branches found:
2024-04-12 06:35:15,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-12 06:35:15,440 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:35:15,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:15,449 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-12 06:35:15,455 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-12 06:35:15,455 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-12 06:35:15,462 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-12 06:35:15,469 [ scc.git] DEBUG Already up to date.
2024-04-12 06:35:15,469 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-04-12 06:35:15,884 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-04-12 06:35:15,884 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-04-12 06:35:15,890 [ scc.git] DEBUG ## Unique users: []
2024-04-12 06:35:15,891 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:35:15,891 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:15,899 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-12 06:35:15,911 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:15,920 [ 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-12 06:35:15,938 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-12 06:35:15,944 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-04-12 06:35:15,944 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-04-12 06:35:16,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:35:16,119 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-12 06:35:16,204 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:35:16,205 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:16,222 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-12 06:35:16,318 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-12 06:35:16,337 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d13829d0> has no local changes
2024-04-12 06:35:16,337 [ 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#29 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/)'
2024-04-12 06:35:16,362 [ scc.git] DEBUG [detached HEAD f452a6a] merge master -Dorg -Ssuccess-only
2024-04-12 06:35:16,362 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:35:16,364 [ scc.repo] DEBUG ## PRs found:
2024-04-12 06:35:16,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-04-12 06:35:17,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-04-12 06:35:17,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-04-12 06:35:18,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/efda99710532f9743896717e88f0e68ca23ec3b2 HTTP/1.1" 200 None
2024-04-12 06:35:18,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/efda99710532f9743896717e88f0e68ca23ec3b2/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-12 06:35:19,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/efda99710532f9743896717e88f0e68ca23ec3b2/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-12 06:35:19,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/efda99710532f9743896717e88f0e68ca23ec3b2 HTTP/1.1" 200 None
2024-04-12 06:35:19,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/efda99710532f9743896717e88f0e68ca23ec3b2?per_page=1 HTTP/1.1" 200 2
2024-04-12 06:35:19,859 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-04-12 06:35:20,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464 HTTP/1.1" 200 None
2024-04-12 06:35:20,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464/comments HTTP/1.1" 200 None
2024-04-12 06:35:21,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-04-12 06:35:21,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-12 06:35:22,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-12 06:35:22,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-04-12 06:35:23,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/97542d9b749f93d4902f7dce703bbf2a04316a98?per_page=1 HTTP/1.1" 200 2
2024-04-12 06:35:23,345 [ scc.repo] DEBUG - PR 464 will-moore 'Tile load error warning'
2024-04-12 06:35:23,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-04-12 06:35:24,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-04-12 06:35:24,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-12 06:35:25,200 [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-12 06:35:25,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-12 06:35:26,051 [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-12 06:35:26,052 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-04-12 06:35:26,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456 HTTP/1.1" 200 None
2024-04-12 06:35:26,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456/comments HTTP/1.1" 200 None
2024-04-12 06:35:27,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-04-12 06:35:27,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-12 06:35:28,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-12 06:35:28,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-04-12 06:35:29,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745?per_page=1 HTTP/1.1" 200 2
2024-04-12 06:35:29,324 [ scc.repo] DEBUG - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-04-12 06:35:29,324 [ scc.repo] DEBUG ## Branches found:
2024-04-12 06:35:29,324 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-12 06:35:29,324 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:35:29,325 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:29,330 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-12 06:35:29,336 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-12 06:35:29,337 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-12 06:35:29,344 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-12 06:35:29,352 [ scc.git] DEBUG Already up to date.
2024-04-12 06:35:29,352 [ scc.git] DEBUG Calling 'git fetch origin pull/456/head'
2024-04-12 06:35:30,867 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-12 06:35:30,868 [ scc.git] DEBUG * branch refs/pull/456/head -> FETCH_HEAD
2024-04-12 06:35:30,875 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-04-12 06:35:31,286 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-12 06:35:31,287 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-04-12 06:35:31,292 [ scc.git] DEBUG Calling 'git fetch origin pull/464/head'
2024-04-12 06:35:32,037 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-12 06:35:32,037 [ scc.git] DEBUG * branch refs/pull/464/head -> FETCH_HEAD
2024-04-12 06:35:32,042 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-04-12 06:35:33,296 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-12 06:35:33,297 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-04-12 06:35:33,304 [ scc.git] DEBUG ## Unique users: []
2024-04-12 06:35:33,304 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:35:33,304 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:33,312 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-04-12 06:35:33,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:33,330 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 456 (Don't use tiles for non-big movies) 2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-04-12 06:35:33,360 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-12 06:35:33,364 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 5 +++--
2024-04-12 06:35:33,364 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-04-12 06:35:33,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:35:33,530 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-12 06:35:33,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:33,555 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-12 06:35:33,605 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-12 06:35:33,608 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-04-12 06:35:33,608 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-04-12 06:35:33,609 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-04-12 06:35:33,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:35:33,939 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-04-12 06:35:33,946 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:33,953 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 464 (Tile load error warning) 97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-04-12 06:35:33,996 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-12 06:35:34,001 [ scc.git] DEBUG css/app.css | 22 ++++++++++++++++++++++
2024-04-12 06:35:34,001 [ scc.git] DEBUG src/events/events.js | 2 ++
2024-04-12 06:35:34,001 [ scc.git] DEBUG src/index-dev.html | 6 +++---
2024-04-12 06:35:34,001 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 2 +-
2024-04-12 06:35:34,001 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 4 +++-
2024-04-12 06:35:34,001 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 39 +++++++++++++++++++++++++++++++++++++--
2024-04-12 06:35:34,001 [ scc.git] DEBUG 6 files changed, 68 insertions(+), 7 deletions(-)
2024-04-12 06:35:34,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:35:34,360 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...efda99710532f9743896717e88f0e68ca23ec3b2'
2024-04-12 06:35:34,368 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:34,374 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) efda99710532f9743896717e88f0e68ca23ec3b2'
2024-04-12 06:35:34,407 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-04-12 06:35:34,408 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-12 06:35:34,412 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-04-12 06:35:34,412 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-04-12 06:35:34,412 [ scc.git] DEBUG src/app/header.html | 5 +
2024-04-12 06:35:34,412 [ scc.git] DEBUG src/app/header.js | 46 ++++++++-
2024-04-12 06:35:34,412 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-04-12 06:35:34,412 [ scc.git] DEBUG src/utils/figure.js | 210 ++++++++++++++++++++++++++++++++++++++++++
2024-04-12 06:35:34,413 [ scc.git] DEBUG 6 files changed, 284 insertions(+), 6 deletions(-)
2024-04-12 06:35:34,413 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-04-12 06:35:34,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:35:34,778 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-12 06:35:34,819 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:35:34,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:34,825 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-12 06:35:34,867 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-12 06:35:34,876 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d03245b0> has no local changes
2024-04-12 06:35:34,876 [ 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 456 will-moore 'Don't use tiles for non-big movies'
- PR 460 will-moore 'Channel min spinner fix'
- PR 464 will-moore 'Tile load error warning'
- PR 465 will-moore 'Save as Figure'
Generated by OMERO-plugins-push#29 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/)'
2024-04-12 06:35:34,888 [ scc.git] DEBUG [detached HEAD 3438a0a] merge master -Dorg -Ssuccess-only
2024-04-12 06:35:34,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:35:34,889 [ scc.repo] DEBUG ## PRs found:
2024-04-12 06:35:35,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-04-12 06:35:35,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-04-12 06:35:36,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-04-12 06:35:36,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-12 06:35:37,272 [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-12 06:35:37,740 [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-12 06:35:38,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-12 06:35:38,593 [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-12 06:35:38,594 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-04-12 06:35:38,594 [ scc.repo] DEBUG ## Branches found:
2024-04-12 06:35:38,594 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-12 06:35:38,594 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:35:38,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:38,601 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-12 06:35:38,608 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-12 06:35:38,609 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-12 06:35:38,616 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-12 06:35:38,622 [ scc.git] DEBUG Already up to date.
2024-04-12 06:35:38,623 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-04-12 06:35:39,023 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-04-12 06:35:39,024 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-04-12 06:35:39,028 [ scc.git] DEBUG ## Unique users: []
2024-04-12 06:35:39,028 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:35:39,029 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:39,034 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-12 06:35:39,041 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:39,046 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-12 06:35:39,057 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-12 06:35:39,061 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-04-12 06:35:39,061 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-04-12 06:35:39,061 [ scc.git] DEBUG requirements.txt | 2 +-
2024-04-12 06:35:39,061 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-04-12 06:35:39,061 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-04-12 06:35:39,061 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-04-12 06:35:39,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:35:39,232 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-12 06:35:39,269 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:35:39,269 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:39,274 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-12 06:35:39,310 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-12 06:35:39,317 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d13538b0> has no local changes
2024-04-12 06:35:39,317 [ 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#29 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/)'
2024-04-12 06:35:39,325 [ scc.git] DEBUG [detached HEAD 06f86b1] merge master -Dorg -Ssuccess-only
2024-04-12 06:35:39,325 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:35:39,326 [ scc.repo] DEBUG ## PRs found:
2024-04-12 06:35:39,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-04-12 06:35:40,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-04-12 06:35:40,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-04-12 06:35:41,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-12 06:35:41,745 [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-12 06:35:42,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-12 06:35:42,679 [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-12 06:35:42,680 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-12 06:35:43,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-04-12 06:35:43,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-04-12 06:35:44,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-12 06:35:44,562 [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-12 06:35:45,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-12 06:35:45,513 [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-12 06:35:45,514 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-12 06:35:45,514 [ scc.repo] DEBUG ## Branches found:
2024-04-12 06:35:45,515 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-12 06:35:45,515 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:35:45,515 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:45,524 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-12 06:35:45,531 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-12 06:35:45,531 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-12 06:35:45,537 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-12 06:35:45,544 [ scc.git] DEBUG Already up to date.
2024-04-12 06:35:45,544 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-04-12 06:35:46,165 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-12 06:35:46,166 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-04-12 06:35:46,171 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-04-12 06:35:46,809 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-12 06:35:46,809 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-04-12 06:35:46,815 [ scc.git] DEBUG ## Unique users: []
2024-04-12 06:35:46,816 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:35:46,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:46,822 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-12 06:35:46,830 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:46,836 [ 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-12 06:35:46,872 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-04-12 06:35:46,872 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-04-12 06:35:46,872 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-12 06:35:46,872 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-12 06:35:46,874 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-12 06:35:46,874 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-12 06:35:46,882 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-12 06:35:46,890 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-12 06:35:47,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:35:47,047 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-12 06:35:47,054 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-12 06:35:47,060 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#29](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-04-12 06:35:47,065 [ scc.config] DEBUG Found github.token
2024-04-12 06:35:47,065 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-04-12 06:35:47,066 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-12 06:35:47,073 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:47,079 [ 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-12 06:35:47,127 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-12 06:35:47,127 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-12 06:35:47,127 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-04-12 06:35:47,127 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-12 06:35:47,127 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-12 06:35:47,133 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-12 06:35:47,142 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-12 06:35:47,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:35:47,464 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-12 06:35:47,471 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-12 06:35:47,477 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#29](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/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-12 06:35:47,481 [ scc.config] DEBUG Found github.token
2024-04-12 06:35:47,481 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-04-12 06:35:47,482 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-12 06:35:47,519 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:35:47,520 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:47,525 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-12 06:35:47,565 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-12 06:35:47,572 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d0324550> has no local changes
2024-04-12 06:35:47,572 [ 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#29 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/)'
2024-04-12 06:35:47,582 [ scc.git] DEBUG [detached HEAD 5765f29] merge master -Dorg -Ssuccess-only
2024-04-12 06:35:47,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:35:47,582 [ scc.repo] DEBUG ## PRs found:
2024-04-12 06:35:48,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-04-12 06:35:48,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-04-12 06:35:48,582 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-12 06:35:49,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-12 06:35:49,639 [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-12 06:35:50,107 [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-12 06:35:50,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-12 06:35:51,180 [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-12 06:35:51,180 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-12 06:35:51,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-04-12 06:35:51,661 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-12 06:35:52,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-12 06:35:52,713 [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-12 06:35:53,178 [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-12 06:35:53,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-12 06:35:54,159 [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-12 06:35:54,161 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-12 06:35:54,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-04-12 06:35:54,641 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-12 06:35:55,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-12 06:35:55,687 [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-12 06:35:56,160 [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-12 06:35:56,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-12 06:35:57,121 [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-12 06:35:57,122 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-12 06:35:57,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-04-12 06:35:58,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-04-12 06:35:58,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-04-12 06:35:58,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-04-12 06:35:59,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-04-12 06:35:59,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-04-12 06:35:59,987 [ scc.repo] DEBUG ## Branches found:
2024-04-12 06:35:59,987 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-12 06:35:59,987 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:35:59,987 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:35:59,994 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-12 06:36:00,001 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-12 06:36:00,001 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-12 06:36:00,008 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-12 06:36:00,015 [ scc.git] DEBUG Already up to date.
2024-04-12 06:36:00,015 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-04-12 06:36:00,403 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-12 06:36:00,403 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-04-12 06:36:00,409 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-04-12 06:36:00,786 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-12 06:36:00,787 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-04-12 06:36:00,791 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-12 06:36:01,194 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-12 06:36:01,195 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-12 06:36:01,201 [ scc.git] DEBUG ## Unique users: []
2024-04-12 06:36:01,202 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:01,202 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:01,210 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-12 06:36:01,218 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:01,227 [ 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-12 06:36:01,241 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-12 06:36:01,245 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-04-12 06:36:01,245 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-04-12 06:36:01,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:01,398 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-12 06:36:01,404 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:01,410 [ 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-12 06:36:01,470 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-12 06:36:01,471 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-12 06:36:01,474 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-04-12 06:36:01,474 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-04-12 06:36:01,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:01,813 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-12 06:36:01,820 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:01,827 [ 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-12 06:36:01,841 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-12 06:36:01,842 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-12 06:36:01,845 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-04-12 06:36:01,845 [ scc.git] DEBUG package.json | 2 +-
2024-04-12 06:36:01,846 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-04-12 06:36:02,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:02,223 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-12 06:36:02,262 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:02,262 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:02,268 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-12 06:36:02,307 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-12 06:36:02,314 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d1350fd0> has no local changes
2024-04-12 06:36:02,314 [ 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#29 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/)'
2024-04-12 06:36:02,322 [ scc.git] DEBUG [detached HEAD 3246dac] merge master -Dorg -Ssuccess-only
2024-04-12 06:36:02,323 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:02,323 [ scc.repo] DEBUG ## PRs found:
2024-04-12 06:36:02,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-04-12 06:36:03,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-04-12 06:36:03,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-12 06:36:04,214 [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-12 06:36:04,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-12 06:36:05,108 [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-12 06:36:05,109 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-04-12 06:36:05,110 [ scc.repo] DEBUG ## Branches found:
2024-04-12 06:36:05,110 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-12 06:36:05,110 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:05,110 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:05,117 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-12 06:36:05,122 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-12 06:36:05,122 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-12 06:36:05,128 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-12 06:36:05,135 [ scc.git] DEBUG Already up to date.
2024-04-12 06:36:05,135 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-12 06:36:05,517 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-04-12 06:36:05,518 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-12 06:36:05,522 [ scc.git] DEBUG ## Unique users: []
2024-04-12 06:36:05,522 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:05,522 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:05,529 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-12 06:36:05,535 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:05,540 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-12 06:36:05,550 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-12 06:36:05,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:05,718 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-12 06:36:05,760 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:05,760 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:05,767 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-12 06:36:05,807 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-12 06:36:05,815 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d02ee340> has no local changes
2024-04-12 06:36:05,816 [ 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#29 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/)'
2024-04-12 06:36:05,825 [ scc.git] DEBUG [detached HEAD 465396a] merge master -Dorg -Ssuccess-only
2024-04-12 06:36:05,825 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:05,825 [ scc.repo] DEBUG ## PRs found:
2024-04-12 06:36:06,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-04-12 06:36:06,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-04-12 06:36:07,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-04-12 06:36:07,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-04-12 06:36:08,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-12 06:36:08,719 [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-12 06:36:09,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-12 06:36:09,586 [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-12 06:36:09,587 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-12 06:36:09,587 [ scc.repo] DEBUG ## Branches found:
2024-04-12 06:36:09,587 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-12 06:36:09,587 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:09,587 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:09,594 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-12 06:36:09,601 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-12 06:36:09,601 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-12 06:36:09,610 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-12 06:36:09,617 [ scc.git] DEBUG Already up to date.
2024-04-12 06:36:09,617 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-04-12 06:36:10,260 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-04-12 06:36:10,260 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-04-12 06:36:10,265 [ scc.git] DEBUG ## Unique users: []
2024-04-12 06:36:10,266 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:10,266 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:10,272 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-12 06:36:10,280 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:10,286 [ 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-12 06:36:10,296 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-04-12 06:36:10,297 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-12 06:36:10,299 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-04-12 06:36:10,299 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-04-12 06:36:10,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:10,465 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-12 06:36:10,516 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:10,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:10,529 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-12 06:36:10,579 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-12 06:36:10,588 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d033b5b0> has no local changes
2024-04-12 06:36:10,588 [ 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#29 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/)'
2024-04-12 06:36:10,598 [ scc.git] DEBUG [detached HEAD 2ddc8a8] merge master -Dorg -Ssuccess-only
2024-04-12 06:36:10,599 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:10,599 [ scc.repo] DEBUG ## PRs found:
2024-04-12 06:36:10,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-04-12 06:36:11,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-04-12 06:36:11,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-04-12 06:36:12,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-12 06:36:13,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-12 06:36:13,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-12 06:36:13,879 [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-12 06:36:13,881 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-12 06:36:13,881 [ scc.repo] DEBUG ## Branches found:
2024-04-12 06:36:13,881 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-12 06:36:13,881 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:13,881 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:13,887 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-12 06:36:13,892 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-12 06:36:13,893 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-12 06:36:13,899 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-12 06:36:13,905 [ scc.git] DEBUG Already up to date.
2024-04-12 06:36:13,905 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-12 06:36:14,321 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-04-12 06:36:14,321 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-12 06:36:14,330 [ scc.git] DEBUG ## Unique users: []
2024-04-12 06:36:14,330 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:14,330 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:14,339 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-12 06:36:14,348 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:14,357 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-12 06:36:14,413 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-04-12 06:36:14,413 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-04-12 06:36:14,413 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-04-12 06:36:14,413 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-04-12 06:36:14,413 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-04-12 06:36:14,413 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-04-12 06:36:14,413 [ scc.git] DEBUG Auto-merging setup.py
2024-04-12 06:36:14,413 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-04-12 06:36:14,413 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-12 06:36:14,414 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-12 06:36:14,421 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-12 06:36:14,428 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-04-12 06:36:14,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:14,585 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-12 06:36:14,592 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-12 06:36:14,599 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#29](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- setup.py
- omero_signup/views.py
- omero_signup/urls.py
--conflicts
2024-04-12 06:36:14,604 [ scc.config] DEBUG Found github.token
2024-04-12 06:36:14,605 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-04-12 06:36:14,605 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-12 06:36:14,680 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:14,680 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:14,688 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-12 06:36:14,729 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-12 06:36:14,736 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d1382e80> has no local changes
2024-04-12 06:36:14,736 [ 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#29 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/)'
2024-04-12 06:36:14,747 [ scc.git] DEBUG [detached HEAD 9a7c46f] merge master -Dorg -Ssuccess-only
2024-04-12 06:36:14,747 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:14,748 [ scc.repo] DEBUG ## PRs found:
2024-04-12 06:36:15,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-04-12 06:36:15,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-04-12 06:36:16,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-04-12 06:36:16,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-12 06:36:17,062 [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-12 06:36:17,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-12 06:36:18,001 [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-12 06:36:18,002 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-12 06:36:18,003 [ scc.repo] DEBUG ## Branches found:
2024-04-12 06:36:18,003 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-12 06:36:18,003 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:18,003 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:18,010 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-12 06:36:18,015 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-12 06:36:18,015 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-12 06:36:18,021 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-12 06:36:18,028 [ scc.git] DEBUG Already up to date.
2024-04-12 06:36:18,028 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-04-12 06:36:18,460 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-04-12 06:36:18,461 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-04-12 06:36:18,465 [ scc.git] DEBUG ## Unique users: []
2024-04-12 06:36:18,465 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:18,466 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:18,472 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-04-12 06:36:18,480 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:18,487 [ 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-12 06:36:18,500 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-12 06:36:18,503 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-04-12 06:36:18,503 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-04-12 06:36:18,503 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-04-12 06:36:18,503 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-04-12 06:36:18,504 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-04-12 06:36:18,504 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-04-12 06:36:18,504 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-04-12 06:36:18,504 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-04-12 06:36:18,504 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-04-12 06:36:18,504 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-04-12 06:36:18,504 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-04-12 06:36:18,505 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-04-12 06:36:18,505 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-04-12 06:36:18,505 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-04-12 06:36:18,506 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-04-12 06:36:18,506 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-04-12 06:36:18,506 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-04-12 06:36:18,506 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-04-12 06:36:18,506 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-04-12 06:36:18,506 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-04-12 06:36:18,506 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-04-12 06:36:18,506 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-04-12 06:36:18,506 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-04-12 06:36:18,506 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-04-12 06:36:18,506 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-04-12 06:36:18,507 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-04-12 06:36:18,507 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-04-12 06:36:18,507 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-04-12 06:36:18,507 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-04-12 06:36:18,507 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-04-12 06:36:18,507 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-04-12 06:36:18,507 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-04-12 06:36:18,507 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-04-12 06:36:18,507 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-04-12 06:36:18,507 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-04-12 06:36:18,507 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-04-12 06:36:18,507 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-04-12 06:36:18,507 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-04-12 06:36:18,507 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-04-12 06:36:18,507 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-04-12 06:36:18,507 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-04-12 06:36:18,507 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-04-12 06:36:18,507 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-04-12 06:36:18,507 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-04-12 06:36:18,507 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-04-12 06:36:18,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:18,652 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-12 06:36:18,692 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:18,692 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:18,697 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-12 06:36:18,741 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-12 06:36:18,752 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d1350df0> has no local changes
2024-04-12 06:36:18,752 [ 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#29 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/)'
2024-04-12 06:36:18,779 [ scc.git] DEBUG [detached HEAD e0a1846] merge master -Dorg -Ssuccess-only
2024-04-12 06:36:18,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:18,780 [ scc.repo] DEBUG ## PRs found:
2024-04-12 06:36:19,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-04-12 06:36:19,087 [ scc.repo] DEBUG ## Branches found:
2024-04-12 06:36:19,087 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-12 06:36:19,087 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:19,087 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:19,095 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-12 06:36:19,102 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-12 06:36:19,102 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-12 06:36:19,109 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-12 06:36:19,117 [ scc.git] DEBUG Already up to date.
2024-04-12 06:36:19,117 [ scc.git] DEBUG ## Unique users: []
2024-04-12 06:36:19,117 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:19,117 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:19,124 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-12 06:36:19,173 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:19,173 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:19,180 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-12 06:36:19,229 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-12 06:36:19,241 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d0320fa0> has no local changes
2024-04-12 06:36:19,241 [ 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#29 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/)'
2024-04-12 06:36:19,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:19,253 [ scc.git] DEBUG [detached HEAD be0e9c8] merge master -Dorg -Ssuccess-only
2024-04-12 06:36:19,254 [ scc.repo] DEBUG ## PRs found:
2024-04-12 06:36:19,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-04-12 06:36:19,518 [ scc.repo] DEBUG ## Branches found:
2024-04-12 06:36:19,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-12 06:36:19,518 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:19,518 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:19,525 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-12 06:36:19,531 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-12 06:36:19,532 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-12 06:36:19,539 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-12 06:36:19,546 [ scc.git] DEBUG Already up to date.
2024-04-12 06:36:19,547 [ scc.git] DEBUG ## Unique users: []
2024-04-12 06:36:19,547 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:19,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:19,555 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-12 06:36:19,619 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:19,620 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:19,632 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-12 06:36:19,691 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-12 06:36:19,699 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d02e5f70> has no local changes
2024-04-12 06:36:19,699 [ 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#29 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/)'
2024-04-12 06:36:19,709 [ scc.git] DEBUG [detached HEAD 03ac720] merge master -Dorg -Ssuccess-only
2024-04-12 06:36:19,710 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:19,710 [ scc.git] INFO Overriding base-branch from master to main
2024-04-12 06:36:19,710 [ scc.repo] DEBUG ## PRs found:
2024-04-12 06:36:20,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-04-12 06:36:20,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-04-12 06:36:20,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-04-12 06:36:21,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-04-12 06:36:21,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-12 06:36:22,476 [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-12 06:36:22,986 [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-12 06:36:23,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-12 06:36:23,851 [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-12 06:36:23,852 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-12 06:36:23,853 [ scc.repo] DEBUG ## Branches found:
2024-04-12 06:36:23,853 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-12 06:36:23,853 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:23,853 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:23,863 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-04-12 06:36:23,869 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-12 06:36:23,869 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-04-12 06:36:23,874 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-04-12 06:36:23,882 [ scc.git] DEBUG Already up to date.
2024-04-12 06:36:23,882 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-12 06:36:24,301 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-04-12 06:36:24,302 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-12 06:36:24,307 [ scc.git] DEBUG ## Unique users: []
2024-04-12 06:36:24,308 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:24,308 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:24,314 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-12 06:36:24,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:24,328 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-12 06:36:24,347 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-04-12 06:36:24,348 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-04-12 06:36:24,348 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-12 06:36:24,348 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-12 06:36:24,355 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-12 06:36:24,362 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-04-12 06:36:24,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:24,552 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-12 06:36:24,559 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-12 06:36:24,565 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#29](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-04-12 06:36:24,570 [ scc.config] DEBUG Found github.token
2024-04-12 06:36:24,571 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-04-12 06:36:24,571 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-12 06:36:24,613 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:24,613 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:24,620 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-12 06:36:24,665 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-12 06:36:24,672 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d029d430> has no local changes
2024-04-12 06:36:24,673 [ 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#29 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/)'
2024-04-12 06:36:24,682 [ scc.git] DEBUG [detached HEAD d5ad723] merge master -Dorg -Ssuccess-only
2024-04-12 06:36:24,682 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:24,682 [ scc.repo] DEBUG ## PRs found:
2024-04-12 06:36:24,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-04-12 06:36:24,984 [ scc.repo] DEBUG ## Branches found:
2024-04-12 06:36:24,984 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-12 06:36:24,984 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:24,985 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:24,992 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-12 06:36:25,000 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-12 06:36:25,000 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-12 06:36:25,008 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-12 06:36:25,016 [ scc.git] DEBUG Already up to date.
2024-04-12 06:36:25,017 [ scc.git] DEBUG ## Unique users: []
2024-04-12 06:36:25,017 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:25,017 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:25,026 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-12 06:36:25,080 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:25,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:25,088 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-12 06:36:25,146 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-12 06:36:25,154 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d02d2e50> has no local changes
2024-04-12 06:36:25,154 [ 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#29 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/)'
2024-04-12 06:36:25,165 [ scc.git] DEBUG [detached HEAD 02901c7] merge master -Dorg -Ssuccess-only
2024-04-12 06:36:25,165 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:25,166 [ scc.repo] DEBUG ## PRs found:
2024-04-12 06:36:25,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-04-12 06:36:25,422 [ scc.repo] DEBUG ## Branches found:
2024-04-12 06:36:25,422 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-12 06:36:25,422 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:25,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:25,430 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-12 06:36:25,438 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-12 06:36:25,439 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-12 06:36:25,450 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-12 06:36:25,463 [ scc.git] DEBUG Already up to date.
2024-04-12 06:36:25,463 [ scc.git] DEBUG ## Unique users: []
2024-04-12 06:36:25,464 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:25,464 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:25,476 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-12 06:36:25,549 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:25,550 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:25,560 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-12 06:36:25,623 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-12 06:36:25,638 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d020f940> has no local changes
2024-04-12 06:36:25,638 [ 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#29 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/)'
2024-04-12 06:36:25,659 [ scc.git] DEBUG [detached HEAD 4f646df] merge master -Dorg -Ssuccess-only
2024-04-12 06:36:25,659 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:25,659 [ scc.repo] DEBUG ## PRs found:
2024-04-12 06:36:25,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-04-12 06:36:26,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-04-12 06:36:26,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-04-12 06:36:27,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-12 06:36:27,828 [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-12 06:36:28,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-12 06:36:28,730 [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-12 06:36:28,731 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-04-12 06:36:28,731 [ scc.repo] DEBUG ## Branches found:
2024-04-12 06:36:28,731 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-12 06:36:28,732 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:28,732 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:28,745 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-12 06:36:28,755 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-12 06:36:28,757 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-12 06:36:28,767 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-12 06:36:28,774 [ scc.git] DEBUG Already up to date.
2024-04-12 06:36:28,775 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-04-12 06:36:29,221 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-04-12 06:36:29,221 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-04-12 06:36:29,227 [ scc.git] DEBUG ## Unique users: []
2024-04-12 06:36:29,227 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:29,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:29,233 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-12 06:36:29,239 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:29,245 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-12 06:36:29,314 [ scc.git] DEBUG Auto-merging Dockerfile
2024-04-12 06:36:29,314 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-04-12 06:36:29,314 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-12 06:36:29,315 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-12 06:36:29,323 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-12 06:36:29,332 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-04-12 06:36:29,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:29,497 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-12 06:36:29,505 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-12 06:36:29,513 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#29](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-04-12 06:36:29,521 [ scc.config] DEBUG Found github.token
2024-04-12 06:36:29,521 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-04-12 06:36:29,522 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-12 06:36:29,571 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:29,571 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:29,581 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-12 06:36:29,635 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-12 06:36:29,644 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d026e6a0> has no local changes
2024-04-12 06:36:29,644 [ 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#29 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/)'
2024-04-12 06:36:29,654 [ scc.git] DEBUG [detached HEAD c84308d] merge master -Dorg -Ssuccess-only
2024-04-12 06:36:29,655 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:29,655 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-12 06:36:29,655 [ scc.repo] DEBUG ## PRs found:
2024-04-12 06:36:30,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-12 06:36:30,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-12 06:36:30,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-12 06:36:31,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-12 06:36:31,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-12 06:36:32,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-12 06:36:32,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-12 06:36:33,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-12 06:36:33,694 [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-12 06:36:34,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-12 06:36:34,558 [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-12 06:36:34,559 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-12 06:36:35,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-12 06:36:35,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-12 06:36:36,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-12 06:36:36,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-12 06:36:36,488 [ scc.repo] DEBUG ## Branches found:
2024-04-12 06:36:36,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-12 06:36:36,488 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:36,488 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:36,495 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-12 06:36:36,500 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-12 06:36:36,500 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-12 06:36:36,506 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-12 06:36:36,512 [ scc.git] DEBUG Already up to date.
2024-04-12 06:36:36,513 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-12 06:36:36,939 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-04-12 06:36:36,939 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-12 06:36:36,944 [ scc.git] DEBUG ## Unique users: []
2024-04-12 06:36:36,945 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:36,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:36,951 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-12 06:36:36,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:36,966 [ 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-12 06:36:37,006 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-12 06:36:37,007 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-12 06:36:37,007 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-12 06:36:37,008 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-12 06:36:37,020 [ scc.git] DEBUG Calling 'git reset --hard 2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-12 06:36:37,034 [ scc.git] DEBUG HEAD is now at 2078ac7 Bump version: 5.8.0 → 5.8.1.dev0
2024-04-12 06:36:37,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:37,203 [ scc.git] DEBUG Calling 'git merge-base 2078ac72dbf11f2733e685000a274eff81c2ac2d 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-12 06:36:37,211 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-12 06:36:37,218 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#29](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-12 06:36:37,224 [ scc.config] DEBUG Found github.token
2024-04-12 06:36:37,224 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-12 06:36:37,224 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-12 06:36:37,269 [ scc.git] DEBUG Get sha1 of %s
2024-04-12 06:36:37,270 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-12 06:36:37,276 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-12 06:36:37,316 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-12 06:36:37,323 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d020fbb0> has no local changes
2024-04-12 06:36:37,323 [ 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#29 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/)'
2024-04-12 06:36:37,332 [ scc.git] DEBUG [detached HEAD 3df2698] merge master -Dorg -Ssuccess-only
2024-04-12 06:36:37,332 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:37,333 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-12 06:36:37,427 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-04-12 06:36:37,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:37,640 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-04-12 06:36:37,647 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-04-12 06:36:38,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:38,097 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-04-12 06:36:38,102 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-04-12 06:36:38,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:38,506 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-04-12 06:36:38,513 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-04-12 06:36:38,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:38,931 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-04-12 06:36:39,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:39,329 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-04-12 06:36:39,335 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-04-12 06:36:39,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:39,747 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-04-12 06:36:39,753 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-04-12 06:36:40,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:40,158 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-04-12 06:36:40,166 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-04-12 06:36:40,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:40,595 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-04-12 06:36:40,600 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-04-12 06:36:40,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:40,996 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-04-12 06:36:41,002 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-04-12 06:36:41,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:41,401 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-04-12 06:36:41,406 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-04-12 06:36:41,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:41,797 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-04-12 06:36:41,802 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-04-12 06:36:42,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:42,202 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-04-12 06:36:42,208 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-04-12 06:36:42,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:42,616 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-04-12 06:36:43,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:43,028 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-04-12 06:36:43,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:43,429 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-04-12 06:36:43,434 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-04-12 06:36:43,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:43,839 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-04-12 06:36:44,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:44,240 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-04-12 06:36:44,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:44,655 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-04-12 06:36:44,661 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-04-12 06:36:45,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:45,095 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-04-12 06:36:45,101 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-04-12 06:36:45,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:45,507 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-04-12 06:36:45,511 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-04-12 06:36:45,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:45,955 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-04-12 06:36:45,959 [ scc.config] DEBUG Found submodule.scripts.url
2024-04-12 06:36:46,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-12 06:36:46,355 [ scc.config] DEBUG Found submodule.scripts.branch
2024-04-12 06:36:46,356 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-12 06:36:46,436 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f59d481f460> has local changes
2024-04-12 06:36:46,437 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 359 dependabot[bot] 'Bump omero-figure from `3b7ccfa` to `852b510`'
- PR 360 dependabot[bot] 'Bump omero-iviewer from `a232ed0` to `9d8d147`'
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'
- PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
- PR 550 will-moore 'Don't update zoom to undefined on setId'
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 456 will-moore 'Don't use tiles for non-big movies'
- PR 460 will-moore 'Channel min spinner fix'
- PR 464 will-moore 'Tile load error warning'
- PR 465 will-moore 'Save as Figure'
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#29 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/29/)'
2024-04-12 06:36:46,451 [ scc.git] DEBUG [detached HEAD 9558cb5] merge master -Dorg -Ssuccess-only
2024-04-12 06:36:46,452 [ scc.merge] INFO Repository: ome/omero-plugins
2024-04-12 06:36:46,452 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-04-12 06:36:46,452 [ scc.merge] INFO Already up to date.
2024-04-12 06:36:46,452 [ scc.merge] INFO
2024-04-12 06:36:46,452 [ scc.merge] INFO Merged PRs:
2024-04-12 06:36:46,452 [ scc.merge] INFO - PR 359 dependabot[bot] 'Bump omero-figure from `3b7ccfa` to `852b510`'
2024-04-12 06:36:46,452 [ scc.merge] INFO - PR 360 dependabot[bot] 'Bump omero-iviewer from `a232ed0` to `9d8d147`'
2024-04-12 06:36:46,452 [ scc.merge] INFO
2024-04-12 06:36:46,452 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-04-12 06:36:46,452 [ scc.merge] INFO Already up to date.
2024-04-12 06:36:46,452 [ scc.merge] INFO
2024-04-12 06:36:46,452 [ scc.merge] INFO
2024-04-12 06:36:46,452 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-04-12 06:36:46,452 [ scc.merge] INFO Excluded PRs:
2024-04-12 06:36:46,452 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-04-12 06:36:46,452 [ scc.merge] INFO Already up to date.
2024-04-12 06:36:46,452 [ scc.merge] INFO
2024-04-12 06:36:46,452 [ scc.merge] INFO Merged PRs:
2024-04-12 06:36:46,452 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-04-12 06:36:46,452 [ scc.merge] INFO
2024-04-12 06:36:46,452 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-04-12 06:36:46,452 [ scc.merge] INFO Excluded PRs:
2024-04-12 06:36:46,452 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-04-12 06:36:46,452 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-04-12 06:36:46,452 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-04-12 06:36:46,452 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-04-12 06:36:46,452 [ scc.merge] INFO Already up to date.
2024-04-12 06:36:46,453 [ scc.merge] INFO
2024-04-12 06:36:46,453 [ scc.merge] INFO Merged PRs:
2024-04-12 06:36:46,453 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-04-12 06:36:46,453 [ scc.merge] INFO
2024-04-12 06:36:46,453 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-04-12 06:36:46,453 [ scc.merge] INFO Excluded PRs:
2024-04-12 06:36:46,453 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-12 06:36:46,453 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-04-12 06:36:46,453 [ scc.merge] INFO Already up to date.
2024-04-12 06:36:46,453 [ scc.merge] INFO
2024-04-12 06:36:46,453 [ scc.merge] INFO Merged PRs:
2024-04-12 06:36:46,453 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-04-12 06:36:46,453 [ scc.merge] INFO
2024-04-12 06:36:46,453 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-12 06:36:46,453 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-04-12 06:36:46,453 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-04-12 06:36:46,453 [ scc.merge] INFO
2024-04-12 06:36:46,453 [ scc.merge] INFO Repository: ome/omero-figure
2024-04-12 06:36:46,453 [ scc.merge] INFO Excluded PRs:
2024-04-12 06:36:46,453 [ scc.merge] INFO - PR 549 will-moore 'Inset feature' (stage: draft)
2024-04-12 06:36:46,453 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-04-12 06:36:46,453 [ scc.merge] INFO Already up to date.
2024-04-12 06:36:46,453 [ scc.merge] INFO
2024-04-12 06:36:46,453 [ scc.merge] INFO Merged PRs:
2024-04-12 06:36:46,453 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-04-12 06:36:46,453 [ scc.merge] INFO - PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
2024-04-12 06:36:46,453 [ scc.merge] INFO - PR 550 will-moore 'Don't update zoom to undefined on setId'
2024-04-12 06:36:46,453 [ scc.merge] INFO
2024-04-12 06:36:46,453 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-04-12 06:36:46,453 [ scc.merge] INFO Already up to date.
2024-04-12 06:36:46,453 [ scc.merge] INFO
2024-04-12 06:36:46,453 [ scc.merge] INFO Merged PRs:
2024-04-12 06:36:46,453 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-04-12 06:36:46,453 [ scc.merge] INFO
2024-04-12 06:36:46,453 [ scc.merge] INFO Repository: ome/omero-gallery
2024-04-12 06:36:46,453 [ scc.merge] INFO Already up to date.
2024-04-12 06:36:46,453 [ scc.merge] INFO
2024-04-12 06:36:46,453 [ scc.merge] INFO Merged PRs:
2024-04-12 06:36:46,453 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-12 06:36:46,454 [ scc.merge] INFO
2024-04-12 06:36:46,454 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-04-12 06:36:46,454 [ scc.merge] INFO Excluded PRs:
2024-04-12 06:36:46,454 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-04-12 06:36:46,454 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-04-12 06:36:46,454 [ scc.merge] INFO Already up to date.
2024-04-12 06:36:46,454 [ scc.merge] INFO
2024-04-12 06:36:46,454 [ scc.merge] INFO Merged PRs:
2024-04-12 06:36:46,454 [ scc.merge] INFO - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-04-12 06:36:46,454 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-04-12 06:36:46,454 [ scc.merge] INFO - PR 464 will-moore 'Tile load error warning'
2024-04-12 06:36:46,454 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-04-12 06:36:46,454 [ scc.merge] INFO
2024-04-12 06:36:46,454 [ scc.merge] INFO Repository: ome/omero-mapr
2024-04-12 06:36:46,454 [ scc.merge] INFO Excluded PRs:
2024-04-12 06:36:46,454 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-04-12 06:36:46,454 [ scc.merge] INFO Already up to date.
2024-04-12 06:36:46,454 [ scc.merge] INFO
2024-04-12 06:36:46,454 [ scc.merge] INFO Merged PRs:
2024-04-12 06:36:46,454 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-04-12 06:36:46,454 [ scc.merge] INFO
2024-04-12 06:36:46,454 [ scc.merge] INFO Repository: ome/omero-metadata
2024-04-12 06:36:46,454 [ scc.merge] INFO Already up to date.
2024-04-12 06:36:46,454 [ scc.merge] INFO
2024-04-12 06:36:46,454 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-12 06:36:46,454 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-12 06:36:46,454 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-12 06:36:46,454 [ scc.merge] INFO
2024-04-12 06:36:46,454 [ scc.merge] INFO Repository: ome/omero-parade
2024-04-12 06:36:46,454 [ scc.merge] INFO Excluded PRs:
2024-04-12 06:36:46,454 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-04-12 06:36:46,454 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-04-12 06:36:46,454 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-04-12 06:36:46,454 [ scc.merge] INFO Already up to date.
2024-04-12 06:36:46,454 [ scc.merge] INFO
2024-04-12 06:36:46,454 [ scc.merge] INFO Merged PRs:
2024-04-12 06:36:46,454 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-12 06:36:46,454 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-12 06:36:46,454 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-12 06:36:46,455 [ scc.merge] INFO
2024-04-12 06:36:46,455 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-04-12 06:36:46,455 [ scc.merge] INFO Already up to date.
2024-04-12 06:36:46,455 [ scc.merge] INFO
2024-04-12 06:36:46,455 [ scc.merge] INFO Merged PRs:
2024-04-12 06:36:46,455 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-04-12 06:36:46,455 [ scc.merge] INFO
2024-04-12 06:36:46,455 [ scc.merge] INFO Repository: ome/omero-rois
2024-04-12 06:36:46,455 [ scc.merge] INFO Excluded PRs:
2024-04-12 06:36:46,455 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-12 06:36:46,455 [ scc.merge] INFO Already up to date.
2024-04-12 06:36:46,455 [ scc.merge] INFO
2024-04-12 06:36:46,455 [ scc.merge] INFO Merged PRs:
2024-04-12 06:36:46,455 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-12 06:36:46,455 [ scc.merge] INFO
2024-04-12 06:36:46,455 [ scc.merge] INFO Repository: ome/omero-signup
2024-04-12 06:36:46,455 [ scc.merge] INFO Already up to date.
2024-04-12 06:36:46,455 [ scc.merge] INFO
2024-04-12 06:36:46,455 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-12 06:36:46,455 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-12 06:36:46,455 [ scc.merge] INFO
2024-04-12 06:36:46,455 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-04-12 06:36:46,455 [ scc.merge] INFO Already up to date.
2024-04-12 06:36:46,455 [ scc.merge] INFO
2024-04-12 06:36:46,455 [ scc.merge] INFO Merged PRs:
2024-04-12 06:36:46,455 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-12 06:36:46,455 [ scc.merge] INFO
2024-04-12 06:36:46,455 [ scc.merge] INFO Repository: ome/omero-upload
2024-04-12 06:36:46,455 [ scc.merge] INFO Already up to date.
2024-04-12 06:36:46,455 [ scc.merge] INFO
2024-04-12 06:36:46,455 [ scc.merge] INFO
2024-04-12 06:36:46,455 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-04-12 06:36:46,455 [ scc.merge] INFO Already up to date.
2024-04-12 06:36:46,455 [ scc.merge] INFO
2024-04-12 06:36:46,455 [ scc.merge] INFO
2024-04-12 06:36:46,455 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-04-12 06:36:46,455 [ scc.merge] INFO Excluded PRs:
2024-04-12 06:36:46,455 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-04-12 06:36:46,455 [ scc.merge] INFO Already up to date.
2024-04-12 06:36:46,455 [ scc.merge] INFO
2024-04-12 06:36:46,456 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-12 06:36:46,456 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-12 06:36:46,456 [ scc.merge] INFO
2024-04-12 06:36:46,456 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-04-12 06:36:46,456 [ scc.merge] INFO Already up to date.
2024-04-12 06:36:46,456 [ scc.merge] INFO
2024-04-12 06:36:46,456 [ scc.merge] INFO
2024-04-12 06:36:46,456 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-04-12 06:36:46,456 [ scc.merge] INFO Already up to date.
2024-04-12 06:36:46,456 [ scc.merge] INFO
2024-04-12 06:36:46,456 [ scc.merge] INFO
2024-04-12 06:36:46,456 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-04-12 06:36:46,456 [ scc.merge] INFO Already up to date.
2024-04-12 06:36:46,456 [ scc.merge] INFO
2024-04-12 06:36:46,456 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-12 06:36:46,456 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-04-12 06:36:46,456 [ scc.merge] INFO
2024-04-12 06:36:46,456 [ scc.merge] INFO Repository: ome/scripts
2024-04-12 06:36:46,456 [ scc.merge] INFO Excluded PRs:
2024-04-12 06:36:46,456 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-12 06:36:46,456 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-12 06:36:46,456 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-12 06:36:46,456 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-12 06:36:46,456 [ scc.merge] INFO Already up to date.
2024-04-12 06:36:46,456 [ scc.merge] INFO
2024-04-12 06:36:46,456 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-12 06:36:46,456 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-12 06:36:46,456 [ scc.merge] INFO
2024-04-12 06:36:46,456 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-12 06:36:46,456 [ scc.git] DEBUG Calling 'git remote'
2024-04-12 06:36:46,462 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-04-12 06:36:46,463 [ scc.git] DEBUG Calling 'git remote'
2024-04-12 06:36:46,468 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:46,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-04-12 06:36:46,469 [ scc.git] DEBUG Calling 'git remote'
2024-04-12 06:36:46,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:46,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-04-12 06:36:46,475 [ scc.git] DEBUG Calling 'git remote'
2024-04-12 06:36:46,480 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:46,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-04-12 06:36:46,481 [ scc.git] DEBUG Calling 'git remote'
2024-04-12 06:36:46,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:46,487 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-04-12 06:36:46,487 [ scc.git] DEBUG Calling 'git remote'
2024-04-12 06:36:46,492 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:46,492 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-12 06:36:46,492 [ scc.git] DEBUG Calling 'git remote'
2024-04-12 06:36:46,499 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:46,499 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-12 06:36:46,499 [ scc.git] DEBUG Calling 'git remote'
2024-04-12 06:36:46,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:46,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-12 06:36:46,505 [ scc.git] DEBUG Calling 'git remote'
2024-04-12 06:36:46,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:46,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-12 06:36:46,510 [ scc.git] DEBUG Calling 'git remote'
2024-04-12 06:36:46,515 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:46,515 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-12 06:36:46,516 [ scc.git] DEBUG Calling 'git remote'
2024-04-12 06:36:46,521 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:46,521 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-12 06:36:46,521 [ scc.git] DEBUG Calling 'git remote'
2024-04-12 06:36:46,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:46,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-12 06:36:46,527 [ scc.git] DEBUG Calling 'git remote'
2024-04-12 06:36:46,532 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:46,532 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-12 06:36:46,532 [ scc.git] DEBUG Calling 'git remote'
2024-04-12 06:36:46,539 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:46,539 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-12 06:36:46,539 [ scc.git] DEBUG Calling 'git remote'
2024-04-12 06:36:46,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:46,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-12 06:36:46,547 [ scc.git] DEBUG Calling 'git remote'
2024-04-12 06:36:46,554 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:46,555 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-12 06:36:46,555 [ scc.git] DEBUG Calling 'git remote'
2024-04-12 06:36:46,564 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:46,564 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-12 06:36:46,565 [ scc.git] DEBUG Calling 'git remote'
2024-04-12 06:36:46,575 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:46,575 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-12 06:36:46,575 [ scc.git] DEBUG Calling 'git remote'
2024-04-12 06:36:46,594 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:46,594 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-12 06:36:46,594 [ scc.git] DEBUG Calling 'git remote'
2024-04-12 06:36:46,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:46,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-12 06:36:46,602 [ scc.git] DEBUG Calling 'git remote'
2024-04-12 06:36:46,607 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:46,607 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-12 06:36:46,607 [ scc.git] DEBUG Calling 'git remote'
2024-04-12 06:36:46,612 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-12 06:36:46,613 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-12 06:36:46,613 [ scc.git] DEBUG Calling 'git remote'
2024-04-12 06:36:46,617 [ 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 ea9a008] 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 852b5109
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 69715ad] 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-12 06:37:33,218 [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-12 06:37:42,267 [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-12 06:37:44,629 [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-12 06:37:49,279 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-12 06:38:37,173 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f5fa13f0/images/svgs/logo.svg){kind=logo}
