Skipping 120 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-04-19 08:29:45,209 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.eot
2024-04-19 08:29:45,209 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.svg
2024-04-19 08:29:45,209 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.ttf
2024-04-19 08:29:45,209 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.woff
2024-04-19 08:29:45,209 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/js/bootstrap.js
2024-04-19 08:29:45,209 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/js/bootstrap.min.js
2024-04-19 08:29:45,209 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.css
2024-04-19 08:29:45,209 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css
2024-04-19 08:29:45,209 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png
2024-04-19 08:29:45,209 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png
2024-04-19 08:29:45,209 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png
2024-04-19 08:29:45,209 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png
2024-04-19 08:29:45,209 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.js
2024-04-19 08:29:45,209 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js
2024-04-19 08:29:45,209 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-1.11.1/jquery.min.js
2024-04-19 08:29:45,209 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.base.css
2024-04-19 08:29:45,209 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.slider.css
2024-04-19 08:29:45,209 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/jquery-ui.min.js
2024-04-19 08:29:45,209 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/json2.js
2024-04-19 08:29:45,210 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.js
2024-04-19 08:29:45,210 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.min.js
2024-04-19 08:29:45,210 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/mousetrap-1.5.3/mousetrap.min.js
2024-04-19 08:29:45,210 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael-min.js
2024-04-19 08:29:45,210 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael.js
2024-04-19 08:29:45,210 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/scaleraphael.js
2024-04-19 08:29:45,210 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/underscore-1.13.1-umd-min.js
2024-04-19 08:29:45,210 [ scc.git] DEBUG delete mode 100644 omero_figure/templates/figure/index.html
2024-04-19 08:29:45,210 [ scc.git] DEBUG delete mode 100644 spec/ViewportViewSpec.js
2024-04-19 08:29:45,210 [ scc.git] DEBUG delete mode 100644 spec/images/testImage.png
2024-04-19 08:29:45,210 [ scc.git] DEBUG delete mode 100644 spec/javascripts/PanelSpec.js
2024-04-19 08:29:45,210 [ scc.git] DEBUG delete mode 100644 spec/javascripts/ViewportViewSpec.js
2024-04-19 08:29:45,210 [ scc.git] DEBUG delete mode 100644 spec/javascripts/fixtures/previewTab.html
2024-04-19 08:29:45,210 [ scc.git] DEBUG create mode 100644 src/.env
2024-04-19 08:29:45,210 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/css/figure.css (70%)
2024-04-19 08:29:45,210 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/arrow-icon-16.png (100%)
2024-04-19 08:29:45,210 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-04-19 08:29:45,210 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-04-19 08:29:45,210 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-04-19 08:29:45,210 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-04-19 08:29:45,210 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-04-19 08:29:45,210 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-04-19 08:29:45,210 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-04-19 08:29:45,210 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-04-19 08:29:45,210 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-04-19 08:29:45,210 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-19 08:29:45,210 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-04-19 08:29:45,210 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-04-19 08:29:45,210 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-04-19 08:29:45,210 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-04-19 08:29:45,210 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-04-19 08:29:45,210 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-04-19 08:29:45,210 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-04-19 08:29:45,210 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-04-19 08:29:45,210 [ scc.git] DEBUG create mode 100644 src/index.html
2024-04-19 08:29:45,211 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-04-19 08:29:45,211 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-04-19 08:29:45,211 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-04-19 08:29:45,211 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-04-19 08:29:45,211 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-04-19 08:29:45,211 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-04-19 08:29:45,211 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-04-19 08:29:45,211 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-04-19 08:29:45,211 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-04-19 08:29:45,211 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-19 08:29:45,211 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-04-19 08:29:45,211 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-04-19 08:29:45,211 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-04-19 08:29:45,211 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-04-19 08:29:45,211 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-04-19 08:29:45,211 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-04-19 08:29:45,211 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-04-19 08:29:45,211 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-04-19 08:29:45,211 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-04-19 08:29:45,211 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-04-19 08:29:45,211 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-04-19 08:29:45,211 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-04-19 08:29:45,211 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-04-19 08:29:45,211 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-04-19 08:29:45,211 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-04-19 08:29:45,211 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-04-19 08:29:45,211 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-04-19 08:29:45,211 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-04-19 08:29:45,211 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-04-19 08:29:45,211 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-04-19 08:29:45,211 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-04-19 08:29:45,211 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-04-19 08:29:45,211 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-04-19 08:29:45,211 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-04-19 08:29:45,211 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-04-19 08:29:45,212 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-04-19 08:29:45,212 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-04-19 08:29:45,212 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-04-19 08:29:45,212 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-04-19 08:29:45,212 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-04-19 08:29:45,212 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-04-19 08:29:45,212 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-04-19 08:29:45,212 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-04-19 08:29:45,212 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-04-19 08:29:45,212 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-04-19 08:29:45,212 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-04-19 08:29:45,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:29:45,376 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-19 08:29:45,423 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:29:45,423 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:29:45,430 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-19 08:29:45,473 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-19 08:29:45,485 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18aed01be0> has no local changes
2024-04-19 08:29:45,485 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 549 will-moore 'Inset feature' (stage: draft)
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
Generated by OMERO-plugins-push#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/)'
2024-04-19 08:29:45,502 [ scc.git] DEBUG [detached HEAD 38735c91] merge master -Dorg -Ssuccess-only
2024-04-19 08:29:45,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:29:45,502 [ scc.repo] DEBUG ## PRs found:
2024-04-19 08:29:45,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-04-19 08:29:46,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-04-19 08:29:46,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-04-19 08:29:47,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-19 08:29:47,758 [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-19 08:29:48,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-19 08:29:48,616 [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-19 08:29:48,617 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-04-19 08:29:48,617 [ scc.repo] DEBUG ## Branches found:
2024-04-19 08:29:48,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-19 08:29:48,617 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:29:48,617 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:29:48,627 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-19 08:29:48,637 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-19 08:29:48,638 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-19 08:29:48,648 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-19 08:29:48,658 [ scc.git] DEBUG Already up to date.
2024-04-19 08:29:48,658 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-04-19 08:29:49,120 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-04-19 08:29:49,120 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-04-19 08:29:49,129 [ scc.git] DEBUG ## Unique users: []
2024-04-19 08:29:49,129 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:29:49,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:29:49,139 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-19 08:29:49,151 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:29:49,163 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-19 08:29:49,185 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-04-19 08:29:49,187 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-19 08:29:49,191 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-04-19 08:29:49,191 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-19 08:29:49,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:29:49,362 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-19 08:29:49,475 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:29:49,476 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:29:49,488 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-19 08:29:49,594 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-19 08:29:49,607 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18aecb8550> has no local changes
2024-04-19 08:29:49,607 [ 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#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/)'
2024-04-19 08:29:49,626 [ scc.git] DEBUG [detached HEAD 6ab0886] merge master -Dorg -Ssuccess-only
2024-04-19 08:29:49,628 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:29:49,628 [ scc.repo] DEBUG ## PRs found:
2024-04-19 08:29:49,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-04-19 08:29:50,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-04-19 08:29:50,323 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-19 08:29:50,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-19 08:29:51,467 [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-19 08:29:51,954 [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-19 08:29:52,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-19 08:29:52,985 [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-19 08:29:52,986 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-19 08:29:52,986 [ scc.repo] DEBUG ## Branches found:
2024-04-19 08:29:52,986 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-19 08:29:52,986 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:29:52,986 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:29:52,996 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-19 08:29:53,004 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-19 08:29:53,005 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-19 08:29:53,015 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-19 08:29:53,027 [ scc.git] DEBUG Already up to date.
2024-04-19 08:29:53,028 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-04-19 08:29:53,451 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-04-19 08:29:53,452 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-04-19 08:29:53,460 [ scc.git] DEBUG ## Unique users: []
2024-04-19 08:29:53,461 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:29:53,461 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:29:53,470 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-19 08:29:53,482 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:29:53,493 [ 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-19 08:29:53,512 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-19 08:29:53,517 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-04-19 08:29:53,518 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-04-19 08:29:53,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:29:53,684 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-19 08:29:53,801 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:29:53,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:29:53,810 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-19 08:29:53,907 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-19 08:29:53,920 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18aecaa9d0> has no local changes
2024-04-19 08:29:53,920 [ 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#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/)'
2024-04-19 08:29:53,937 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:29:53,938 [ scc.repo] DEBUG ## PRs found:
2024-04-19 08:29:53,942 [ scc.git] DEBUG [detached HEAD 941f909] merge master -Dorg -Ssuccess-only
2024-04-19 08:29:54,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-04-19 08:29:54,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-04-19 08:29:55,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-04-19 08:29:55,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-04-19 08:29:56,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-19 08:29:56,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-19 08:29:57,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-04-19 08:29:57,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-04-19 08:29:57,515 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-04-19 08:29:57,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470 HTTP/1.1" 200 None
2024-04-19 08:29:58,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470/comments HTTP/1.1" 200 None
2024-04-19 08:29:59,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/44025ed69514a02ecbc5d4655d3da7519ebf9170 HTTP/1.1" 200 None
2024-04-19 08:29:59,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/44025ed69514a02ecbc5d4655d3da7519ebf9170/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-19 08:29:59,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/44025ed69514a02ecbc5d4655d3da7519ebf9170/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-19 08:30:00,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/44025ed69514a02ecbc5d4655d3da7519ebf9170 HTTP/1.1" 200 None
2024-04-19 08:30:00,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/44025ed69514a02ecbc5d4655d3da7519ebf9170?per_page=1 HTTP/1.1" 200 2
2024-04-19 08:30:00,897 [ scc.repo] DEBUG - PR 470 will-moore 'Movie playing waits for planes'
2024-04-19 08:30:01,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-04-19 08:30:01,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-19 08:30:02,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-19 08:30:02,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-19 08:30:03,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-19 08:30:03,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/ca8b5aabef9a5358f93add750f4cbb51c864b7fe?per_page=1 HTTP/1.1" 200 2
2024-04-19 08:30:03,765 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-04-19 08:30:04,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-04-19 08:30:04,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-04-19 08:30:05,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-19 08:30:05,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-19 08:30:06,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-19 08:30:06,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-19 08:30:07,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/409c3429dd72d05fef895dcca6d133f8340eabf4?per_page=1 HTTP/1.1" 200 2
2024-04-19 08:30:07,175 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-04-19 08:30:07,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-04-19 08:30:08,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-04-19 08:30:08,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-19 08:30:09,058 [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-19 08:30:09,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-19 08:30:09,940 [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-19 08:30:09,941 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-04-19 08:30:09,942 [ scc.repo] DEBUG ## Branches found:
2024-04-19 08:30:09,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-19 08:30:09,942 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:09,943 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:09,952 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-19 08:30:09,961 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-19 08:30:09,961 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-19 08:30:09,971 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-19 08:30:09,980 [ scc.git] DEBUG Already up to date.
2024-04-19 08:30:09,980 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-04-19 08:30:10,449 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-19 08:30:10,449 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-04-19 08:30:10,455 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-04-19 08:30:11,314 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-19 08:30:11,314 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-04-19 08:30:11,321 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-04-19 08:30:11,724 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-19 08:30:11,724 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-04-19 08:30:11,730 [ scc.git] DEBUG Calling 'git fetch origin pull/470/head'
2024-04-19 08:30:12,442 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-19 08:30:12,442 [ scc.git] DEBUG * branch refs/pull/470/head -> FETCH_HEAD
2024-04-19 08:30:12,447 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-04-19 08:30:13,010 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-19 08:30:13,010 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-04-19 08:30:13,013 [ scc.git] DEBUG ## Unique users: []
2024-04-19 08:30:13,013 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:13,013 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:13,019 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-19 08:30:13,025 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:13,032 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-19 08:30:13,052 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-19 08:30:13,055 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-04-19 08:30:13,055 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-04-19 08:30:13,055 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-04-19 08:30:13,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:30:13,219 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-19 08:30:13,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:13,231 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-19 08:30:13,276 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-19 08:30:13,282 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-04-19 08:30:13,282 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-04-19 08:30:13,282 [ scc.git] DEBUG src/app/header.html | 5 +
2024-04-19 08:30:13,282 [ scc.git] DEBUG src/app/header.js | 46 ++++++++-
2024-04-19 08:30:13,282 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-04-19 08:30:13,282 [ scc.git] DEBUG src/utils/figure.js | 220 ++++++++++++++++++++++++++++++++++++++++++
2024-04-19 08:30:13,282 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 1 -
2024-04-19 08:30:13,282 [ scc.git] DEBUG 7 files changed, 294 insertions(+), 7 deletions(-)
2024-04-19 08:30:13,282 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-04-19 08:30:13,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:30:13,620 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-19 08:30:13,628 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:13,634 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-19 08:30:13,658 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-19 08:30:13,660 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-04-19 08:30:13,660 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-04-19 08:30:14,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:30:14,036 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...44025ed69514a02ecbc5d4655d3da7519ebf9170'
2024-04-19 08:30:14,044 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:14,049 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 470 (Movie playing waits for planes) 44025ed69514a02ecbc5d4655d3da7519ebf9170'
2024-04-19 08:30:14,067 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-04-19 08:30:14,068 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-19 08:30:14,074 [ scc.git] DEBUG css/app.css | 22 +++++
2024-04-19 08:30:14,074 [ scc.git] DEBUG src/events/events.js | 4 +
2024-04-19 08:30:14,074 [ scc.git] DEBUG src/index-dev.html | 6 +-
2024-04-19 08:30:14,074 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 2 +-
2024-04-19 08:30:14,074 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 160 ++++++++++++++++++++++++-------------
2024-04-19 08:30:14,074 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 42 +++++++++-
2024-04-19 08:30:14,074 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 15 +++-
2024-04-19 08:30:14,074 [ scc.git] DEBUG 7 files changed, 190 insertions(+), 61 deletions(-)
2024-04-19 08:30:14,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:30:14,449 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-04-19 08:30:14,456 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:14,462 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-04-19 08:30:14,476 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-19 08:30:14,479 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-04-19 08:30:14,479 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-04-19 08:30:14,479 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-04-19 08:30:14,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:30:14,856 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-19 08:30:14,901 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:14,902 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:14,908 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-19 08:30:14,958 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-19 08:30:14,968 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18aec915b0> has no local changes
2024-04-19 08:30:14,969 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
- PR 471 will-moore 'Z projection disabled tooltip'
Generated by OMERO-plugins-push#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/)'
2024-04-19 08:30:14,982 [ scc.git] DEBUG [detached HEAD 887fdd7] merge master -Dorg -Ssuccess-only
2024-04-19 08:30:14,983 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:30:14,983 [ scc.repo] DEBUG ## PRs found:
2024-04-19 08:30:15,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-04-19 08:30:15,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-04-19 08:30:16,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-04-19 08:30:16,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-19 08:30:17,488 [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-19 08:30:17,953 [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-19 08:30:18,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-19 08:30:18,804 [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-19 08:30:18,805 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-04-19 08:30:18,805 [ scc.repo] DEBUG ## Branches found:
2024-04-19 08:30:18,805 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-19 08:30:18,805 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:18,805 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:18,816 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-19 08:30:18,824 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-19 08:30:18,825 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-19 08:30:18,832 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-19 08:30:18,838 [ scc.git] DEBUG Already up to date.
2024-04-19 08:30:18,838 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-04-19 08:30:19,227 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-04-19 08:30:19,227 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-04-19 08:30:19,232 [ scc.git] DEBUG ## Unique users: []
2024-04-19 08:30:19,232 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:19,232 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:19,238 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-19 08:30:19,246 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:19,252 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-19 08:30:19,264 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-19 08:30:19,267 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-04-19 08:30:19,267 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-04-19 08:30:19,267 [ scc.git] DEBUG requirements.txt | 2 +-
2024-04-19 08:30:19,267 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-04-19 08:30:19,267 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-04-19 08:30:19,268 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-04-19 08:30:19,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:30:19,449 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-19 08:30:19,491 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:19,491 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:19,498 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-19 08:30:19,540 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-19 08:30:19,548 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18aecbb4f0> has no local changes
2024-04-19 08:30:19,548 [ 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#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/)'
2024-04-19 08:30:19,557 [ scc.git] DEBUG [detached HEAD c2cda5c] merge master -Dorg -Ssuccess-only
2024-04-19 08:30:19,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:30:19,558 [ scc.repo] DEBUG ## PRs found:
2024-04-19 08:30:20,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-04-19 08:30:20,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-04-19 08:30:21,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-04-19 08:30:21,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-19 08:30:22,100 [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-19 08:30:22,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-19 08:30:23,036 [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-19 08:30:23,036 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-19 08:30:23,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-04-19 08:30:24,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-04-19 08:30:24,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-19 08:30:24,979 [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-19 08:30:25,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-19 08:30:25,908 [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-19 08:30:25,909 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-19 08:30:25,909 [ scc.repo] DEBUG ## Branches found:
2024-04-19 08:30:25,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-19 08:30:25,909 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:25,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:25,917 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-19 08:30:25,925 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-19 08:30:25,925 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-19 08:30:25,934 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-19 08:30:25,942 [ scc.git] DEBUG Already up to date.
2024-04-19 08:30:25,943 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-04-19 08:30:26,603 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-19 08:30:26,603 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-04-19 08:30:26,610 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-04-19 08:30:27,351 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-19 08:30:27,352 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-04-19 08:30:27,356 [ scc.git] DEBUG ## Unique users: []
2024-04-19 08:30:27,356 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:27,356 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:27,362 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-19 08:30:27,373 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:27,380 [ 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-19 08:30:27,508 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-04-19 08:30:27,508 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-04-19 08:30:27,508 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-19 08:30:27,508 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-19 08:30:27,508 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-19 08:30:27,509 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-19 08:30:27,516 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-19 08:30:27,523 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-19 08:30:27,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:30:27,709 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-19 08:30:27,717 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-19 08:30:27,724 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#36](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-04-19 08:30:27,730 [ scc.config] DEBUG Found github.token
2024-04-19 08:30:27,730 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-04-19 08:30:27,730 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-19 08:30:27,737 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:27,743 [ 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-19 08:30:27,779 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-19 08:30:27,779 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-19 08:30:27,779 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-04-19 08:30:27,779 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-19 08:30:27,779 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-19 08:30:27,787 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-19 08:30:27,796 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-19 08:30:28,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:30:28,141 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-19 08:30:28,149 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-19 08:30:28,154 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#36](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/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-19 08:30:28,159 [ scc.config] DEBUG Found github.token
2024-04-19 08:30:28,160 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-04-19 08:30:28,160 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-19 08:30:28,201 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:28,202 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:28,208 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-19 08:30:28,249 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-19 08:30:28,257 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18aec91550> has no local changes
2024-04-19 08:30:28,257 [ 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#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/)'
2024-04-19 08:30:28,267 [ scc.git] DEBUG [detached HEAD 057f476] merge master -Dorg -Ssuccess-only
2024-04-19 08:30:28,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:30:28,267 [ scc.repo] DEBUG ## PRs found:
2024-04-19 08:30:28,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-04-19 08:30:29,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-04-19 08:30:29,161 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-19 08:30:29,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-19 08:30:30,323 [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-19 08:30:30,805 [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-19 08:30:31,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-19 08:30:31,761 [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-19 08:30:31,762 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-19 08:30:32,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-04-19 08:30:32,228 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-19 08:30:32,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-19 08:30:33,272 [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-19 08:30:33,769 [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-19 08:30:34,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-19 08:30:34,657 [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-19 08:30:34,658 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-19 08:30:35,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-04-19 08:30:35,156 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-19 08:30:35,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-19 08:30:36,256 [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-19 08:30:36,742 [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-19 08:30:37,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-19 08:30:37,646 [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-19 08:30:37,646 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-19 08:30:38,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-04-19 08:30:38,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-04-19 08:30:39,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-04-19 08:30:39,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-04-19 08:30:39,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-04-19 08:30:40,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-04-19 08:30:40,488 [ scc.repo] DEBUG ## Branches found:
2024-04-19 08:30:40,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-19 08:30:40,488 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:40,488 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:40,495 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-19 08:30:40,500 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-19 08:30:40,500 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-19 08:30:40,505 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-19 08:30:40,512 [ scc.git] DEBUG Already up to date.
2024-04-19 08:30:40,512 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-04-19 08:30:40,948 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-19 08:30:40,948 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-04-19 08:30:40,952 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-04-19 08:30:41,362 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-19 08:30:41,363 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-04-19 08:30:41,367 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-19 08:30:41,779 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-19 08:30:41,779 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-19 08:30:41,784 [ scc.git] DEBUG ## Unique users: []
2024-04-19 08:30:41,784 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:41,784 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:41,789 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-19 08:30:41,796 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:41,802 [ 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-19 08:30:41,811 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-19 08:30:41,814 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-04-19 08:30:41,814 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-04-19 08:30:42,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:30:42,043 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-19 08:30:42,049 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:42,054 [ 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-19 08:30:42,081 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-19 08:30:42,082 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-19 08:30:42,086 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-04-19 08:30:42,086 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-04-19 08:30:42,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:30:42,472 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-19 08:30:42,479 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:42,484 [ 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-19 08:30:42,495 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-19 08:30:42,496 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-19 08:30:42,498 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-04-19 08:30:42,499 [ scc.git] DEBUG package.json | 2 +-
2024-04-19 08:30:42,499 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-04-19 08:30:42,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:30:42,882 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-19 08:30:42,922 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:42,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:42,928 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-19 08:30:42,967 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-19 08:30:42,975 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18aecb6fd0> has no local changes
2024-04-19 08:30:42,975 [ 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#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/)'
2024-04-19 08:30:42,984 [ scc.git] DEBUG [detached HEAD 60308de] merge master -Dorg -Ssuccess-only
2024-04-19 08:30:42,984 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:30:42,985 [ scc.repo] DEBUG ## PRs found:
2024-04-19 08:30:43,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-04-19 08:30:43,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-04-19 08:30:44,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-19 08:30:44,855 [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-19 08:30:45,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-19 08:30:45,776 [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-19 08:30:45,777 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-04-19 08:30:45,777 [ scc.repo] DEBUG ## Branches found:
2024-04-19 08:30:45,777 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-19 08:30:45,777 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:45,777 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:45,785 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-19 08:30:45,790 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-19 08:30:45,791 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-19 08:30:45,796 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-19 08:30:45,803 [ scc.git] DEBUG Already up to date.
2024-04-19 08:30:45,804 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-19 08:30:46,202 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-04-19 08:30:46,202 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-19 08:30:46,207 [ scc.git] DEBUG ## Unique users: []
2024-04-19 08:30:46,207 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:46,207 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:46,216 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-19 08:30:46,222 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:46,227 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-19 08:30:46,237 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-19 08:30:46,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:30:46,400 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-19 08:30:46,441 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:46,441 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:46,448 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-19 08:30:46,489 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-19 08:30:46,496 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18ac426340> has no local changes
2024-04-19 08:30:46,496 [ 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#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/)'
2024-04-19 08:30:46,505 [ scc.git] DEBUG [detached HEAD 998beb7] merge master -Dorg -Ssuccess-only
2024-04-19 08:30:46,506 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:30:46,506 [ scc.repo] DEBUG ## PRs found:
2024-04-19 08:30:46,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-04-19 08:30:47,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-04-19 08:30:47,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-04-19 08:30:48,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-04-19 08:30:48,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-19 08:30:49,354 [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-19 08:30:49,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-19 08:30:50,279 [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-19 08:30:50,280 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-19 08:30:50,280 [ scc.repo] DEBUG ## Branches found:
2024-04-19 08:30:50,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-19 08:30:50,281 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:50,281 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:50,286 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-19 08:30:50,292 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-19 08:30:50,292 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-19 08:30:50,297 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-19 08:30:50,303 [ scc.git] DEBUG Already up to date.
2024-04-19 08:30:50,303 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-04-19 08:30:50,794 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-04-19 08:30:50,794 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-04-19 08:30:50,804 [ scc.git] DEBUG ## Unique users: []
2024-04-19 08:30:50,806 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:50,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:50,824 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-19 08:30:50,833 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:50,840 [ 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-19 08:30:50,854 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-04-19 08:30:50,855 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-19 08:30:50,858 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-04-19 08:30:50,858 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-04-19 08:30:51,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:30:51,041 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-19 08:30:51,080 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:51,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:51,087 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-19 08:30:51,128 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-19 08:30:51,135 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18ac4625b0> has no local changes
2024-04-19 08:30:51,135 [ 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#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/)'
2024-04-19 08:30:51,143 [ scc.git] DEBUG [detached HEAD ee3c750] merge master -Dorg -Ssuccess-only
2024-04-19 08:30:51,144 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:30:51,144 [ scc.repo] DEBUG ## PRs found:
2024-04-19 08:30:51,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-04-19 08:30:52,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-04-19 08:30:52,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-04-19 08:30:53,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-19 08:30:53,481 [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-19 08:30:54,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-19 08:30:54,458 [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-19 08:30:54,459 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-19 08:30:54,460 [ scc.repo] DEBUG ## Branches found:
2024-04-19 08:30:54,460 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-19 08:30:54,460 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:54,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:54,468 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-19 08:30:54,473 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-19 08:30:54,473 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-19 08:30:54,478 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-19 08:30:54,483 [ scc.git] DEBUG Already up to date.
2024-04-19 08:30:54,484 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-19 08:30:54,983 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-04-19 08:30:54,983 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-19 08:30:54,987 [ scc.git] DEBUG ## Unique users: []
2024-04-19 08:30:54,988 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:54,988 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:54,994 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-19 08:30:55,001 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:55,007 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-19 08:30:55,042 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-04-19 08:30:55,042 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-04-19 08:30:55,042 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-04-19 08:30:55,042 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-04-19 08:30:55,042 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-04-19 08:30:55,042 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-04-19 08:30:55,042 [ scc.git] DEBUG Auto-merging setup.py
2024-04-19 08:30:55,042 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-04-19 08:30:55,042 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-19 08:30:55,042 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-19 08:30:55,048 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-19 08:30:55,056 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-04-19 08:30:55,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:30:55,227 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-19 08:30:55,234 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-19 08:30:55,241 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#36](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/urls.py
- omero_signup/views.py
- setup.py
--conflicts
2024-04-19 08:30:55,247 [ scc.config] DEBUG Found github.token
2024-04-19 08:30:55,247 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-04-19 08:30:55,247 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-19 08:30:55,288 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:55,288 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:55,294 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-19 08:30:55,334 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-19 08:30:55,341 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18aecaae80> has no local changes
2024-04-19 08:30:55,341 [ 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#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/)'
2024-04-19 08:30:55,551 [ scc.git] DEBUG [detached HEAD e4b8c16] merge master -Dorg -Ssuccess-only
2024-04-19 08:30:55,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:30:55,551 [ scc.repo] DEBUG ## PRs found:
2024-04-19 08:30:55,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-04-19 08:30:56,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-04-19 08:30:56,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-04-19 08:30:57,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-19 08:30:57,700 [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-19 08:30:58,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-19 08:30:58,620 [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-19 08:30:58,621 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-19 08:30:58,621 [ scc.repo] DEBUG ## Branches found:
2024-04-19 08:30:58,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-19 08:30:58,621 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:58,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:58,628 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-19 08:30:58,634 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-19 08:30:58,634 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-19 08:30:58,641 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-19 08:30:58,647 [ scc.git] DEBUG Already up to date.
2024-04-19 08:30:58,648 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-04-19 08:30:59,089 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-04-19 08:30:59,090 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-04-19 08:30:59,096 [ scc.git] DEBUG ## Unique users: []
2024-04-19 08:30:59,096 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:59,096 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:59,104 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-04-19 08:30:59,113 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:59,121 [ 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-19 08:30:59,134 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-19 08:30:59,137 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-04-19 08:30:59,138 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-04-19 08:30:59,138 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-04-19 08:30:59,138 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-04-19 08:30:59,138 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-04-19 08:30:59,138 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-04-19 08:30:59,138 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-04-19 08:30:59,138 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-04-19 08:30:59,140 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-04-19 08:30:59,140 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-04-19 08:30:59,140 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-04-19 08:30:59,140 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-04-19 08:30:59,140 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-04-19 08:30:59,140 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-04-19 08:30:59,140 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-04-19 08:30:59,140 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-04-19 08:30:59,140 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-04-19 08:30:59,141 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-04-19 08:30:59,141 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-04-19 08:30:59,141 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-04-19 08:30:59,141 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-04-19 08:30:59,141 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-04-19 08:30:59,141 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-04-19 08:30:59,141 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-04-19 08:30:59,141 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-04-19 08:30:59,141 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-04-19 08:30:59,141 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-04-19 08:30:59,141 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-04-19 08:30:59,141 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-04-19 08:30:59,141 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-04-19 08:30:59,141 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-04-19 08:30:59,141 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-04-19 08:30:59,141 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-04-19 08:30:59,141 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-04-19 08:30:59,141 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-04-19 08:30:59,141 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-04-19 08:30:59,141 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-04-19 08:30:59,141 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-04-19 08:30:59,141 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-04-19 08:30:59,141 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-04-19 08:30:59,141 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-04-19 08:30:59,141 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-04-19 08:30:59,141 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-04-19 08:30:59,141 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-04-19 08:30:59,141 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-04-19 08:30:59,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:30:59,309 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-19 08:30:59,352 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:59,353 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:59,359 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-19 08:30:59,402 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-19 08:30:59,409 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18aecb6df0> has no local changes
2024-04-19 08:30:59,409 [ 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#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/)'
2024-04-19 08:30:59,419 [ scc.git] DEBUG [detached HEAD 3ff9a04] merge master -Dorg -Ssuccess-only
2024-04-19 08:30:59,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:30:59,420 [ scc.repo] DEBUG ## PRs found:
2024-04-19 08:30:59,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-04-19 08:30:59,770 [ scc.repo] DEBUG ## Branches found:
2024-04-19 08:30:59,770 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-19 08:30:59,770 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:59,770 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:59,776 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-19 08:30:59,782 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-19 08:30:59,782 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-19 08:30:59,788 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-19 08:30:59,794 [ scc.git] DEBUG Already up to date.
2024-04-19 08:30:59,794 [ scc.git] DEBUG ## Unique users: []
2024-04-19 08:30:59,794 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:59,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:59,800 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-19 08:30:59,839 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:30:59,839 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:30:59,844 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-19 08:30:59,883 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-19 08:30:59,890 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18ac468fa0> has no local changes
2024-04-19 08:30:59,890 [ 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#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/)'
2024-04-19 08:30:59,899 [ scc.git] DEBUG [detached HEAD bc83c80] merge master -Dorg -Ssuccess-only
2024-04-19 08:30:59,899 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:30:59,900 [ scc.repo] DEBUG ## PRs found:
2024-04-19 08:31:00,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-04-19 08:31:00,198 [ scc.repo] DEBUG ## Branches found:
2024-04-19 08:31:00,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-19 08:31:00,198 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:31:00,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:31:00,204 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-19 08:31:00,209 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-19 08:31:00,209 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-19 08:31:00,214 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-19 08:31:00,220 [ scc.git] DEBUG Already up to date.
2024-04-19 08:31:00,220 [ scc.git] DEBUG ## Unique users: []
2024-04-19 08:31:00,220 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:31:00,220 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:31:00,226 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-19 08:31:00,263 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:31:00,264 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:31:00,269 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-19 08:31:00,307 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-19 08:31:00,314 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18ac423f70> has no local changes
2024-04-19 08:31:00,314 [ 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#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/)'
2024-04-19 08:31:00,322 [ scc.git] DEBUG [detached HEAD 16c6281] merge master -Dorg -Ssuccess-only
2024-04-19 08:31:00,322 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:00,323 [ scc.git] INFO Overriding base-branch from master to main
2024-04-19 08:31:00,323 [ scc.repo] DEBUG ## PRs found:
2024-04-19 08:31:00,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-04-19 08:31:01,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-04-19 08:31:01,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-04-19 08:31:02,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-04-19 08:31:02,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-19 08:31:03,299 [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-19 08:31:03,775 [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-19 08:31:04,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-19 08:31:04,700 [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-19 08:31:04,701 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-19 08:31:04,701 [ scc.repo] DEBUG ## Branches found:
2024-04-19 08:31:04,701 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-19 08:31:04,701 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:31:04,702 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:31:04,707 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-04-19 08:31:04,712 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-19 08:31:04,713 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-04-19 08:31:04,718 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-04-19 08:31:04,724 [ scc.git] DEBUG Already up to date.
2024-04-19 08:31:04,724 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-19 08:31:05,138 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-04-19 08:31:05,139 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-19 08:31:05,144 [ scc.git] DEBUG ## Unique users: []
2024-04-19 08:31:05,144 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:31:05,144 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:31:05,150 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-19 08:31:05,155 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:31:05,160 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-19 08:31:05,246 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-04-19 08:31:05,247 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-04-19 08:31:05,247 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-19 08:31:05,247 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-19 08:31:05,254 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-19 08:31:05,261 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-04-19 08:31:05,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:05,419 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-19 08:31:05,426 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-19 08:31:05,433 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#36](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-04-19 08:31:05,439 [ scc.config] DEBUG Found github.token
2024-04-19 08:31:05,439 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-04-19 08:31:05,439 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-19 08:31:05,482 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:31:05,482 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:31:05,488 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-19 08:31:05,531 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-19 08:31:05,538 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18ac3f0b50> has no local changes
2024-04-19 08:31:05,538 [ 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#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/)'
2024-04-19 08:31:05,548 [ scc.git] DEBUG [detached HEAD 22d1a45] merge master -Dorg -Ssuccess-only
2024-04-19 08:31:05,549 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:05,549 [ scc.repo] DEBUG ## PRs found:
2024-04-19 08:31:05,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-04-19 08:31:05,864 [ scc.repo] DEBUG ## Branches found:
2024-04-19 08:31:05,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-19 08:31:05,864 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:31:05,864 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:31:05,870 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-19 08:31:05,876 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-19 08:31:05,876 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-19 08:31:05,882 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-19 08:31:05,887 [ scc.git] DEBUG Already up to date.
2024-04-19 08:31:05,887 [ scc.git] DEBUG ## Unique users: []
2024-04-19 08:31:05,887 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:31:05,887 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:31:05,893 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-19 08:31:05,930 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:31:05,930 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:31:05,936 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-19 08:31:05,973 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-19 08:31:05,980 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18ac406e50> has no local changes
2024-04-19 08:31:05,980 [ 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#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/)'
2024-04-19 08:31:05,988 [ scc.git] DEBUG [detached HEAD 3f7c287] merge master -Dorg -Ssuccess-only
2024-04-19 08:31:05,988 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:05,988 [ scc.repo] DEBUG ## PRs found:
2024-04-19 08:31:06,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-04-19 08:31:06,291 [ scc.repo] DEBUG ## Branches found:
2024-04-19 08:31:06,292 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-19 08:31:06,292 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:31:06,292 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:31:06,298 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-19 08:31:06,304 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-19 08:31:06,304 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-19 08:31:06,311 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-19 08:31:06,318 [ scc.git] DEBUG Already up to date.
2024-04-19 08:31:06,318 [ scc.git] DEBUG ## Unique users: []
2024-04-19 08:31:06,319 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:31:06,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:31:06,323 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-19 08:31:06,364 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:31:06,364 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:31:06,370 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-19 08:31:06,415 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-19 08:31:06,423 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18ac346940> has no local changes
2024-04-19 08:31:06,424 [ 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#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/)'
2024-04-19 08:31:06,434 [ scc.git] DEBUG [detached HEAD 17caede] merge master -Dorg -Ssuccess-only
2024-04-19 08:31:06,435 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:06,435 [ scc.repo] DEBUG ## PRs found:
2024-04-19 08:31:06,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-04-19 08:31:07,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-04-19 08:31:07,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-04-19 08:31:08,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-19 08:31:08,674 [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-19 08:31:09,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-19 08:31:09,585 [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-19 08:31:09,586 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-04-19 08:31:09,586 [ scc.repo] DEBUG ## Branches found:
2024-04-19 08:31:09,586 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-19 08:31:09,586 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:31:09,586 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:31:09,592 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-19 08:31:09,597 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-19 08:31:09,597 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-19 08:31:09,603 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-19 08:31:09,609 [ scc.git] DEBUG Already up to date.
2024-04-19 08:31:09,610 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-04-19 08:31:10,036 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-04-19 08:31:10,037 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-04-19 08:31:10,041 [ scc.git] DEBUG ## Unique users: []
2024-04-19 08:31:10,042 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:31:10,042 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:31:10,047 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-19 08:31:10,054 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:31:10,060 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-19 08:31:10,090 [ scc.git] DEBUG Auto-merging Dockerfile
2024-04-19 08:31:10,090 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-04-19 08:31:10,090 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-19 08:31:10,090 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-19 08:31:10,096 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-19 08:31:10,103 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-04-19 08:31:10,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:10,270 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-19 08:31:10,277 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-19 08:31:10,282 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#36](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-04-19 08:31:10,286 [ scc.config] DEBUG Found github.token
2024-04-19 08:31:10,287 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-04-19 08:31:10,287 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-19 08:31:10,328 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:31:10,329 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:31:10,335 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-19 08:31:10,374 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-19 08:31:10,381 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18ac3979d0> has no local changes
2024-04-19 08:31:10,382 [ 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#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/)'
2024-04-19 08:31:10,392 [ scc.git] DEBUG [detached HEAD 64eb18c] merge master -Dorg -Ssuccess-only
2024-04-19 08:31:10,393 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:10,393 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-19 08:31:10,393 [ scc.repo] DEBUG ## PRs found:
2024-04-19 08:31:10,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-19 08:31:11,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-19 08:31:11,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-19 08:31:12,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-19 08:31:12,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-19 08:31:13,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-19 08:31:13,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-19 08:31:14,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-19 08:31:14,600 [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-19 08:31:15,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-19 08:31:15,523 [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-19 08:31:15,524 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-19 08:31:15,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-19 08:31:16,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-19 08:31:16,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-19 08:31:17,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-19 08:31:17,459 [ scc.repo] DEBUG ## Branches found:
2024-04-19 08:31:17,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-19 08:31:17,459 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:31:17,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:31:17,466 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-19 08:31:17,472 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-19 08:31:17,472 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-19 08:31:17,480 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-19 08:31:17,487 [ scc.git] DEBUG Already up to date.
2024-04-19 08:31:17,487 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-19 08:31:17,899 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-04-19 08:31:17,899 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-19 08:31:17,903 [ scc.git] DEBUG ## Unique users: []
2024-04-19 08:31:17,904 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:31:17,904 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:31:17,909 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-19 08:31:17,917 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:31:17,923 [ 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-19 08:31:17,950 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-19 08:31:17,950 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-19 08:31:17,950 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-19 08:31:17,950 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-19 08:31:17,957 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-19 08:31:17,965 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-04-19 08:31:18,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:18,236 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-19 08:31:18,244 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-19 08:31:18,250 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#36](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-19 08:31:18,255 [ scc.config] DEBUG Found github.token
2024-04-19 08:31:18,255 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-19 08:31:18,255 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-19 08:31:18,293 [ scc.git] DEBUG Get sha1 of %s
2024-04-19 08:31:18,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-19 08:31:18,299 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-19 08:31:18,338 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-19 08:31:18,344 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18ac346bb0> has no local changes
2024-04-19 08:31:18,345 [ 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#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/)'
2024-04-19 08:31:18,353 [ scc.git] DEBUG [detached HEAD a058da4] merge master -Dorg -Ssuccess-only
2024-04-19 08:31:18,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:18,354 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-19 08:31:18,429 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-04-19 08:31:18,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:18,650 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-04-19 08:31:18,656 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-04-19 08:31:19,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:19,058 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-04-19 08:31:19,063 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-04-19 08:31:19,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:19,470 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-04-19 08:31:19,476 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-04-19 08:31:19,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:19,893 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-04-19 08:31:20,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:20,304 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-04-19 08:31:20,309 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-04-19 08:31:20,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:20,718 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-04-19 08:31:20,726 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-04-19 08:31:21,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:21,126 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-04-19 08:31:21,135 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-04-19 08:31:21,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:21,525 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-04-19 08:31:21,533 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-04-19 08:31:21,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:21,939 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-04-19 08:31:21,944 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-04-19 08:31:22,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:22,351 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-04-19 08:31:22,358 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-04-19 08:31:22,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:22,756 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-04-19 08:31:22,761 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-04-19 08:31:23,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:23,173 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-04-19 08:31:23,179 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-04-19 08:31:23,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:23,585 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-04-19 08:31:23,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:23,990 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-04-19 08:31:24,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:24,399 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-04-19 08:31:24,404 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-04-19 08:31:24,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:24,814 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-04-19 08:31:25,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:25,217 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-04-19 08:31:25,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:25,621 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-04-19 08:31:25,626 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-04-19 08:31:26,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:26,033 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-04-19 08:31:26,038 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-04-19 08:31:26,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:26,454 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-04-19 08:31:26,460 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-04-19 08:31:26,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:26,867 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-04-19 08:31:26,872 [ scc.config] DEBUG Found submodule.scripts.url
2024-04-19 08:31:27,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-19 08:31:27,273 [ scc.config] DEBUG Found submodule.scripts.branch
2024-04-19 08:31:27,273 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-19 08:31:27,361 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f18b215b460> has local changes
2024-04-19 08:31:27,362 [ 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 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 549 will-moore 'Inset feature' (stage: draft)
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
- PR 471 will-moore 'Z projection disabled tooltip'
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#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/36/)'
2024-04-19 08:31:27,376 [ scc.git] DEBUG [detached HEAD 58b0ec8] merge master -Dorg -Ssuccess-only
2024-04-19 08:31:27,377 [ scc.merge] INFO Repository: ome/omero-plugins
2024-04-19 08:31:27,377 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-04-19 08:31:27,377 [ scc.merge] INFO Already up to date.
2024-04-19 08:31:27,377 [ scc.merge] INFO
2024-04-19 08:31:27,377 [ scc.merge] INFO Merged PRs:
2024-04-19 08:31:27,377 [ scc.merge] INFO - PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
2024-04-19 08:31:27,377 [ scc.merge] INFO
2024-04-19 08:31:27,377 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-04-19 08:31:27,377 [ scc.merge] INFO Already up to date.
2024-04-19 08:31:27,377 [ scc.merge] INFO
2024-04-19 08:31:27,377 [ scc.merge] INFO
2024-04-19 08:31:27,377 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-04-19 08:31:27,377 [ scc.merge] INFO Excluded PRs:
2024-04-19 08:31:27,377 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-04-19 08:31:27,377 [ scc.merge] INFO Already up to date.
2024-04-19 08:31:27,377 [ scc.merge] INFO
2024-04-19 08:31:27,377 [ scc.merge] INFO Merged PRs:
2024-04-19 08:31:27,377 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-04-19 08:31:27,377 [ scc.merge] INFO
2024-04-19 08:31:27,377 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-04-19 08:31:27,377 [ scc.merge] INFO Excluded PRs:
2024-04-19 08:31:27,377 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-04-19 08:31:27,377 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-04-19 08:31:27,377 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-04-19 08:31:27,378 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-04-19 08:31:27,378 [ scc.merge] INFO Already up to date.
2024-04-19 08:31:27,378 [ scc.merge] INFO
2024-04-19 08:31:27,378 [ scc.merge] INFO Merged PRs:
2024-04-19 08:31:27,378 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-04-19 08:31:27,378 [ scc.merge] INFO
2024-04-19 08:31:27,378 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-04-19 08:31:27,378 [ scc.merge] INFO Excluded PRs:
2024-04-19 08:31:27,378 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-19 08:31:27,378 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-04-19 08:31:27,378 [ scc.merge] INFO Already up to date.
2024-04-19 08:31:27,378 [ scc.merge] INFO
2024-04-19 08:31:27,378 [ scc.merge] INFO Merged PRs:
2024-04-19 08:31:27,378 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-04-19 08:31:27,378 [ scc.merge] INFO
2024-04-19 08:31:27,378 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-19 08:31:27,378 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-04-19 08:31:27,378 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-04-19 08:31:27,378 [ scc.merge] INFO
2024-04-19 08:31:27,378 [ scc.merge] INFO Repository: ome/omero-figure
2024-04-19 08:31:27,378 [ scc.merge] INFO Excluded PRs:
2024-04-19 08:31:27,378 [ scc.merge] INFO - PR 549 will-moore 'Inset feature' (stage: draft)
2024-04-19 08:31:27,378 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-04-19 08:31:27,378 [ scc.merge] INFO Already up to date.
2024-04-19 08:31:27,378 [ scc.merge] INFO
2024-04-19 08:31:27,378 [ scc.merge] INFO Merged PRs:
2024-04-19 08:31:27,378 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-04-19 08:31:27,378 [ scc.merge] INFO
2024-04-19 08:31:27,378 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-04-19 08:31:27,378 [ scc.merge] INFO Already up to date.
2024-04-19 08:31:27,378 [ scc.merge] INFO
2024-04-19 08:31:27,378 [ scc.merge] INFO Merged PRs:
2024-04-19 08:31:27,378 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-04-19 08:31:27,378 [ scc.merge] INFO
2024-04-19 08:31:27,378 [ scc.merge] INFO Repository: ome/omero-gallery
2024-04-19 08:31:27,378 [ scc.merge] INFO Already up to date.
2024-04-19 08:31:27,378 [ scc.merge] INFO
2024-04-19 08:31:27,378 [ scc.merge] INFO Merged PRs:
2024-04-19 08:31:27,378 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-19 08:31:27,379 [ scc.merge] INFO
2024-04-19 08:31:27,379 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-04-19 08:31:27,379 [ scc.merge] INFO Excluded PRs:
2024-04-19 08:31:27,379 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-04-19 08:31:27,379 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-04-19 08:31:27,379 [ scc.merge] INFO Already up to date.
2024-04-19 08:31:27,379 [ scc.merge] INFO
2024-04-19 08:31:27,379 [ scc.merge] INFO Merged PRs:
2024-04-19 08:31:27,379 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-04-19 08:31:27,379 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-04-19 08:31:27,379 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-04-19 08:31:27,379 [ scc.merge] INFO - PR 470 will-moore 'Movie playing waits for planes'
2024-04-19 08:31:27,379 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-04-19 08:31:27,379 [ scc.merge] INFO
2024-04-19 08:31:27,379 [ scc.merge] INFO Repository: ome/omero-mapr
2024-04-19 08:31:27,379 [ scc.merge] INFO Excluded PRs:
2024-04-19 08:31:27,379 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-04-19 08:31:27,379 [ scc.merge] INFO Already up to date.
2024-04-19 08:31:27,379 [ scc.merge] INFO
2024-04-19 08:31:27,379 [ scc.merge] INFO Merged PRs:
2024-04-19 08:31:27,379 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-04-19 08:31:27,379 [ scc.merge] INFO
2024-04-19 08:31:27,379 [ scc.merge] INFO Repository: ome/omero-metadata
2024-04-19 08:31:27,379 [ scc.merge] INFO Already up to date.
2024-04-19 08:31:27,379 [ scc.merge] INFO
2024-04-19 08:31:27,379 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-19 08:31:27,379 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-19 08:31:27,379 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-19 08:31:27,379 [ scc.merge] INFO
2024-04-19 08:31:27,379 [ scc.merge] INFO Repository: ome/omero-parade
2024-04-19 08:31:27,379 [ scc.merge] INFO Excluded PRs:
2024-04-19 08:31:27,379 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-04-19 08:31:27,379 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-04-19 08:31:27,379 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-04-19 08:31:27,379 [ scc.merge] INFO Already up to date.
2024-04-19 08:31:27,379 [ scc.merge] INFO
2024-04-19 08:31:27,379 [ scc.merge] INFO Merged PRs:
2024-04-19 08:31:27,379 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-19 08:31:27,379 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-19 08:31:27,380 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-19 08:31:27,380 [ scc.merge] INFO
2024-04-19 08:31:27,380 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-04-19 08:31:27,380 [ scc.merge] INFO Already up to date.
2024-04-19 08:31:27,380 [ scc.merge] INFO
2024-04-19 08:31:27,380 [ scc.merge] INFO Merged PRs:
2024-04-19 08:31:27,380 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-04-19 08:31:27,380 [ scc.merge] INFO
2024-04-19 08:31:27,380 [ scc.merge] INFO Repository: ome/omero-rois
2024-04-19 08:31:27,380 [ scc.merge] INFO Excluded PRs:
2024-04-19 08:31:27,380 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-19 08:31:27,380 [ scc.merge] INFO Already up to date.
2024-04-19 08:31:27,380 [ scc.merge] INFO
2024-04-19 08:31:27,380 [ scc.merge] INFO Merged PRs:
2024-04-19 08:31:27,380 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-19 08:31:27,380 [ scc.merge] INFO
2024-04-19 08:31:27,380 [ scc.merge] INFO Repository: ome/omero-signup
2024-04-19 08:31:27,380 [ scc.merge] INFO Already up to date.
2024-04-19 08:31:27,380 [ scc.merge] INFO
2024-04-19 08:31:27,380 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-19 08:31:27,380 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-19 08:31:27,380 [ scc.merge] INFO
2024-04-19 08:31:27,380 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-04-19 08:31:27,380 [ scc.merge] INFO Already up to date.
2024-04-19 08:31:27,380 [ scc.merge] INFO
2024-04-19 08:31:27,380 [ scc.merge] INFO Merged PRs:
2024-04-19 08:31:27,381 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-19 08:31:27,381 [ scc.merge] INFO
2024-04-19 08:31:27,381 [ scc.merge] INFO Repository: ome/omero-upload
2024-04-19 08:31:27,381 [ scc.merge] INFO Already up to date.
2024-04-19 08:31:27,381 [ scc.merge] INFO
2024-04-19 08:31:27,381 [ scc.merge] INFO
2024-04-19 08:31:27,381 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-04-19 08:31:27,381 [ scc.merge] INFO Already up to date.
2024-04-19 08:31:27,381 [ scc.merge] INFO
2024-04-19 08:31:27,381 [ scc.merge] INFO
2024-04-19 08:31:27,381 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-04-19 08:31:27,381 [ scc.merge] INFO Excluded PRs:
2024-04-19 08:31:27,381 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-04-19 08:31:27,381 [ scc.merge] INFO Already up to date.
2024-04-19 08:31:27,381 [ scc.merge] INFO
2024-04-19 08:31:27,381 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-19 08:31:27,381 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-19 08:31:27,381 [ scc.merge] INFO
2024-04-19 08:31:27,381 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-04-19 08:31:27,381 [ scc.merge] INFO Already up to date.
2024-04-19 08:31:27,381 [ scc.merge] INFO
2024-04-19 08:31:27,381 [ scc.merge] INFO
2024-04-19 08:31:27,381 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-04-19 08:31:27,381 [ scc.merge] INFO Already up to date.
2024-04-19 08:31:27,381 [ scc.merge] INFO
2024-04-19 08:31:27,381 [ scc.merge] INFO
2024-04-19 08:31:27,381 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-04-19 08:31:27,381 [ scc.merge] INFO Already up to date.
2024-04-19 08:31:27,381 [ scc.merge] INFO
2024-04-19 08:31:27,381 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-19 08:31:27,381 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-04-19 08:31:27,381 [ scc.merge] INFO
2024-04-19 08:31:27,381 [ scc.merge] INFO Repository: ome/scripts
2024-04-19 08:31:27,381 [ scc.merge] INFO Excluded PRs:
2024-04-19 08:31:27,381 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-19 08:31:27,381 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-19 08:31:27,381 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-19 08:31:27,381 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-19 08:31:27,381 [ scc.merge] INFO Already up to date.
2024-04-19 08:31:27,382 [ scc.merge] INFO
2024-04-19 08:31:27,382 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-19 08:31:27,382 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-19 08:31:27,382 [ scc.merge] INFO
2024-04-19 08:31:27,382 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-19 08:31:27,382 [ scc.git] DEBUG Calling 'git remote'
2024-04-19 08:31:27,389 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-04-19 08:31:27,389 [ scc.git] DEBUG Calling 'git remote'
2024-04-19 08:31:27,395 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:27,395 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-04-19 08:31:27,395 [ scc.git] DEBUG Calling 'git remote'
2024-04-19 08:31:27,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:27,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-04-19 08:31:27,401 [ scc.git] DEBUG Calling 'git remote'
2024-04-19 08:31:27,406 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:27,407 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-04-19 08:31:27,407 [ scc.git] DEBUG Calling 'git remote'
2024-04-19 08:31:27,412 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:27,413 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-04-19 08:31:27,413 [ scc.git] DEBUG Calling 'git remote'
2024-04-19 08:31:27,418 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:27,418 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-19 08:31:27,418 [ scc.git] DEBUG Calling 'git remote'
2024-04-19 08:31:27,425 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:27,425 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-19 08:31:27,425 [ scc.git] DEBUG Calling 'git remote'
2024-04-19 08:31:27,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:27,432 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-19 08:31:27,432 [ scc.git] DEBUG Calling 'git remote'
2024-04-19 08:31:27,443 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:27,443 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-19 08:31:27,443 [ scc.git] DEBUG Calling 'git remote'
2024-04-19 08:31:27,450 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:27,451 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-19 08:31:27,451 [ scc.git] DEBUG Calling 'git remote'
2024-04-19 08:31:27,457 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:27,457 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-19 08:31:27,457 [ scc.git] DEBUG Calling 'git remote'
2024-04-19 08:31:27,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:27,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-19 08:31:27,464 [ scc.git] DEBUG Calling 'git remote'
2024-04-19 08:31:27,470 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:27,470 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-19 08:31:27,470 [ scc.git] DEBUG Calling 'git remote'
2024-04-19 08:31:27,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:27,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-19 08:31:27,477 [ scc.git] DEBUG Calling 'git remote'
2024-04-19 08:31:27,484 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:27,484 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-19 08:31:27,484 [ scc.git] DEBUG Calling 'git remote'
2024-04-19 08:31:27,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:27,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-19 08:31:27,491 [ scc.git] DEBUG Calling 'git remote'
2024-04-19 08:31:27,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:27,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-19 08:31:27,498 [ scc.git] DEBUG Calling 'git remote'
2024-04-19 08:31:27,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:27,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-19 08:31:27,505 [ scc.git] DEBUG Calling 'git remote'
2024-04-19 08:31:27,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:27,512 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-19 08:31:27,512 [ scc.git] DEBUG Calling 'git remote'
2024-04-19 08:31:27,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:27,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-19 08:31:27,519 [ scc.git] DEBUG Calling 'git remote'
2024-04-19 08:31:27,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:27,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-19 08:31:27,526 [ scc.git] DEBUG Calling 'git remote'
2024-04-19 08:31:27,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-19 08:31:27,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-19 08:31:27,536 [ scc.git] DEBUG Calling 'git remote'
2024-04-19 08:31:27,544 [ 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 2aed28c] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 2ca566b
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from ded0caab
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 9d8d147
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from a0148a6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 5a90893
nothing to commit, working tree clean
[detached HEAD 8389c0a] 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-19 08:32:14,054 [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-19 08:32:23,200 [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-19 08:32:25,601 [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-19 08:32:30,141 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-19 08:33:18,653 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/68a19aec/images/svgs/logo.svg){kind=logo}
