Skipping 116 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/backbone-1.0.0.js
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/backbone.mousetrap/README.md
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/css/bootstrap.css
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/css/bootstrap.min.css
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.eot
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.svg
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.ttf
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/fonts/glyphicons-halflings-regular.woff
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/js/bootstrap.js
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/js/bootstrap.min.js
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.css
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.js
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-1.11.1/jquery.min.js
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.base.css
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.slider.css
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/jquery-ui.min.js
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/json2.js
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.js
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.min.js
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/mousetrap-1.5.3/mousetrap.min.js
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael-min.js
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael.js
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/scaleraphael.js
2024-04-16 00:43:48,082 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/underscore-1.13.1-umd-min.js
2024-04-16 00:43:48,083 [ scc.git] DEBUG delete mode 100644 omero_figure/templates/figure/index.html
2024-04-16 00:43:48,083 [ scc.git] DEBUG delete mode 100644 spec/ViewportViewSpec.js
2024-04-16 00:43:48,083 [ scc.git] DEBUG delete mode 100644 spec/images/testImage.png
2024-04-16 00:43:48,083 [ scc.git] DEBUG delete mode 100644 spec/javascripts/PanelSpec.js
2024-04-16 00:43:48,083 [ scc.git] DEBUG delete mode 100644 spec/javascripts/ViewportViewSpec.js
2024-04-16 00:43:48,083 [ scc.git] DEBUG delete mode 100644 spec/javascripts/fixtures/previewTab.html
2024-04-16 00:43:48,083 [ scc.git] DEBUG create mode 100644 src/.env
2024-04-16 00:43:48,083 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/css/figure.css (70%)
2024-04-16 00:43:48,083 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/arrow-icon-16.png (100%)
2024-04-16 00:43:48,083 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-04-16 00:43:48,083 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-04-16 00:43:48,083 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-04-16 00:43:48,083 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-04-16 00:43:48,083 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-04-16 00:43:48,083 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-04-16 00:43:48,083 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-04-16 00:43:48,083 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-04-16 00:43:48,083 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-04-16 00:43:48,083 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-16 00:43:48,083 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-04-16 00:43:48,083 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-04-16 00:43:48,083 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-04-16 00:43:48,083 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-04-16 00:43:48,083 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-04-16 00:43:48,083 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-04-16 00:43:48,083 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-04-16 00:43:48,083 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-04-16 00:43:48,083 [ scc.git] DEBUG create mode 100644 src/index.html
2024-04-16 00:43:48,083 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-04-16 00:43:48,083 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-04-16 00:43:48,083 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-04-16 00:43:48,083 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-04-16 00:43:48,083 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-04-16 00:43:48,083 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-04-16 00:43:48,084 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-04-16 00:43:48,084 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-04-16 00:43:48,084 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-04-16 00:43:48,084 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-16 00:43:48,084 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-04-16 00:43:48,084 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-04-16 00:43:48,084 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-04-16 00:43:48,084 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-04-16 00:43:48,084 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-04-16 00:43:48,084 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-04-16 00:43:48,084 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-04-16 00:43:48,084 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-04-16 00:43:48,084 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-04-16 00:43:48,084 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-04-16 00:43:48,084 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-04-16 00:43:48,084 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-04-16 00:43:48,084 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-04-16 00:43:48,084 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-04-16 00:43:48,084 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-04-16 00:43:48,084 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-04-16 00:43:48,084 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-04-16 00:43:48,084 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-04-16 00:43:48,084 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-04-16 00:43:48,084 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-04-16 00:43:48,084 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-04-16 00:43:48,084 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-04-16 00:43:48,084 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-04-16 00:43:48,084 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-04-16 00:43:48,084 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-04-16 00:43:48,084 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-04-16 00:43:48,084 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-04-16 00:43:48,084 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-04-16 00:43:48,084 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-04-16 00:43:48,084 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-04-16 00:43:48,084 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-04-16 00:43:48,085 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-04-16 00:43:48,085 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-04-16 00:43:48,085 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-04-16 00:43:48,085 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-04-16 00:43:48,085 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-04-16 00:43:48,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:43:48,239 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-16 00:43:48,288 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:43:48,289 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:43:48,294 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-16 00:43:48,332 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-16 00:43:48,342 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff9d8146be0> has no local changes
2024-04-16 00:43:48,342 [ 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#34 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/)'
2024-04-16 00:43:48,354 [ scc.git] DEBUG [detached HEAD 9cae551b] merge master -Dorg -Ssuccess-only
2024-04-16 00:43:48,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:43:48,354 [ scc.repo] DEBUG ## PRs found:
2024-04-16 00:43:48,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-04-16 00:43:49,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-04-16 00:43:49,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-04-16 00:43:50,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-16 00:43:50,655 [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-16 00:43:51,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-16 00:43:51,496 [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-16 00:43:51,497 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-04-16 00:43:51,497 [ scc.repo] DEBUG ## Branches found:
2024-04-16 00:43:51,497 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-16 00:43:51,497 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:43:51,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:43:51,504 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-16 00:43:51,510 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-16 00:43:51,510 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-16 00:43:51,515 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-16 00:43:51,521 [ scc.git] DEBUG Already up to date.
2024-04-16 00:43:51,521 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-04-16 00:43:51,913 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-04-16 00:43:51,914 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-04-16 00:43:51,920 [ scc.git] DEBUG ## Unique users: []
2024-04-16 00:43:51,920 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:43:51,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:43:51,925 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-16 00:43:51,931 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:43:51,936 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-16 00:43:51,981 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-04-16 00:43:51,982 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-16 00:43:51,985 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-04-16 00:43:51,985 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-16 00:43:52,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:43:52,148 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-16 00:43:52,190 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:43:52,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:43:52,198 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-16 00:43:52,238 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-16 00:43:52,244 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff9d80fd550> has no local changes
2024-04-16 00:43:52,244 [ 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#34 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/)'
2024-04-16 00:43:52,252 [ scc.git] DEBUG [detached HEAD 1f98e68] merge master -Dorg -Ssuccess-only
2024-04-16 00:43:52,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:43:52,253 [ scc.repo] DEBUG ## PRs found:
2024-04-16 00:43:52,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-04-16 00:43:53,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-04-16 00:43:53,092 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-16 00:43:53,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-16 00:43:54,134 [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-16 00:43:54,613 [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-16 00:43:55,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-16 00:43:55,477 [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-16 00:43:55,478 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-16 00:43:55,478 [ scc.repo] DEBUG ## Branches found:
2024-04-16 00:43:55,479 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-16 00:43:55,479 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:43:55,479 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:43:55,486 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-16 00:43:55,491 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-16 00:43:55,491 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-16 00:43:55,497 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-16 00:43:55,503 [ scc.git] DEBUG Already up to date.
2024-04-16 00:43:55,503 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-04-16 00:43:55,882 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-04-16 00:43:55,882 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-04-16 00:43:55,887 [ scc.git] DEBUG ## Unique users: []
2024-04-16 00:43:55,887 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:43:55,887 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:43:55,894 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-16 00:43:55,901 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:43:55,907 [ 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-16 00:43:55,923 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-16 00:43:55,928 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-04-16 00:43:55,928 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-04-16 00:43:56,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:43:56,085 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-16 00:43:56,133 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:43:56,134 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:43:56,141 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-16 00:43:56,194 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-16 00:43:56,202 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff9d80f19d0> has no local changes
2024-04-16 00:43:56,202 [ 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#34 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/)'
2024-04-16 00:43:56,211 [ scc.git] DEBUG [detached HEAD 98171ff] merge master -Dorg -Ssuccess-only
2024-04-16 00:43:56,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:43:56,212 [ scc.repo] DEBUG ## PRs found:
2024-04-16 00:43:56,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-04-16 00:43:57,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-04-16 00:43:57,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-16 00:43:58,007 [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-16 00:43:58,491 [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-16 00:43:59,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-16 00:43:59,431 [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-16 00:43:59,432 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-04-16 00:43:59,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-04-16 00:44:00,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-04-16 00:44:00,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-16 00:44:01,383 [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-16 00:44:01,842 [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-16 00:44:02,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-16 00:44:02,692 [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-16 00:44:02,693 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-04-16 00:44:03,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464 HTTP/1.1" 200 None
2024-04-16 00:44:03,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464/comments HTTP/1.1" 200 None
2024-04-16 00:44:04,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-04-16 00:44:04,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-16 00:44:05,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-16 00:44:05,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-04-16 00:44:05,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/97542d9b749f93d4902f7dce703bbf2a04316a98?per_page=1 HTTP/1.1" 200 2
2024-04-16 00:44:05,936 [ scc.repo] DEBUG - PR 464 will-moore 'Tile load error warning'
2024-04-16 00:44:06,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-04-16 00:44:06,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-04-16 00:44:07,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-16 00:44:07,785 [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-16 00:44:08,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-16 00:44:08,695 [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-16 00:44:08,696 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-04-16 00:44:09,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456 HTTP/1.1" 200 None
2024-04-16 00:44:09,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456/comments HTTP/1.1" 200 None
2024-04-16 00:44:10,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-04-16 00:44:10,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-16 00:44:11,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-16 00:44:11,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-04-16 00:44:11,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745?per_page=1 HTTP/1.1" 200 2
2024-04-16 00:44:11,967 [ scc.repo] DEBUG - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-04-16 00:44:11,968 [ scc.repo] DEBUG ## Branches found:
2024-04-16 00:44:11,968 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-16 00:44:11,968 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:11,968 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:11,976 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-16 00:44:11,985 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-16 00:44:11,985 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-16 00:44:12,000 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-16 00:44:12,008 [ scc.git] DEBUG Already up to date.
2024-04-16 00:44:12,009 [ scc.git] DEBUG Calling 'git fetch origin pull/456/head'
2024-04-16 00:44:12,486 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-16 00:44:12,486 [ scc.git] DEBUG * branch refs/pull/456/head -> FETCH_HEAD
2024-04-16 00:44:12,491 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-04-16 00:44:12,930 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-16 00:44:12,930 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-04-16 00:44:12,936 [ scc.git] DEBUG Calling 'git fetch origin pull/464/head'
2024-04-16 00:44:13,407 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-16 00:44:13,407 [ scc.git] DEBUG * branch refs/pull/464/head -> FETCH_HEAD
2024-04-16 00:44:13,414 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-04-16 00:44:14,550 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-16 00:44:14,550 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-04-16 00:44:14,553 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-04-16 00:44:14,984 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-16 00:44:14,984 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-04-16 00:44:14,990 [ scc.git] DEBUG ## Unique users: []
2024-04-16 00:44:14,990 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:14,990 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:14,997 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-04-16 00:44:15,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:15,010 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 456 (Don't use tiles for non-big movies) 2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-04-16 00:44:15,053 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-16 00:44:15,056 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 5 +++--
2024-04-16 00:44:15,056 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-04-16 00:44:15,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:44:15,212 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-16 00:44:15,219 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:15,224 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-16 00:44:15,258 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-16 00:44:15,261 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-04-16 00:44:15,261 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-04-16 00:44:15,261 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-04-16 00:44:15,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:44:15,619 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-04-16 00:44:15,627 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:15,635 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 464 (Tile load error warning) 97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-04-16 00:44:15,688 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-16 00:44:15,693 [ scc.git] DEBUG css/app.css | 22 ++++++++++++++++++++++
2024-04-16 00:44:15,693 [ scc.git] DEBUG src/events/events.js | 2 ++
2024-04-16 00:44:15,693 [ scc.git] DEBUG src/index-dev.html | 6 +++---
2024-04-16 00:44:15,693 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 2 +-
2024-04-16 00:44:15,693 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 4 +++-
2024-04-16 00:44:15,693 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 39 +++++++++++++++++++++++++++++++++++++--
2024-04-16 00:44:15,693 [ scc.git] DEBUG 6 files changed, 68 insertions(+), 7 deletions(-)
2024-04-16 00:44:16,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:44:16,035 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-16 00:44:16,043 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:16,048 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-16 00:44:16,122 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-04-16 00:44:16,122 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-16 00:44:16,127 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-04-16 00:44:16,127 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-04-16 00:44:16,127 [ scc.git] DEBUG src/app/header.html | 5 +
2024-04-16 00:44:16,127 [ scc.git] DEBUG src/app/header.js | 46 ++++++++-
2024-04-16 00:44:16,127 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-04-16 00:44:16,127 [ scc.git] DEBUG src/utils/figure.js | 220 ++++++++++++++++++++++++++++++++++++++++++
2024-04-16 00:44:16,127 [ scc.git] DEBUG 6 files changed, 294 insertions(+), 6 deletions(-)
2024-04-16 00:44:16,127 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-04-16 00:44:16,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:44:16,481 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-16 00:44:16,489 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:16,496 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-16 00:44:16,522 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-16 00:44:16,525 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-04-16 00:44:16,525 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-04-16 00:44:16,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:44:16,900 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-16 00:44:16,940 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:16,940 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:16,946 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-16 00:44:17,008 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-16 00:44:17,016 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff9d80e55b0> has no local changes
2024-04-16 00:44:17,016 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 456 will-moore 'Don't use tiles for non-big movies'
- PR 460 will-moore 'Channel min spinner fix'
- PR 464 will-moore 'Tile load error warning'
- PR 465 will-moore 'Save as Figure'
- PR 469 will-moore 'changelog 0.14.0'
Generated by OMERO-plugins-push#34 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/)'
2024-04-16 00:44:17,025 [ scc.git] DEBUG [detached HEAD 9d695d9] merge master -Dorg -Ssuccess-only
2024-04-16 00:44:17,026 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:44:17,026 [ scc.repo] DEBUG ## PRs found:
2024-04-16 00:44:17,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-04-16 00:44:17,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-04-16 00:44:18,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-04-16 00:44:18,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-16 00:44:19,370 [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-16 00:44:19,806 [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-16 00:44:20,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-16 00:44:20,734 [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-16 00:44:20,735 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-04-16 00:44:20,735 [ scc.repo] DEBUG ## Branches found:
2024-04-16 00:44:20,735 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-16 00:44:20,735 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:20,735 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:20,741 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-16 00:44:20,747 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-16 00:44:20,747 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-16 00:44:20,752 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-16 00:44:20,758 [ scc.git] DEBUG Already up to date.
2024-04-16 00:44:20,759 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-04-16 00:44:21,152 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-04-16 00:44:21,152 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-04-16 00:44:21,157 [ scc.git] DEBUG ## Unique users: []
2024-04-16 00:44:21,158 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:21,158 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:21,163 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-16 00:44:21,169 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:21,174 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-16 00:44:21,183 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-16 00:44:21,186 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-04-16 00:44:21,186 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-04-16 00:44:21,186 [ scc.git] DEBUG requirements.txt | 2 +-
2024-04-16 00:44:21,186 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-04-16 00:44:21,186 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-04-16 00:44:21,186 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-04-16 00:44:21,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:44:21,358 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-16 00:44:21,396 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:21,396 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:21,401 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-16 00:44:21,438 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-16 00:44:21,445 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff9d80f84f0> has no local changes
2024-04-16 00:44:21,445 [ 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#34 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/)'
2024-04-16 00:44:21,453 [ scc.git] DEBUG [detached HEAD 334f234] merge master -Dorg -Ssuccess-only
2024-04-16 00:44:21,453 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:44:21,454 [ scc.repo] DEBUG ## PRs found:
2024-04-16 00:44:21,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-04-16 00:44:22,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-04-16 00:44:22,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-04-16 00:44:23,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-16 00:44:23,870 [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-16 00:44:24,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-16 00:44:24,795 [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-16 00:44:24,796 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-16 00:44:25,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-04-16 00:44:25,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-04-16 00:44:26,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-16 00:44:26,642 [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-16 00:44:27,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-16 00:44:27,574 [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-16 00:44:27,575 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-16 00:44:27,575 [ scc.repo] DEBUG ## Branches found:
2024-04-16 00:44:27,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-16 00:44:27,576 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:27,576 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:27,586 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-16 00:44:27,597 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-16 00:44:27,597 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-16 00:44:27,606 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-16 00:44:27,616 [ scc.git] DEBUG Already up to date.
2024-04-16 00:44:27,616 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-04-16 00:44:28,166 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-16 00:44:28,166 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-04-16 00:44:28,172 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-04-16 00:44:28,691 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-16 00:44:28,691 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-04-16 00:44:28,696 [ scc.git] DEBUG ## Unique users: []
2024-04-16 00:44:28,696 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:28,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:28,702 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-16 00:44:28,708 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:28,713 [ 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-16 00:44:28,796 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-04-16 00:44:28,796 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-04-16 00:44:28,796 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-16 00:44:28,796 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-16 00:44:28,796 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-16 00:44:28,797 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-16 00:44:28,805 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-16 00:44:28,812 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-16 00:44:28,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:44:28,975 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-16 00:44:28,982 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-16 00:44:28,988 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#34](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-04-16 00:44:28,993 [ scc.config] DEBUG Found github.token
2024-04-16 00:44:28,993 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-04-16 00:44:28,993 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-16 00:44:29,000 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:29,005 [ 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-16 00:44:29,023 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-16 00:44:29,023 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-16 00:44:29,023 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-04-16 00:44:29,023 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-16 00:44:29,024 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-16 00:44:29,030 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-16 00:44:29,037 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-16 00:44:29,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:44:29,379 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-16 00:44:29,389 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-16 00:44:29,396 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#34](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/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-16 00:44:29,402 [ scc.config] DEBUG Found github.token
2024-04-16 00:44:29,402 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-04-16 00:44:29,403 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-16 00:44:29,452 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:29,453 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:29,461 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-16 00:44:29,509 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-16 00:44:29,517 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff9d80e5550> has no local changes
2024-04-16 00:44:29,518 [ 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#34 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/)'
2024-04-16 00:44:29,529 [ scc.git] DEBUG [detached HEAD 9becba2] merge master -Dorg -Ssuccess-only
2024-04-16 00:44:29,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:44:29,530 [ scc.repo] DEBUG ## PRs found:
2024-04-16 00:44:29,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-04-16 00:44:30,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-04-16 00:44:30,384 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-16 00:44:30,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-16 00:44:31,411 [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-16 00:44:31,895 [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-16 00:44:32,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-16 00:44:32,758 [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-16 00:44:32,759 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-16 00:44:33,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-04-16 00:44:33,243 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-16 00:44:33,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-16 00:44:34,273 [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-16 00:44:34,755 [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-16 00:44:35,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-16 00:44:35,683 [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-16 00:44:35,684 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-16 00:44:36,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-04-16 00:44:36,162 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-16 00:44:36,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-16 00:44:37,187 [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-16 00:44:37,657 [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-16 00:44:38,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-16 00:44:38,509 [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-16 00:44:38,510 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-16 00:44:38,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-04-16 00:44:39,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-04-16 00:44:39,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-04-16 00:44:40,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-04-16 00:44:40,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-04-16 00:44:41,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-04-16 00:44:41,356 [ scc.repo] DEBUG ## Branches found:
2024-04-16 00:44:41,356 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-16 00:44:41,356 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:41,356 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:41,362 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-16 00:44:41,366 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-16 00:44:41,367 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-16 00:44:41,372 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-16 00:44:41,377 [ scc.git] DEBUG Already up to date.
2024-04-16 00:44:41,377 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-04-16 00:44:41,774 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-16 00:44:41,774 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-04-16 00:44:41,779 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-04-16 00:44:42,166 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-16 00:44:42,167 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-04-16 00:44:42,174 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-16 00:44:42,554 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-16 00:44:42,554 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-16 00:44:42,559 [ scc.git] DEBUG ## Unique users: []
2024-04-16 00:44:42,559 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:42,559 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:42,565 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-16 00:44:42,570 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:42,575 [ 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-16 00:44:42,585 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-16 00:44:42,588 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-04-16 00:44:42,588 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-04-16 00:44:42,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:44:42,741 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-16 00:44:42,747 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:42,753 [ 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-16 00:44:42,818 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-16 00:44:42,818 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-16 00:44:42,821 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-04-16 00:44:42,822 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-04-16 00:44:43,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:44:43,155 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-16 00:44:43,161 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:43,167 [ 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-16 00:44:43,179 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-16 00:44:43,180 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-16 00:44:43,183 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-04-16 00:44:43,183 [ scc.git] DEBUG package.json | 2 +-
2024-04-16 00:44:43,183 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-04-16 00:44:43,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:44:43,611 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-16 00:44:43,654 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:43,654 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:43,660 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-16 00:44:43,704 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-16 00:44:43,711 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff9d80e6fd0> has no local changes
2024-04-16 00:44:43,712 [ 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#34 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/)'
2024-04-16 00:44:43,722 [ scc.git] DEBUG [detached HEAD 307f353] merge master -Dorg -Ssuccess-only
2024-04-16 00:44:43,722 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:44:43,722 [ scc.repo] DEBUG ## PRs found:
2024-04-16 00:44:44,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-04-16 00:44:44,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-04-16 00:44:45,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-16 00:44:45,489 [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-16 00:44:45,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-16 00:44:46,392 [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-16 00:44:46,393 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-04-16 00:44:46,393 [ scc.repo] DEBUG ## Branches found:
2024-04-16 00:44:46,393 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-16 00:44:46,393 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:46,394 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:46,414 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-16 00:44:46,420 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-16 00:44:46,420 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-16 00:44:46,427 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-16 00:44:46,433 [ scc.git] DEBUG Already up to date.
2024-04-16 00:44:46,434 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-16 00:44:46,838 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-04-16 00:44:46,838 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-16 00:44:46,845 [ scc.git] DEBUG ## Unique users: []
2024-04-16 00:44:46,845 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:46,845 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:46,850 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-16 00:44:46,856 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:46,861 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-16 00:44:46,870 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-16 00:44:47,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:44:47,029 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-16 00:44:47,094 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:47,095 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:47,105 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-16 00:44:47,163 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-16 00:44:47,173 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff9d806f340> has no local changes
2024-04-16 00:44:47,174 [ 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#34 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/)'
2024-04-16 00:44:47,187 [ scc.git] DEBUG [detached HEAD 939d603] merge master -Dorg -Ssuccess-only
2024-04-16 00:44:47,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:44:47,189 [ scc.repo] DEBUG ## PRs found:
2024-04-16 00:44:47,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-04-16 00:44:47,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-04-16 00:44:48,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-04-16 00:44:48,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-04-16 00:44:49,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-16 00:44:49,856 [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-16 00:44:50,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-16 00:44:50,785 [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-16 00:44:50,786 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-16 00:44:50,787 [ scc.repo] DEBUG ## Branches found:
2024-04-16 00:44:50,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-16 00:44:50,787 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:50,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:50,794 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-16 00:44:50,800 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-16 00:44:50,800 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-16 00:44:50,807 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-16 00:44:50,817 [ scc.git] DEBUG Already up to date.
2024-04-16 00:44:50,817 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-04-16 00:44:51,275 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-04-16 00:44:51,275 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-04-16 00:44:51,284 [ scc.git] DEBUG ## Unique users: []
2024-04-16 00:44:51,284 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:51,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:51,293 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-16 00:44:51,307 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:51,318 [ 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-16 00:44:51,335 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-04-16 00:44:51,336 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-16 00:44:51,341 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-04-16 00:44:51,341 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-04-16 00:44:51,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:44:51,498 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-16 00:44:51,546 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:51,546 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:51,553 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-16 00:44:51,605 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-16 00:44:51,615 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff9d80ad640> has no local changes
2024-04-16 00:44:51,616 [ 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#34 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/)'
2024-04-16 00:44:51,629 [ scc.git] DEBUG [detached HEAD 8681444] merge master -Dorg -Ssuccess-only
2024-04-16 00:44:51,630 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:44:51,630 [ scc.repo] DEBUG ## PRs found:
2024-04-16 00:44:52,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-04-16 00:44:52,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-04-16 00:44:52,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-04-16 00:44:53,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-16 00:44:53,919 [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-16 00:44:54,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-16 00:44:54,773 [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-16 00:44:54,774 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-16 00:44:54,774 [ scc.repo] DEBUG ## Branches found:
2024-04-16 00:44:54,774 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-16 00:44:54,774 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:54,774 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:54,781 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-16 00:44:54,786 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-16 00:44:54,786 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-16 00:44:54,792 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-16 00:44:54,798 [ scc.git] DEBUG Already up to date.
2024-04-16 00:44:54,798 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-16 00:44:55,223 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-04-16 00:44:55,223 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-16 00:44:55,228 [ scc.git] DEBUG ## Unique users: []
2024-04-16 00:44:55,229 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:55,229 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:55,235 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-16 00:44:55,242 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:55,247 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-16 00:44:55,323 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-04-16 00:44:55,323 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-04-16 00:44:55,323 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-04-16 00:44:55,324 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-04-16 00:44:55,324 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-04-16 00:44:55,324 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-04-16 00:44:55,324 [ scc.git] DEBUG Auto-merging setup.py
2024-04-16 00:44:55,324 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-04-16 00:44:55,324 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-16 00:44:55,324 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-16 00:44:55,330 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-16 00:44:55,337 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-04-16 00:44:55,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:44:55,478 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-16 00:44:55,485 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-16 00:44:55,491 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#34](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/views.py
- omero_signup/signup_settings.py
- setup.py
--conflicts
2024-04-16 00:44:55,496 [ scc.config] DEBUG Found github.token
2024-04-16 00:44:55,496 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-04-16 00:44:55,496 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-16 00:44:55,535 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:55,535 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:55,540 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-16 00:44:55,580 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-16 00:44:55,587 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff9d80f1e80> has no local changes
2024-04-16 00:44:55,587 [ 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#34 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/)'
2024-04-16 00:44:55,597 [ scc.git] DEBUG [detached HEAD 47cefdf] merge master -Dorg -Ssuccess-only
2024-04-16 00:44:55,597 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:44:55,597 [ scc.repo] DEBUG ## PRs found:
2024-04-16 00:44:55,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-04-16 00:44:56,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-04-16 00:44:56,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-04-16 00:44:57,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-16 00:44:57,924 [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-16 00:44:58,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-16 00:44:58,839 [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-16 00:44:58,840 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-16 00:44:58,840 [ scc.repo] DEBUG ## Branches found:
2024-04-16 00:44:58,841 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-16 00:44:58,841 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:58,841 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:58,855 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-16 00:44:58,867 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-16 00:44:58,867 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-16 00:44:58,878 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-16 00:44:58,891 [ scc.git] DEBUG Already up to date.
2024-04-16 00:44:58,891 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-04-16 00:44:59,401 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-04-16 00:44:59,402 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-04-16 00:44:59,408 [ scc.git] DEBUG ## Unique users: []
2024-04-16 00:44:59,408 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:59,408 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:59,414 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-04-16 00:44:59,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:59,426 [ 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-16 00:44:59,500 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-16 00:44:59,506 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-04-16 00:44:59,507 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-04-16 00:44:59,507 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-04-16 00:44:59,507 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-04-16 00:44:59,507 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-04-16 00:44:59,507 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-04-16 00:44:59,507 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-04-16 00:44:59,507 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-04-16 00:44:59,507 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-04-16 00:44:59,507 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-04-16 00:44:59,507 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-04-16 00:44:59,507 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-04-16 00:44:59,507 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-04-16 00:44:59,507 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-04-16 00:44:59,509 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-04-16 00:44:59,509 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-04-16 00:44:59,509 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-04-16 00:44:59,510 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-04-16 00:44:59,510 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-04-16 00:44:59,510 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-04-16 00:44:59,510 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-04-16 00:44:59,510 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-04-16 00:44:59,510 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-04-16 00:44:59,510 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-04-16 00:44:59,510 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-04-16 00:44:59,510 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-04-16 00:44:59,510 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-04-16 00:44:59,511 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-04-16 00:44:59,511 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-04-16 00:44:59,511 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-04-16 00:44:59,511 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-04-16 00:44:59,511 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-04-16 00:44:59,511 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-04-16 00:44:59,511 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-04-16 00:44:59,511 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-04-16 00:44:59,511 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-04-16 00:44:59,511 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-04-16 00:44:59,511 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-04-16 00:44:59,511 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-04-16 00:44:59,511 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-04-16 00:44:59,511 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-04-16 00:44:59,511 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-04-16 00:44:59,511 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-04-16 00:44:59,511 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-04-16 00:44:59,511 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-04-16 00:44:59,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:44:59,672 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-16 00:44:59,744 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:44:59,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:44:59,755 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-16 00:44:59,824 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-16 00:44:59,835 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff9d80e6df0> has no local changes
2024-04-16 00:44:59,836 [ 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#34 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/)'
2024-04-16 00:44:59,896 [ scc.git] DEBUG [detached HEAD 2317c15] merge master -Dorg -Ssuccess-only
2024-04-16 00:44:59,896 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:44:59,897 [ scc.repo] DEBUG ## PRs found:
2024-04-16 00:45:00,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-04-16 00:45:00,094 [ scc.repo] DEBUG ## Branches found:
2024-04-16 00:45:00,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-16 00:45:00,094 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:45:00,094 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:00,108 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-16 00:45:00,122 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-16 00:45:00,123 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-16 00:45:00,130 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-16 00:45:00,138 [ scc.git] DEBUG Already up to date.
2024-04-16 00:45:00,139 [ scc.git] DEBUG ## Unique users: []
2024-04-16 00:45:00,139 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:45:00,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:00,146 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-16 00:45:00,186 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:45:00,186 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:00,192 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-16 00:45:00,235 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-16 00:45:00,242 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff9d80bdfa0> has no local changes
2024-04-16 00:45:00,243 [ 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#34 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/)'
2024-04-16 00:45:00,251 [ scc.git] DEBUG [detached HEAD 7c39c1b] merge master -Dorg -Ssuccess-only
2024-04-16 00:45:00,251 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:00,252 [ scc.repo] DEBUG ## PRs found:
2024-04-16 00:45:00,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-04-16 00:45:00,522 [ scc.repo] DEBUG ## Branches found:
2024-04-16 00:45:00,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-16 00:45:00,523 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:45:00,523 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:00,530 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-16 00:45:00,535 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-16 00:45:00,535 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-16 00:45:00,541 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-16 00:45:00,547 [ scc.git] DEBUG Already up to date.
2024-04-16 00:45:00,547 [ scc.git] DEBUG ## Unique users: []
2024-04-16 00:45:00,547 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:45:00,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:00,552 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-16 00:45:00,589 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:45:00,590 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:00,595 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-16 00:45:00,636 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-16 00:45:00,642 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff9d8082f70> has no local changes
2024-04-16 00:45:00,642 [ 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#34 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/)'
2024-04-16 00:45:00,650 [ scc.git] DEBUG [detached HEAD a8a1a8f] merge master -Dorg -Ssuccess-only
2024-04-16 00:45:00,651 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:00,651 [ scc.git] INFO Overriding base-branch from master to main
2024-04-16 00:45:00,651 [ scc.repo] DEBUG ## PRs found:
2024-04-16 00:45:01,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-04-16 00:45:01,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-04-16 00:45:01,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-04-16 00:45:02,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-04-16 00:45:02,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-16 00:45:03,349 [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-16 00:45:03,850 [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-16 00:45:04,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-16 00:45:04,775 [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-16 00:45:04,776 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-16 00:45:04,776 [ scc.repo] DEBUG ## Branches found:
2024-04-16 00:45:04,776 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-16 00:45:04,776 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:45:04,776 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:04,784 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-04-16 00:45:04,789 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-16 00:45:04,790 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-04-16 00:45:04,796 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-04-16 00:45:04,802 [ scc.git] DEBUG Already up to date.
2024-04-16 00:45:04,802 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-16 00:45:05,208 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-04-16 00:45:05,208 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-16 00:45:05,215 [ scc.git] DEBUG ## Unique users: []
2024-04-16 00:45:05,216 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:45:05,216 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:05,222 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-16 00:45:05,229 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:05,236 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-16 00:45:05,260 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-04-16 00:45:05,260 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-04-16 00:45:05,260 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-16 00:45:05,261 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-16 00:45:05,267 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-16 00:45:05,274 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-04-16 00:45:05,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:05,428 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-16 00:45:05,435 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-16 00:45:05,443 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#34](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-04-16 00:45:05,448 [ scc.config] DEBUG Found github.token
2024-04-16 00:45:05,449 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-04-16 00:45:05,449 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-16 00:45:05,490 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:45:05,490 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:05,496 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-16 00:45:05,577 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-16 00:45:05,594 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff9d803cb50> has no local changes
2024-04-16 00:45:05,595 [ 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#34 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/)'
2024-04-16 00:45:05,605 [ scc.git] DEBUG [detached HEAD 35af4bb] merge master -Dorg -Ssuccess-only
2024-04-16 00:45:05,606 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:05,606 [ scc.repo] DEBUG ## PRs found:
2024-04-16 00:45:05,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-04-16 00:45:05,876 [ scc.repo] DEBUG ## Branches found:
2024-04-16 00:45:05,877 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-16 00:45:05,877 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:45:05,877 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:05,911 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-16 00:45:05,917 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-16 00:45:05,917 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-16 00:45:05,930 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-16 00:45:05,942 [ scc.git] DEBUG Already up to date.
2024-04-16 00:45:05,942 [ scc.git] DEBUG ## Unique users: []
2024-04-16 00:45:05,942 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:45:05,943 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:05,955 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-16 00:45:06,027 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:45:06,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:06,038 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-16 00:45:06,098 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-16 00:45:06,108 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff9d8057e50> has no local changes
2024-04-16 00:45:06,108 [ 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#34 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/)'
2024-04-16 00:45:06,121 [ scc.git] DEBUG [detached HEAD d0b55ad] merge master -Dorg -Ssuccess-only
2024-04-16 00:45:06,122 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:06,122 [ scc.repo] DEBUG ## PRs found:
2024-04-16 00:45:06,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-04-16 00:45:06,309 [ scc.repo] DEBUG ## Branches found:
2024-04-16 00:45:06,309 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-16 00:45:06,309 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:45:06,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:06,318 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-16 00:45:06,329 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-16 00:45:06,329 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-16 00:45:06,337 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-16 00:45:06,347 [ scc.git] DEBUG Already up to date.
2024-04-16 00:45:06,348 [ scc.git] DEBUG ## Unique users: []
2024-04-16 00:45:06,348 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:45:06,348 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:06,358 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-16 00:45:06,418 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:45:06,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:06,427 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-16 00:45:06,482 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-16 00:45:06,490 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff9d077c940> has no local changes
2024-04-16 00:45:06,490 [ 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#34 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/)'
2024-04-16 00:45:06,501 [ scc.git] DEBUG [detached HEAD 349969e] merge master -Dorg -Ssuccess-only
2024-04-16 00:45:06,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:06,502 [ scc.repo] DEBUG ## PRs found:
2024-04-16 00:45:06,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-04-16 00:45:07,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-04-16 00:45:07,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-04-16 00:45:08,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-16 00:45:08,751 [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-16 00:45:09,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-16 00:45:09,659 [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-16 00:45:09,660 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-04-16 00:45:09,660 [ scc.repo] DEBUG ## Branches found:
2024-04-16 00:45:09,661 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-16 00:45:09,661 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:45:09,661 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:09,670 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-16 00:45:09,680 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-16 00:45:09,680 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-16 00:45:09,690 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-16 00:45:09,700 [ scc.git] DEBUG Already up to date.
2024-04-16 00:45:09,700 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-04-16 00:45:10,139 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-04-16 00:45:10,139 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-04-16 00:45:10,147 [ scc.git] DEBUG ## Unique users: []
2024-04-16 00:45:10,147 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:45:10,147 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:10,167 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-16 00:45:10,189 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:10,201 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-16 00:45:10,245 [ scc.git] DEBUG Auto-merging Dockerfile
2024-04-16 00:45:10,246 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-04-16 00:45:10,246 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-16 00:45:10,247 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-16 00:45:10,259 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-16 00:45:10,273 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-04-16 00:45:10,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:10,424 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-16 00:45:10,433 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-16 00:45:10,440 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#34](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-04-16 00:45:10,448 [ scc.config] DEBUG Found github.token
2024-04-16 00:45:10,449 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-04-16 00:45:10,449 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-16 00:45:10,515 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:45:10,515 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:10,521 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-16 00:45:10,594 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-16 00:45:10,612 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff9d07dc310> has no local changes
2024-04-16 00:45:10,612 [ 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#34 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/)'
2024-04-16 00:45:10,627 [ scc.git] DEBUG [detached HEAD 3715837] merge master -Dorg -Ssuccess-only
2024-04-16 00:45:10,627 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:10,628 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-16 00:45:10,628 [ scc.repo] DEBUG ## PRs found:
2024-04-16 00:45:10,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-16 00:45:11,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-16 00:45:11,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-16 00:45:12,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-16 00:45:12,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-16 00:45:13,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-16 00:45:13,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-16 00:45:14,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-16 00:45:14,701 [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-16 00:45:15,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-16 00:45:15,581 [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-16 00:45:15,582 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-16 00:45:16,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-16 00:45:16,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-16 00:45:17,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-16 00:45:17,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-16 00:45:17,565 [ scc.repo] DEBUG ## Branches found:
2024-04-16 00:45:17,565 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-16 00:45:17,565 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:45:17,565 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:17,573 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-16 00:45:17,579 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-16 00:45:17,580 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-16 00:45:17,587 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-16 00:45:17,593 [ scc.git] DEBUG Already up to date.
2024-04-16 00:45:17,594 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-16 00:45:18,009 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-04-16 00:45:18,009 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-16 00:45:18,016 [ scc.git] DEBUG ## Unique users: []
2024-04-16 00:45:18,016 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:45:18,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:18,022 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-16 00:45:18,029 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:18,034 [ 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-16 00:45:18,071 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-16 00:45:18,071 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-16 00:45:18,071 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-16 00:45:18,071 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-16 00:45:18,078 [ scc.git] DEBUG Calling 'git reset --hard 2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-16 00:45:18,084 [ scc.git] DEBUG HEAD is now at 2078ac7 Bump version: 5.8.0 → 5.8.1.dev0
2024-04-16 00:45:18,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:18,246 [ scc.git] DEBUG Calling 'git merge-base 2078ac72dbf11f2733e685000a274eff81c2ac2d 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-16 00:45:18,255 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-16 00:45:18,262 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#34](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-16 00:45:18,268 [ scc.config] DEBUG Found github.token
2024-04-16 00:45:18,269 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-16 00:45:18,269 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-16 00:45:18,308 [ scc.git] DEBUG Get sha1 of %s
2024-04-16 00:45:18,308 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-16 00:45:18,314 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-16 00:45:18,353 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-16 00:45:18,360 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff9d077cbb0> has no local changes
2024-04-16 00:45:18,360 [ 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#34 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/)'
2024-04-16 00:45:18,370 [ scc.git] DEBUG [detached HEAD 47f09ae] merge master -Dorg -Ssuccess-only
2024-04-16 00:45:18,370 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:18,370 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-16 00:45:18,448 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-04-16 00:45:18,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:18,678 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-04-16 00:45:18,684 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-04-16 00:45:19,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:19,091 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-04-16 00:45:19,099 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-04-16 00:45:19,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:19,497 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-04-16 00:45:19,502 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-04-16 00:45:19,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:19,905 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-04-16 00:45:20,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:20,323 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-04-16 00:45:20,328 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-04-16 00:45:20,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:20,717 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-04-16 00:45:20,721 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-04-16 00:45:21,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:21,120 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-04-16 00:45:21,125 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-04-16 00:45:21,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:21,527 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-04-16 00:45:21,537 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-04-16 00:45:21,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:21,937 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-04-16 00:45:21,942 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-04-16 00:45:22,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:22,348 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-04-16 00:45:22,353 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-04-16 00:45:22,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:22,771 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-04-16 00:45:22,776 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-04-16 00:45:23,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:23,179 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-04-16 00:45:23,185 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-04-16 00:45:23,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:23,588 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-04-16 00:45:23,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:23,990 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-04-16 00:45:24,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:24,401 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-04-16 00:45:24,408 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-04-16 00:45:24,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:24,812 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-04-16 00:45:25,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:25,235 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-04-16 00:45:25,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:25,631 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-04-16 00:45:25,636 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-04-16 00:45:26,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:26,070 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-04-16 00:45:26,075 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-04-16 00:45:26,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:26,482 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-04-16 00:45:26,486 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-04-16 00:45:26,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:26,891 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-04-16 00:45:26,896 [ scc.config] DEBUG Found submodule.scripts.url
2024-04-16 00:45:27,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-16 00:45:27,290 [ scc.config] DEBUG Found submodule.scripts.branch
2024-04-16 00:45:27,290 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-16 00:45:27,371 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff9d928bac0> has local changes
2024-04-16 00:45:27,371 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 549 will-moore 'Inset feature' (stage: draft)
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 456 will-moore 'Don't use tiles for non-big movies'
- PR 460 will-moore 'Channel min spinner fix'
- PR 464 will-moore 'Tile load error warning'
- PR 465 will-moore 'Save as Figure'
- PR 469 will-moore 'changelog 0.14.0'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
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#34 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/34/)'
2024-04-16 00:45:27,385 [ scc.git] DEBUG [detached HEAD 1b25931] merge master -Dorg -Ssuccess-only
2024-04-16 00:45:27,385 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-04-16 00:45:27,386 [ scc.merge] INFO Repository: ome/omero-plugins
2024-04-16 00:45:27,386 [ scc.merge] INFO Already up to date.
2024-04-16 00:45:27,386 [ scc.merge] INFO
2024-04-16 00:45:27,386 [ scc.merge] INFO
2024-04-16 00:45:27,386 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-04-16 00:45:27,386 [ scc.merge] INFO Already up to date.
2024-04-16 00:45:27,386 [ scc.merge] INFO
2024-04-16 00:45:27,386 [ scc.merge] INFO
2024-04-16 00:45:27,386 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-04-16 00:45:27,386 [ scc.merge] INFO Excluded PRs:
2024-04-16 00:45:27,386 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-04-16 00:45:27,386 [ scc.merge] INFO Already up to date.
2024-04-16 00:45:27,386 [ scc.merge] INFO
2024-04-16 00:45:27,386 [ scc.merge] INFO Merged PRs:
2024-04-16 00:45:27,386 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-04-16 00:45:27,386 [ scc.merge] INFO
2024-04-16 00:45:27,386 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-04-16 00:45:27,386 [ scc.merge] INFO Excluded PRs:
2024-04-16 00:45:27,386 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-04-16 00:45:27,386 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-04-16 00:45:27,386 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-04-16 00:45:27,386 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-04-16 00:45:27,386 [ scc.merge] INFO Already up to date.
2024-04-16 00:45:27,386 [ scc.merge] INFO
2024-04-16 00:45:27,386 [ scc.merge] INFO Merged PRs:
2024-04-16 00:45:27,386 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-04-16 00:45:27,386 [ scc.merge] INFO
2024-04-16 00:45:27,386 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-04-16 00:45:27,386 [ scc.merge] INFO Excluded PRs:
2024-04-16 00:45:27,386 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-16 00:45:27,386 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-04-16 00:45:27,387 [ scc.merge] INFO Already up to date.
2024-04-16 00:45:27,387 [ scc.merge] INFO
2024-04-16 00:45:27,387 [ scc.merge] INFO Merged PRs:
2024-04-16 00:45:27,387 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-04-16 00:45:27,387 [ scc.merge] INFO
2024-04-16 00:45:27,387 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-16 00:45:27,387 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-04-16 00:45:27,387 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-04-16 00:45:27,387 [ scc.merge] INFO
2024-04-16 00:45:27,387 [ scc.merge] INFO Repository: ome/omero-figure
2024-04-16 00:45:27,387 [ scc.merge] INFO Excluded PRs:
2024-04-16 00:45:27,387 [ scc.merge] INFO - PR 549 will-moore 'Inset feature' (stage: draft)
2024-04-16 00:45:27,387 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-04-16 00:45:27,387 [ scc.merge] INFO Already up to date.
2024-04-16 00:45:27,387 [ scc.merge] INFO
2024-04-16 00:45:27,387 [ scc.merge] INFO Merged PRs:
2024-04-16 00:45:27,387 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-04-16 00:45:27,387 [ scc.merge] INFO
2024-04-16 00:45:27,387 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-04-16 00:45:27,387 [ scc.merge] INFO Already up to date.
2024-04-16 00:45:27,387 [ scc.merge] INFO
2024-04-16 00:45:27,387 [ scc.merge] INFO Merged PRs:
2024-04-16 00:45:27,387 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-04-16 00:45:27,387 [ scc.merge] INFO
2024-04-16 00:45:27,387 [ scc.merge] INFO Repository: ome/omero-gallery
2024-04-16 00:45:27,387 [ scc.merge] INFO Already up to date.
2024-04-16 00:45:27,387 [ scc.merge] INFO
2024-04-16 00:45:27,387 [ scc.merge] INFO Merged PRs:
2024-04-16 00:45:27,387 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-16 00:45:27,387 [ scc.merge] INFO
2024-04-16 00:45:27,387 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-04-16 00:45:27,387 [ scc.merge] INFO Excluded PRs:
2024-04-16 00:45:27,387 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-04-16 00:45:27,387 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-04-16 00:45:27,387 [ scc.merge] INFO Already up to date.
2024-04-16 00:45:27,387 [ scc.merge] INFO
2024-04-16 00:45:27,387 [ scc.merge] INFO Merged PRs:
2024-04-16 00:45:27,387 [ scc.merge] INFO - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-04-16 00:45:27,388 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-04-16 00:45:27,388 [ scc.merge] INFO - PR 464 will-moore 'Tile load error warning'
2024-04-16 00:45:27,388 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-04-16 00:45:27,388 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-04-16 00:45:27,388 [ scc.merge] INFO
2024-04-16 00:45:27,388 [ scc.merge] INFO Repository: ome/omero-mapr
2024-04-16 00:45:27,388 [ scc.merge] INFO Excluded PRs:
2024-04-16 00:45:27,388 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-04-16 00:45:27,388 [ scc.merge] INFO Already up to date.
2024-04-16 00:45:27,388 [ scc.merge] INFO
2024-04-16 00:45:27,388 [ scc.merge] INFO Merged PRs:
2024-04-16 00:45:27,388 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-04-16 00:45:27,388 [ scc.merge] INFO
2024-04-16 00:45:27,388 [ scc.merge] INFO Repository: ome/omero-metadata
2024-04-16 00:45:27,388 [ scc.merge] INFO Already up to date.
2024-04-16 00:45:27,388 [ scc.merge] INFO
2024-04-16 00:45:27,388 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-16 00:45:27,388 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-16 00:45:27,388 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-16 00:45:27,388 [ scc.merge] INFO
2024-04-16 00:45:27,388 [ scc.merge] INFO Repository: ome/omero-parade
2024-04-16 00:45:27,388 [ scc.merge] INFO Excluded PRs:
2024-04-16 00:45:27,388 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-04-16 00:45:27,388 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-04-16 00:45:27,388 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-04-16 00:45:27,388 [ scc.merge] INFO Already up to date.
2024-04-16 00:45:27,388 [ scc.merge] INFO
2024-04-16 00:45:27,388 [ scc.merge] INFO Merged PRs:
2024-04-16 00:45:27,388 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-16 00:45:27,388 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-16 00:45:27,388 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-16 00:45:27,388 [ scc.merge] INFO
2024-04-16 00:45:27,388 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-04-16 00:45:27,388 [ scc.merge] INFO Already up to date.
2024-04-16 00:45:27,388 [ scc.merge] INFO
2024-04-16 00:45:27,388 [ scc.merge] INFO Merged PRs:
2024-04-16 00:45:27,388 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-04-16 00:45:27,388 [ scc.merge] INFO
2024-04-16 00:45:27,388 [ scc.merge] INFO Repository: ome/omero-rois
2024-04-16 00:45:27,389 [ scc.merge] INFO Excluded PRs:
2024-04-16 00:45:27,389 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-16 00:45:27,389 [ scc.merge] INFO Already up to date.
2024-04-16 00:45:27,389 [ scc.merge] INFO
2024-04-16 00:45:27,389 [ scc.merge] INFO Merged PRs:
2024-04-16 00:45:27,389 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-16 00:45:27,389 [ scc.merge] INFO
2024-04-16 00:45:27,389 [ scc.merge] INFO Repository: ome/omero-signup
2024-04-16 00:45:27,389 [ scc.merge] INFO Already up to date.
2024-04-16 00:45:27,389 [ scc.merge] INFO
2024-04-16 00:45:27,389 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-16 00:45:27,389 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-16 00:45:27,389 [ scc.merge] INFO
2024-04-16 00:45:27,389 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-04-16 00:45:27,389 [ scc.merge] INFO Already up to date.
2024-04-16 00:45:27,389 [ scc.merge] INFO
2024-04-16 00:45:27,389 [ scc.merge] INFO Merged PRs:
2024-04-16 00:45:27,389 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-16 00:45:27,389 [ scc.merge] INFO
2024-04-16 00:45:27,389 [ scc.merge] INFO Repository: ome/omero-upload
2024-04-16 00:45:27,389 [ scc.merge] INFO Already up to date.
2024-04-16 00:45:27,389 [ scc.merge] INFO
2024-04-16 00:45:27,389 [ scc.merge] INFO
2024-04-16 00:45:27,389 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-04-16 00:45:27,389 [ scc.merge] INFO Already up to date.
2024-04-16 00:45:27,389 [ scc.merge] INFO
2024-04-16 00:45:27,389 [ scc.merge] INFO
2024-04-16 00:45:27,389 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-04-16 00:45:27,389 [ scc.merge] INFO Excluded PRs:
2024-04-16 00:45:27,389 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-04-16 00:45:27,389 [ scc.merge] INFO Already up to date.
2024-04-16 00:45:27,389 [ scc.merge] INFO
2024-04-16 00:45:27,389 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-16 00:45:27,389 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-16 00:45:27,389 [ scc.merge] INFO
2024-04-16 00:45:27,389 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-04-16 00:45:27,389 [ scc.merge] INFO Already up to date.
2024-04-16 00:45:27,389 [ scc.merge] INFO
2024-04-16 00:45:27,390 [ scc.merge] INFO
2024-04-16 00:45:27,390 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-04-16 00:45:27,390 [ scc.merge] INFO Already up to date.
2024-04-16 00:45:27,390 [ scc.merge] INFO
2024-04-16 00:45:27,390 [ scc.merge] INFO
2024-04-16 00:45:27,390 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-04-16 00:45:27,390 [ scc.merge] INFO Already up to date.
2024-04-16 00:45:27,390 [ scc.merge] INFO
2024-04-16 00:45:27,390 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-16 00:45:27,390 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-04-16 00:45:27,390 [ scc.merge] INFO
2024-04-16 00:45:27,390 [ scc.merge] INFO Repository: ome/scripts
2024-04-16 00:45:27,390 [ scc.merge] INFO Excluded PRs:
2024-04-16 00:45:27,390 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-16 00:45:27,390 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-16 00:45:27,390 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-16 00:45:27,390 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-16 00:45:27,390 [ scc.merge] INFO Already up to date.
2024-04-16 00:45:27,390 [ scc.merge] INFO
2024-04-16 00:45:27,390 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-16 00:45:27,390 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-16 00:45:27,390 [ scc.merge] INFO
2024-04-16 00:45:27,390 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-16 00:45:27,390 [ scc.git] DEBUG Calling 'git remote'
2024-04-16 00:45:27,396 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-04-16 00:45:27,396 [ scc.git] DEBUG Calling 'git remote'
2024-04-16 00:45:27,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:27,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-04-16 00:45:27,401 [ scc.git] DEBUG Calling 'git remote'
2024-04-16 00:45:27,406 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:27,406 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-04-16 00:45:27,406 [ scc.git] DEBUG Calling 'git remote'
2024-04-16 00:45:27,412 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:27,412 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-04-16 00:45:27,412 [ scc.git] DEBUG Calling 'git remote'
2024-04-16 00:45:27,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:27,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-04-16 00:45:27,417 [ scc.git] DEBUG Calling 'git remote'
2024-04-16 00:45:27,423 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:27,423 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-16 00:45:27,423 [ scc.git] DEBUG Calling 'git remote'
2024-04-16 00:45:27,429 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:27,429 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-16 00:45:27,429 [ scc.git] DEBUG Calling 'git remote'
2024-04-16 00:45:27,435 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:27,435 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-16 00:45:27,435 [ scc.git] DEBUG Calling 'git remote'
2024-04-16 00:45:27,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:27,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-16 00:45:27,440 [ scc.git] DEBUG Calling 'git remote'
2024-04-16 00:45:27,445 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:27,445 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-16 00:45:27,445 [ scc.git] DEBUG Calling 'git remote'
2024-04-16 00:45:27,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:27,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-16 00:45:27,450 [ scc.git] DEBUG Calling 'git remote'
2024-04-16 00:45:27,454 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:27,454 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-16 00:45:27,454 [ scc.git] DEBUG Calling 'git remote'
2024-04-16 00:45:27,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:27,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-16 00:45:27,459 [ scc.git] DEBUG Calling 'git remote'
2024-04-16 00:45:27,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:27,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-16 00:45:27,464 [ scc.git] DEBUG Calling 'git remote'
2024-04-16 00:45:27,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:27,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-16 00:45:27,469 [ scc.git] DEBUG Calling 'git remote'
2024-04-16 00:45:27,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:27,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-16 00:45:27,475 [ scc.git] DEBUG Calling 'git remote'
2024-04-16 00:45:27,479 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:27,479 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-16 00:45:27,479 [ scc.git] DEBUG Calling 'git remote'
2024-04-16 00:45:27,484 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:27,484 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-16 00:45:27,484 [ scc.git] DEBUG Calling 'git remote'
2024-04-16 00:45:27,489 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:27,489 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-16 00:45:27,489 [ scc.git] DEBUG Calling 'git remote'
2024-04-16 00:45:27,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:27,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-16 00:45:27,495 [ scc.git] DEBUG Calling 'git remote'
2024-04-16 00:45:27,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:27,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-16 00:45:27,501 [ scc.git] DEBUG Calling 'git remote'
2024-04-16 00:45:27,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-16 00:45:27,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-16 00:45:27,507 [ scc.git] DEBUG Calling 'git remote'
2024-04-16 00:45:27,519 [ 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 05589e8] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 2ca566b
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from ded0caab
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 9d8d147
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from a0148a6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 2078ac7
nothing to commit, working tree clean
[detached HEAD 1dcf141] 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-16 00:46:15,306 [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-16 00:46:24,300 [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-16 00:46:26,735 [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-16 00:46:31,280 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-16 00:47:17,863 [ 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/f6f303f9/images/svgs/logo.svg){kind=logo}
