Skipping 118 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/js/bootstrap.min.js
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.css
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.js
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-1.11.1/jquery.min.js
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.base.css
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.slider.css
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/jquery-ui.min.js
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/json2.js
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.js
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.min.js
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/mousetrap-1.5.3/mousetrap.min.js
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael-min.js
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael.js
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/scaleraphael.js
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/underscore-1.13.1-umd-min.js
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100644 omero_figure/templates/figure/index.html
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100644 spec/ViewportViewSpec.js
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100644 spec/images/testImage.png
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100644 spec/javascripts/PanelSpec.js
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100644 spec/javascripts/ViewportViewSpec.js
2024-03-27 00:40:48,353 [ scc.git] DEBUG delete mode 100644 spec/javascripts/fixtures/previewTab.html
2024-03-27 00:40:48,353 [ scc.git] DEBUG create mode 100644 src/.env
2024-03-27 00:40:48,353 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/css/figure.css (70%)
2024-03-27 00:40:48,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/arrow-icon-16.png (100%)
2024-03-27 00:40:48,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-03-27 00:40:48,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-03-27 00:40:48,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-03-27 00:40:48,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-03-27 00:40:48,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-03-27 00:40:48,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-03-27 00:40:48,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-03-27 00:40:48,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-03-27 00:40:48,354 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-03-27 00:40:48,354 [ scc.git] DEBUG mode change 100755 => 100644
2024-03-27 00:40:48,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-03-27 00:40:48,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-03-27 00:40:48,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-03-27 00:40:48,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-03-27 00:40:48,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-03-27 00:40:48,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-03-27 00:40:48,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-03-27 00:40:48,354 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-03-27 00:40:48,354 [ scc.git] DEBUG create mode 100644 src/index.html
2024-03-27 00:40:48,354 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-03-27 00:40:48,354 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-03-27 00:40:48,354 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-03-27 00:40:48,354 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-03-27 00:40:48,354 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-03-27 00:40:48,354 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-03-27 00:40:48,354 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-03-27 00:40:48,354 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-03-27 00:40:48,354 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-03-27 00:40:48,354 [ scc.git] DEBUG mode change 100755 => 100644
2024-03-27 00:40:48,354 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-03-27 00:40:48,354 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-03-27 00:40:48,354 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-03-27 00:40:48,354 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-03-27 00:40:48,354 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-03-27 00:40:48,354 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-03-27 00:40:48,355 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-03-27 00:40:48,355 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-03-27 00:40:48,355 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-03-27 00:40:48,355 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-03-27 00:40:48,355 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-03-27 00:40:48,355 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-03-27 00:40:48,355 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-03-27 00:40:48,355 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-03-27 00:40:48,355 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-03-27 00:40:48,355 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-03-27 00:40:48,355 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-03-27 00:40:48,355 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-03-27 00:40:48,355 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-03-27 00:40:48,355 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-03-27 00:40:48,355 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-03-27 00:40:48,355 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-03-27 00:40:48,355 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-03-27 00:40:48,355 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-03-27 00:40:48,355 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-03-27 00:40:48,355 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-03-27 00:40:48,355 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-03-27 00:40:48,355 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-03-27 00:40:48,355 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-03-27 00:40:48,355 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-03-27 00:40:48,355 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-03-27 00:40:48,355 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-03-27 00:40:48,355 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-03-27 00:40:48,355 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-03-27 00:40:48,355 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-03-27 00:40:48,355 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-03-27 00:40:48,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:40:48,493 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...32b0ccd55ce3c95dabcf8ebf817b032e4b864438'
2024-03-27 00:40:48,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:40:48,504 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 548 (Fix cropping of panel labels and float usage for shape labels) 32b0ccd55ce3c95dabcf8ebf817b032e4b864438'
2024-03-27 00:40:48,523 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:40:48,526 [ scc.git] DEBUG omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 6 +++---
2024-03-27 00:40:48,527 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-03-27 00:40:48,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:40:48,898 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:40:48,932 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:40:48,932 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:40:48,936 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:40:48,969 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:40:48,979 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2e8d5dfd0> has no local changes
2024-03-27 00:40:48,979 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
Generated by OMERO-plugins-push#12 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/)'
2024-03-27 00:40:48,991 [ scc.git] DEBUG [detached HEAD 5d8d5f1b] merge master -Dorg -Ssuccess-only
2024-03-27 00:40:48,991 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:40:48,991 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:40:49,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-03-27 00:40:49,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-03-27 00:40:50,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-03-27 00:40:50,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-03-27 00:40:51,223 [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-03-27 00:40:51,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-03-27 00:40:52,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:40:52,056 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-03-27 00:40:52,056 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:40:52,056 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-03-27 00:40:52,056 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:40:52,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:40:52,061 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-27 00:40:52,065 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:40:52,065 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-27 00:40:52,069 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-27 00:40:52,074 [ scc.git] DEBUG Already up to date.
2024-03-27 00:40:52,074 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-03-27 00:40:52,482 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-03-27 00:40:52,482 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-03-27 00:40:52,485 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:40:52,485 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:40:52,485 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:40:52,490 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-03-27 00:40:52,494 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:40:52,498 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-03-27 00:40:52,576 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-03-27 00:40:52,577 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:40:52,578 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-03-27 00:40:52,579 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-03-27 00:40:52,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:40:52,781 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:40:52,815 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:40:52,815 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:40:52,819 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:40:52,852 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:40:52,857 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2e84d44f0> has no local changes
2024-03-27 00:40:52,857 [ 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#12 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/)'
2024-03-27 00:40:52,864 [ scc.git] DEBUG [detached HEAD fad4017] merge master -Dorg -Ssuccess-only
2024-03-27 00:40:52,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:40:52,865 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:40:53,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-03-27 00:40:53,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-03-27 00:40:53,688 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-27 00:40:54,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-03-27 00:40:54,729 [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-03-27 00:40:55,214 [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-03-27 00:40:55,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-03-27 00:40:56,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:40:56,188 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-03-27 00:40:56,188 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:40:56,188 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-03-27 00:40:56,188 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:40:56,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:40:56,193 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-27 00:40:56,197 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:40:56,197 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-27 00:40:56,202 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-27 00:40:56,207 [ scc.git] DEBUG Already up to date.
2024-03-27 00:40:56,207 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-03-27 00:40:56,591 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-03-27 00:40:56,591 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-03-27 00:40:56,594 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:40:56,594 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:40:56,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:40:56,598 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-03-27 00:40:56,603 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:40:56,607 [ 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-03-27 00:40:56,615 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:40:56,619 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-03-27 00:40:56,619 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-03-27 00:40:56,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:40:56,766 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:40:56,799 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:40:56,799 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:40:56,803 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:40:56,835 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:40:56,841 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2e84d0a90> has no local changes
2024-03-27 00:40:56,842 [ 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#12 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/)'
2024-03-27 00:40:56,850 [ scc.git] DEBUG [detached HEAD 0caa4be] merge master -Dorg -Ssuccess-only
2024-03-27 00:40:56,850 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:40:56,851 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:40:57,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-03-27 00:40:57,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/467 HTTP/1.1" 200 None
2024-03-27 00:40:57,760 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-27 00:40:58,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-03-27 00:40:58,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-27 00:40:59,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-27 00:40:59,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-03-27 00:41:00,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/78e253cccecbd349db3bcb16514f5c8b2c4185e6?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:41:00,162 [ scc.repo] DEBUG - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-03-27 00:41:00,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-03-27 00:41:01,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f22ba44a88528bde6fa49c5bab1736ee00e9061 HTTP/1.1" 200 None
2024-03-27 00:41:01,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f22ba44a88528bde6fa49c5bab1736ee00e9061/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-27 00:41:02,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f22ba44a88528bde6fa49c5bab1736ee00e9061/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-27 00:41:02,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f22ba44a88528bde6fa49c5bab1736ee00e9061 HTTP/1.1" 200 None
2024-03-27 00:41:02,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/9f22ba44a88528bde6fa49c5bab1736ee00e9061?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:41:02,965 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-03-27 00:41:03,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464 HTTP/1.1" 200 None
2024-03-27 00:41:03,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464/comments HTTP/1.1" 200 None
2024-03-27 00:41:04,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-03-27 00:41:04,919 [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-03-27 00:41:05,387 [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-03-27 00:41:05,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-03-27 00:41:06,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/97542d9b749f93d4902f7dce703bbf2a04316a98?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:41:06,282 [ scc.repo] DEBUG - PR 464 will-moore 'Tile load error warning'
2024-03-27 00:41:06,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-03-27 00:41:07,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-03-27 00:41:07,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-03-27 00:41:08,109 [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-03-27 00:41:08,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-03-27 00:41:08,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:41:08,945 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-03-27 00:41:09,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456 HTTP/1.1" 200 None
2024-03-27 00:41:09,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456/comments HTTP/1.1" 200 None
2024-03-27 00:41:10,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-03-27 00:41:10,809 [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-03-27 00:41:11,288 [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-03-27 00:41:11,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-03-27 00:41:12,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:41:12,130 [ scc.repo] DEBUG - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-03-27 00:41:12,130 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:41:12,130 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-03-27 00:41:12,130 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:41:12,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:12,135 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-27 00:41:12,139 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:41:12,140 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-27 00:41:12,144 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-27 00:41:12,149 [ scc.git] DEBUG Already up to date.
2024-03-27 00:41:12,149 [ scc.git] DEBUG Calling 'git fetch origin pull/456/head'
2024-03-27 00:41:12,679 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-27 00:41:12,680 [ scc.git] DEBUG * branch refs/pull/456/head -> FETCH_HEAD
2024-03-27 00:41:12,683 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-03-27 00:41:13,133 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-27 00:41:13,133 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-03-27 00:41:13,136 [ scc.git] DEBUG Calling 'git fetch origin pull/464/head'
2024-03-27 00:41:13,849 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-27 00:41:13,849 [ scc.git] DEBUG * branch refs/pull/464/head -> FETCH_HEAD
2024-03-27 00:41:13,852 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-03-27 00:41:14,769 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-27 00:41:14,769 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-03-27 00:41:14,772 [ scc.git] DEBUG Calling 'git fetch origin pull/467/head'
2024-03-27 00:41:15,154 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-03-27 00:41:15,154 [ scc.git] DEBUG * branch refs/pull/467/head -> FETCH_HEAD
2024-03-27 00:41:15,158 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:41:15,158 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:41:15,158 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:15,162 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-03-27 00:41:15,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:15,171 [ 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-03-27 00:41:15,183 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:41:15,185 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 5 +++--
2024-03-27 00:41:15,185 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-03-27 00:41:15,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:41:15,348 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-03-27 00:41:15,353 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:15,357 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-03-27 00:41:15,367 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:41:15,370 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-03-27 00:41:15,370 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-03-27 00:41:15,370 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-03-27 00:41:15,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:41:15,750 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-03-27 00:41:15,755 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:15,759 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 464 (Tile load error warning) 97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-03-27 00:41:15,772 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:41:15,776 [ scc.git] DEBUG css/app.css | 22 ++++++++++++++++++++++
2024-03-27 00:41:15,776 [ scc.git] DEBUG src/events/events.js | 2 ++
2024-03-27 00:41:15,776 [ scc.git] DEBUG src/index-dev.html | 6 +++---
2024-03-27 00:41:15,776 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 2 +-
2024-03-27 00:41:15,776 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 4 +++-
2024-03-27 00:41:15,776 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 39 +++++++++++++++++++++++++++++++++++++--
2024-03-27 00:41:15,776 [ scc.git] DEBUG 6 files changed, 68 insertions(+), 7 deletions(-)
2024-03-27 00:41:16,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:41:16,155 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9f22ba44a88528bde6fa49c5bab1736ee00e9061'
2024-03-27 00:41:16,160 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:16,164 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 9f22ba44a88528bde6fa49c5bab1736ee00e9061'
2024-03-27 00:41:16,178 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-03-27 00:41:16,179 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:41:16,182 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 7 +-
2024-03-27 00:41:16,182 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-03-27 00:41:16,182 [ scc.git] DEBUG src/app/header.html | 5 ++
2024-03-27 00:41:16,182 [ scc.git] DEBUG src/app/header.js | 45 +++++++++-
2024-03-27 00:41:16,182 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-03-27 00:41:16,182 [ scc.git] DEBUG src/utils/figure.js | 203 ++++++++++++++++++++++++++++++++++++++++++
2024-03-27 00:41:16,183 [ scc.git] DEBUG 6 files changed, 269 insertions(+), 3 deletions(-)
2024-03-27 00:41:16,183 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-03-27 00:41:16,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:41:16,557 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e253cccecbd349db3bcb16514f5c8b2c4185e6'
2024-03-27 00:41:16,599 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:16,603 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 467 (Bump webpack-dev-middleware from 5.3.3 to 5.3.4) 78e253cccecbd349db3bcb16514f5c8b2c4185e6'
2024-03-27 00:41:16,615 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:41:16,624 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2024-03-27 00:41:16,624 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2024-03-27 00:41:16,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:41:16,972 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:41:17,006 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:41:17,006 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:17,010 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:41:17,043 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:41:17,052 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2e8d0abe0> has no local changes
2024-03-27 00:41:17,052 [ 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 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
Generated by OMERO-plugins-push#12 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/)'
2024-03-27 00:41:17,059 [ scc.git] DEBUG [detached HEAD 176160e] merge master -Dorg -Ssuccess-only
2024-03-27 00:41:17,060 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:41:17,060 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:41:17,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-03-27 00:41:17,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-03-27 00:41:18,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-03-27 00:41:18,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-03-27 00:41:19,408 [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-03-27 00:41:19,866 [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-03-27 00:41:20,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-03-27 00:41:20,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:41:20,781 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-03-27 00:41:20,781 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:41:20,781 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-03-27 00:41:20,781 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:41:20,781 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:20,786 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-27 00:41:20,790 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:41:20,790 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-27 00:41:20,795 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-27 00:41:20,799 [ scc.git] DEBUG Already up to date.
2024-03-27 00:41:20,799 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-03-27 00:41:21,195 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-03-27 00:41:21,195 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-03-27 00:41:21,198 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:41:21,198 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:41:21,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:21,203 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-03-27 00:41:21,207 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:21,211 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-03-27 00:41:21,220 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:41:21,222 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-03-27 00:41:21,222 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-03-27 00:41:21,222 [ scc.git] DEBUG requirements.txt | 2 +-
2024-03-27 00:41:21,222 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-03-27 00:41:21,222 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-03-27 00:41:21,222 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-03-27 00:41:21,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:41:21,367 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:41:21,400 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:41:21,400 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:21,404 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:41:21,437 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:41:21,442 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2e8d31490> has no local changes
2024-03-27 00:41:21,442 [ 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#12 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/)'
2024-03-27 00:41:21,449 [ scc.git] DEBUG [detached HEAD 8fa9372] merge master -Dorg -Ssuccess-only
2024-03-27 00:41:21,450 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:41:21,450 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:41:21,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-03-27 00:41:22,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-03-27 00:41:22,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-03-27 00:41:23,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-03-27 00:41:23,847 [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-03-27 00:41:24,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-27 00:41:24,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-03-27 00:41:25,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:41:25,246 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-03-27 00:41:25,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-03-27 00:41:26,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-03-27 00:41:26,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-03-27 00:41:27,080 [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-03-27 00:41:27,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-03-27 00:41:27,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:41:27,986 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-03-27 00:41:27,986 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:41:27,986 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-03-27 00:41:27,986 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:41:27,986 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:27,991 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-27 00:41:27,995 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:41:27,995 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-27 00:41:28,000 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-27 00:41:28,004 [ scc.git] DEBUG Already up to date.
2024-03-27 00:41:28,004 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-03-27 00:41:28,615 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-03-27 00:41:28,615 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-03-27 00:41:28,618 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-03-27 00:41:29,206 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-03-27 00:41:29,206 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-03-27 00:41:29,210 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:41:29,210 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:41:29,210 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:29,214 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-03-27 00:41:29,220 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:29,224 [ 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-03-27 00:41:29,245 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-03-27 00:41:29,246 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-03-27 00:41:29,246 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-03-27 00:41:29,246 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-03-27 00:41:29,246 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-27 00:41:29,246 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-27 00:41:29,250 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-27 00:41:29,256 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-03-27 00:41:29,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:41:29,403 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-03-27 00:41:29,409 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-27 00:41:29,413 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#12](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-03-27 00:41:29,417 [ scc.config] DEBUG Found github.token
2024-03-27 00:41:29,417 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-03-27 00:41:29,417 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-03-27 00:41:29,423 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:29,427 [ 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-03-27 00:41:29,444 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-03-27 00:41:29,444 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-03-27 00:41:29,444 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-03-27 00:41:29,444 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-27 00:41:29,444 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-27 00:41:29,449 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-27 00:41:29,455 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-03-27 00:41:29,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:41:29,800 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-03-27 00:41:29,805 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-03-27 00:41:29,810 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#12](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/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-03-27 00:41:29,813 [ scc.config] DEBUG Found github.token
2024-03-27 00:41:29,813 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-03-27 00:41:29,814 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:41:29,847 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:41:29,847 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:29,851 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:41:29,884 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:41:29,890 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2e8d33e80> has no local changes
2024-03-27 00:41:29,890 [ 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#12 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/)'
2024-03-27 00:41:29,898 [ scc.git] DEBUG [detached HEAD f5b1fd2] merge master -Dorg -Ssuccess-only
2024-03-27 00:41:29,898 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:41:29,898 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:41:30,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-03-27 00:41:30,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-03-27 00:41:30,804 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-27 00:41:31,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-03-27 00:41:31,851 [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-03-27 00:41:32,356 [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-03-27 00:41:32,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-03-27 00:41:33,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:41:33,267 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-03-27 00:41:33,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-03-27 00:41:33,710 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-27 00:41:34,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-03-27 00:41:34,744 [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-03-27 00:41:35,233 [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-03-27 00:41:35,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-03-27 00:41:36,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:41:36,089 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-03-27 00:41:36,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-03-27 00:41:36,542 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-27 00:41:37,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-03-27 00:41:37,523 [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-03-27 00:41:37,999 [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-03-27 00:41:38,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-03-27 00:41:38,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:41:38,942 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-03-27 00:41:39,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-03-27 00:41:39,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-03-27 00:41:40,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-03-27 00:41:40,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-03-27 00:41:41,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-03-27 00:41:41,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-03-27 00:41:41,764 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:41:41,764 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-03-27 00:41:41,764 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:41:41,764 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:41,769 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-27 00:41:41,773 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:41:41,774 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-27 00:41:41,778 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-27 00:41:41,783 [ scc.git] DEBUG Already up to date.
2024-03-27 00:41:41,783 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-03-27 00:41:42,167 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-27 00:41:42,168 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-03-27 00:41:42,171 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-03-27 00:41:42,696 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-27 00:41:42,696 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-03-27 00:41:42,699 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-03-27 00:41:43,091 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-03-27 00:41:43,091 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-03-27 00:41:43,094 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:41:43,095 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:41:43,095 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:43,099 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-03-27 00:41:43,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:43,107 [ 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-03-27 00:41:43,115 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:41:43,118 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-03-27 00:41:43,118 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-03-27 00:41:43,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:41:43,278 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-03-27 00:41:43,282 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:43,286 [ 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-03-27 00:41:43,350 [ scc.git] DEBUG Auto-merging package-lock.json
2024-03-27 00:41:43,351 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:41:43,353 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-03-27 00:41:43,353 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-03-27 00:41:43,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:41:43,680 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-03-27 00:41:43,684 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:43,688 [ 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-03-27 00:41:43,698 [ scc.git] DEBUG Auto-merging package-lock.json
2024-03-27 00:41:43,698 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:41:43,701 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-03-27 00:41:43,701 [ scc.git] DEBUG package.json | 2 +-
2024-03-27 00:41:43,701 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-03-27 00:41:44,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:41:44,077 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:41:44,111 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:41:44,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:44,115 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:41:44,148 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:41:44,153 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2e8436f10> has no local changes
2024-03-27 00:41:44,153 [ 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#12 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/)'
2024-03-27 00:41:44,160 [ scc.git] DEBUG [detached HEAD b4127fc] merge master -Dorg -Ssuccess-only
2024-03-27 00:41:44,160 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:41:44,160 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:41:44,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-03-27 00:41:45,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-03-27 00:41:45,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-03-27 00:41:45,945 [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-03-27 00:41:46,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-03-27 00:41:46,856 [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-03-27 00:41:46,857 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-03-27 00:41:46,857 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:41:46,857 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-03-27 00:41:46,857 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:41:46,857 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:46,861 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-27 00:41:46,865 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:41:46,866 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-27 00:41:46,870 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-27 00:41:46,874 [ scc.git] DEBUG Already up to date.
2024-03-27 00:41:46,875 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-03-27 00:41:47,272 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-03-27 00:41:47,273 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-03-27 00:41:47,275 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:41:47,275 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:41:47,276 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:47,280 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-03-27 00:41:47,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:47,288 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-03-27 00:41:47,295 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:41:47,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:41:47,453 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:41:47,486 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:41:47,486 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:47,490 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:41:47,524 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:41:47,528 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2e847f8b0> has no local changes
2024-03-27 00:41:47,528 [ 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#12 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/)'
2024-03-27 00:41:47,535 [ scc.git] DEBUG [detached HEAD 4e65d4c] merge master -Dorg -Ssuccess-only
2024-03-27 00:41:47,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:41:47,536 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:41:47,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-03-27 00:41:48,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-03-27 00:41:48,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-03-27 00:41:49,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-03-27 00:41:49,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-03-27 00:41:50,223 [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-03-27 00:41:50,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-03-27 00:41:51,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:41:51,125 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-03-27 00:41:51,125 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:41:51,125 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-03-27 00:41:51,125 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:41:51,125 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:51,129 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-27 00:41:51,134 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:41:51,134 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-27 00:41:51,138 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-27 00:41:51,142 [ scc.git] DEBUG Already up to date.
2024-03-27 00:41:51,143 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-03-27 00:41:51,630 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-03-27 00:41:51,630 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-03-27 00:41:51,633 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:41:51,634 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:41:51,634 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:51,638 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-03-27 00:41:51,643 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:51,646 [ 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-03-27 00:41:51,654 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-03-27 00:41:51,655 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:41:51,657 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-03-27 00:41:51,657 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-03-27 00:41:51,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:41:51,808 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:41:51,842 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:41:51,842 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:51,846 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:41:51,880 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:41:51,885 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2e8477550> has no local changes
2024-03-27 00:41:51,885 [ 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#12 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/)'
2024-03-27 00:41:51,892 [ scc.git] DEBUG [detached HEAD 1cb135f] merge master -Dorg -Ssuccess-only
2024-03-27 00:41:51,892 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:41:51,893 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:41:52,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-03-27 00:41:52,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-03-27 00:41:53,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-03-27 00:41:53,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-03-27 00:41:54,158 [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-03-27 00:41:54,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-03-27 00:41:55,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:41:55,092 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-03-27 00:41:55,092 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:41:55,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-03-27 00:41:55,092 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:41:55,092 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:55,097 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-27 00:41:55,101 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:41:55,101 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-27 00:41:55,105 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-27 00:41:55,110 [ scc.git] DEBUG Already up to date.
2024-03-27 00:41:55,110 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-03-27 00:41:55,715 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-03-27 00:41:55,715 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-03-27 00:41:55,718 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:41:55,718 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:41:55,718 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:55,722 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-27 00:41:55,727 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:55,731 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-27 00:41:55,817 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-03-27 00:41:55,817 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-03-27 00:41:55,817 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-03-27 00:41:55,817 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-03-27 00:41:55,817 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-03-27 00:41:55,817 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-03-27 00:41:55,817 [ scc.git] DEBUG Auto-merging setup.py
2024-03-27 00:41:55,817 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-03-27 00:41:55,817 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-27 00:41:55,817 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-27 00:41:55,821 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-03-27 00:41:55,827 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-03-27 00:41:55,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:41:55,987 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-03-27 00:41:55,992 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-03-27 00:41:55,996 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#12](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
- omero_signup/views.py
--conflicts
2024-03-27 00:41:56,000 [ scc.config] DEBUG Found github.token
2024-03-27 00:41:56,000 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-03-27 00:41:56,000 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:41:56,035 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:41:56,036 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:56,040 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:41:56,074 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:41:56,079 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2e847faf0> has no local changes
2024-03-27 00:41:56,079 [ 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#12 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/)'
2024-03-27 00:41:56,086 [ scc.git] DEBUG [detached HEAD a094a55] merge master -Dorg -Ssuccess-only
2024-03-27 00:41:56,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:41:56,086 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:41:56,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-03-27 00:41:56,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-03-27 00:41:57,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-03-27 00:41:57,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-03-27 00:41:58,309 [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-03-27 00:41:58,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-03-27 00:41:59,193 [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-03-27 00:41:59,193 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-03-27 00:41:59,193 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:41:59,193 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-03-27 00:41:59,193 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:41:59,194 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:59,198 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-27 00:41:59,202 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:41:59,202 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-27 00:41:59,206 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-27 00:41:59,211 [ scc.git] DEBUG Already up to date.
2024-03-27 00:41:59,211 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-03-27 00:41:59,860 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-03-27 00:41:59,861 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-03-27 00:41:59,864 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:41:59,864 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:41:59,864 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:59,868 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-03-27 00:41:59,874 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:41:59,878 [ 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-03-27 00:41:59,889 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:41:59,891 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-03-27 00:41:59,891 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-03-27 00:41:59,892 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-03-27 00:41:59,892 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-03-27 00:41:59,892 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-03-27 00:41:59,892 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-03-27 00:41:59,892 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-03-27 00:41:59,892 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-03-27 00:41:59,892 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-03-27 00:41:59,892 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-03-27 00:41:59,892 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-03-27 00:41:59,892 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-03-27 00:41:59,892 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-03-27 00:41:59,892 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-03-27 00:41:59,893 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-03-27 00:41:59,894 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-03-27 00:41:59,894 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-03-27 00:41:59,894 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-03-27 00:41:59,894 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-03-27 00:41:59,894 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-03-27 00:41:59,894 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-03-27 00:41:59,894 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-03-27 00:41:59,894 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-03-27 00:41:59,894 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-03-27 00:41:59,894 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-03-27 00:41:59,894 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-03-27 00:41:59,894 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-03-27 00:41:59,894 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-03-27 00:41:59,895 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-03-27 00:41:59,895 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-03-27 00:41:59,895 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-03-27 00:41:59,895 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-03-27 00:41:59,895 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-03-27 00:41:59,895 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-03-27 00:41:59,895 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-03-27 00:41:59,895 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-03-27 00:41:59,895 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-03-27 00:41:59,895 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-03-27 00:41:59,895 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-03-27 00:41:59,895 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-03-27 00:41:59,895 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-03-27 00:41:59,895 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-03-27 00:41:59,895 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-03-27 00:41:59,895 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-03-27 00:41:59,895 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-03-27 00:42:00,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:00,047 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:42:00,082 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:42:00,083 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:00,087 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:42:00,119 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:42:00,125 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2e8436370> has no local changes
2024-03-27 00:42:00,125 [ 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#12 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/)'
2024-03-27 00:42:00,132 [ scc.git] DEBUG [detached HEAD dc9def8] merge master -Dorg -Ssuccess-only
2024-03-27 00:42:00,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:00,132 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:42:00,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-03-27 00:42:00,453 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:42:00,453 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-03-27 00:42:00,453 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:42:00,453 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:00,457 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-27 00:42:00,461 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:42:00,461 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-27 00:42:00,465 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-27 00:42:00,470 [ scc.git] DEBUG Already up to date.
2024-03-27 00:42:00,470 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:42:00,470 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:42:00,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:00,474 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:42:00,507 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:42:00,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:00,511 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:42:00,544 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:42:00,549 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2e84b0fa0> has no local changes
2024-03-27 00:42:00,549 [ 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#12 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/)'
2024-03-27 00:42:00,556 [ scc.git] DEBUG [detached HEAD 47247be] merge master -Dorg -Ssuccess-only
2024-03-27 00:42:00,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:00,556 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:42:00,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-03-27 00:42:00,875 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:42:00,875 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-03-27 00:42:00,875 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:42:00,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:00,879 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-27 00:42:00,883 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:42:00,883 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-27 00:42:00,888 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-27 00:42:00,892 [ scc.git] DEBUG Already up to date.
2024-03-27 00:42:00,892 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:42:00,892 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:42:00,892 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:00,896 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:42:00,929 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:42:00,930 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:00,934 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:42:00,966 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:42:00,971 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2e8446fd0> has no local changes
2024-03-27 00:42:00,971 [ 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#12 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/)'
2024-03-27 00:42:00,978 [ scc.git] DEBUG [detached HEAD 91b048d] merge master -Dorg -Ssuccess-only
2024-03-27 00:42:00,978 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:00,978 [ scc.git] INFO Overriding base-branch from master to main
2024-03-27 00:42:00,978 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:42:01,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-03-27 00:42:01,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-03-27 00:42:02,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-03-27 00:42:02,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-03-27 00:42:03,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-03-27 00:42:03,689 [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-03-27 00:42:04,163 [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-03-27 00:42:04,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-03-27 00:42:05,068 [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-03-27 00:42:05,068 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-03-27 00:42:05,069 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:42:05,069 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-03-27 00:42:05,069 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:42:05,069 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:05,074 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-03-27 00:42:05,078 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:42:05,078 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-03-27 00:42:05,082 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-03-27 00:42:05,087 [ scc.git] DEBUG Already up to date.
2024-03-27 00:42:05,087 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-03-27 00:42:06,080 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-03-27 00:42:06,080 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-03-27 00:42:06,083 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:42:06,083 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:42:06,083 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:06,088 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-27 00:42:06,092 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:06,096 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-27 00:42:06,191 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-03-27 00:42:06,191 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-03-27 00:42:06,191 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-27 00:42:06,192 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-27 00:42:06,196 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-03-27 00:42:06,201 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-03-27 00:42:06,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:06,354 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-03-27 00:42:06,358 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-03-27 00:42:06,362 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#12](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-03-27 00:42:06,366 [ scc.config] DEBUG Found github.token
2024-03-27 00:42:06,366 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-03-27 00:42:06,367 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:42:06,400 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:42:06,400 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:06,404 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:42:06,438 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:42:06,443 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2e83c1fd0> has no local changes
2024-03-27 00:42:06,443 [ 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#12 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/)'
2024-03-27 00:42:06,450 [ scc.git] DEBUG [detached HEAD b31a447] merge master -Dorg -Ssuccess-only
2024-03-27 00:42:06,450 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:06,451 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:42:06,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-03-27 00:42:06,773 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:42:06,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-03-27 00:42:06,773 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:42:06,773 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:06,777 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-27 00:42:06,781 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:42:06,781 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-27 00:42:06,786 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-27 00:42:06,790 [ scc.git] DEBUG Already up to date.
2024-03-27 00:42:06,790 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:42:06,790 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:42:06,790 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:06,794 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:42:06,828 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:42:06,828 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:06,832 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:42:06,866 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:42:06,871 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2e8446f10> has no local changes
2024-03-27 00:42:06,871 [ 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#12 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/)'
2024-03-27 00:42:06,878 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:06,878 [ scc.git] DEBUG [detached HEAD 77a72b8] merge master -Dorg -Ssuccess-only
2024-03-27 00:42:06,878 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:42:07,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-03-27 00:42:07,191 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:42:07,191 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-03-27 00:42:07,191 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:42:07,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:07,195 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-27 00:42:07,199 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:42:07,199 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-27 00:42:07,204 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-27 00:42:07,208 [ scc.git] DEBUG Already up to date.
2024-03-27 00:42:07,208 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:42:07,208 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:42:07,208 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:07,212 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:42:07,246 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:42:07,246 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:07,250 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:42:07,282 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:42:07,287 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2e83d5520> has no local changes
2024-03-27 00:42:07,287 [ 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#12 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/)'
2024-03-27 00:42:07,294 [ scc.git] DEBUG [detached HEAD d605d0e] merge master -Dorg -Ssuccess-only
2024-03-27 00:42:07,294 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:07,295 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:42:07,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-03-27 00:42:08,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-03-27 00:42:08,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-03-27 00:42:09,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-03-27 00:42:09,518 [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-03-27 00:42:09,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-03-27 00:42:10,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:42:10,378 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-03-27 00:42:10,378 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:42:10,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-03-27 00:42:10,378 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:42:10,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:10,383 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-27 00:42:10,387 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:42:10,387 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-27 00:42:10,391 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-27 00:42:10,396 [ scc.git] DEBUG Already up to date.
2024-03-27 00:42:10,396 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-03-27 00:42:10,839 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-03-27 00:42:10,840 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-03-27 00:42:10,843 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:42:10,843 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:42:10,843 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:10,847 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-27 00:42:10,852 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:10,856 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-27 00:42:10,873 [ scc.git] DEBUG Auto-merging Dockerfile
2024-03-27 00:42:10,873 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-03-27 00:42:10,873 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-27 00:42:10,873 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-27 00:42:10,878 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-03-27 00:42:10,884 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-03-27 00:42:11,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:11,041 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-03-27 00:42:11,046 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-03-27 00:42:11,050 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#12](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-03-27 00:42:11,054 [ scc.config] DEBUG Found github.token
2024-03-27 00:42:11,054 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-03-27 00:42:11,054 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:42:11,088 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:42:11,088 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:11,092 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:42:11,126 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:42:11,132 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2e83f0df0> has no local changes
2024-03-27 00:42:11,132 [ 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#12 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/)'
2024-03-27 00:42:11,139 [ scc.git] DEBUG [detached HEAD e14b779] merge master -Dorg -Ssuccess-only
2024-03-27 00:42:11,139 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:11,140 [ scc.git] INFO Overriding base-branch from master to develop
2024-03-27 00:42:11,140 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:42:11,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-03-27 00:42:12,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-03-27 00:42:12,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-03-27 00:42:13,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-03-27 00:42:13,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-03-27 00:42:13,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-03-27 00:42:14,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-03-27 00:42:14,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-03-27 00:42:15,304 [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-03-27 00:42:15,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-03-27 00:42:16,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:42:16,180 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-03-27 00:42:16,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-03-27 00:42:17,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-03-27 00:42:17,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-03-27 00:42:18,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-03-27 00:42:18,037 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:42:18,037 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-03-27 00:42:18,037 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:42:18,037 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:18,042 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-03-27 00:42:18,046 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:42:18,046 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-03-27 00:42:18,051 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-03-27 00:42:18,055 [ scc.git] DEBUG Already up to date.
2024-03-27 00:42:18,055 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-03-27 00:42:18,453 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-03-27 00:42:18,453 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-03-27 00:42:18,456 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:42:18,456 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:42:18,456 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:18,460 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-03-27 00:42:18,466 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:18,470 [ 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-03-27 00:42:18,734 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-03-27 00:42:18,735 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-03-27 00:42:18,735 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-27 00:42:18,735 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-27 00:42:18,739 [ scc.git] DEBUG Calling 'git reset --hard 2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-03-27 00:42:18,744 [ scc.git] DEBUG HEAD is now at 2078ac7 Bump version: 5.8.0 → 5.8.1.dev0
2024-03-27 00:42:18,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:18,898 [ scc.git] DEBUG Calling 'git merge-base 2078ac72dbf11f2733e685000a274eff81c2ac2d 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-03-27 00:42:18,903 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-03-27 00:42:18,908 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#12](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-03-27 00:42:18,912 [ scc.config] DEBUG Found github.token
2024-03-27 00:42:18,912 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-03-27 00:42:18,912 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:42:18,945 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:42:18,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:42:18,950 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:42:18,984 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:42:18,990 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2e83e5b50> has no local changes
2024-03-27 00:42:18,990 [ 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#12 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/)'
2024-03-27 00:42:18,997 [ scc.git] DEBUG [detached HEAD 993f2c0] merge master -Dorg -Ssuccess-only
2024-03-27 00:42:18,997 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:18,997 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:42:19,063 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-03-27 00:42:19,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:19,298 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-03-27 00:42:19,302 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-03-27 00:42:19,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:19,694 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-03-27 00:42:19,698 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-03-27 00:42:20,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:20,091 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-03-27 00:42:20,095 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-03-27 00:42:20,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:20,512 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-03-27 00:42:20,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:20,916 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-03-27 00:42:20,920 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-03-27 00:42:21,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:21,313 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-03-27 00:42:21,317 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-03-27 00:42:21,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:21,712 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-03-27 00:42:21,716 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-03-27 00:42:22,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:22,116 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-03-27 00:42:22,120 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-03-27 00:42:22,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:22,510 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-03-27 00:42:22,514 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-03-27 00:42:22,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:22,914 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-03-27 00:42:22,918 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-03-27 00:42:23,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:23,322 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-03-27 00:42:23,326 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-03-27 00:42:23,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:23,723 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-03-27 00:42:23,727 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-03-27 00:42:24,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:24,128 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-03-27 00:42:24,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:24,533 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-03-27 00:42:24,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:24,936 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-03-27 00:42:24,939 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-03-27 00:42:25,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:25,340 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-03-27 00:42:25,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:25,754 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-03-27 00:42:26,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:26,151 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-03-27 00:42:26,154 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-03-27 00:42:26,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:26,544 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-03-27 00:42:26,547 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-03-27 00:42:26,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:26,950 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-03-27 00:42:26,954 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-03-27 00:42:27,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:27,339 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-03-27 00:42:27,343 [ scc.config] DEBUG Found submodule.scripts.url
2024-03-27 00:42:27,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:42:27,742 [ scc.config] DEBUG Found submodule.scripts.branch
2024-03-27 00:42:27,742 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:42:27,816 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb2e9e29b20> has local changes
2024-03-27 00:42:27,816 [ 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 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
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 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
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#12 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/12/)'
2024-03-27 00:42:27,829 [ scc.git] DEBUG [detached HEAD adfb351] merge master -Dorg -Ssuccess-only
2024-03-27 00:42:27,829 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-03-27 00:42:27,829 [ scc.merge] INFO Repository: ome/omero-plugins
2024-03-27 00:42:27,829 [ scc.merge] INFO Already up to date.
2024-03-27 00:42:27,829 [ scc.merge] INFO
2024-03-27 00:42:27,829 [ scc.merge] INFO
2024-03-27 00:42:27,829 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-03-27 00:42:27,829 [ scc.merge] INFO Already up to date.
2024-03-27 00:42:27,829 [ scc.merge] INFO
2024-03-27 00:42:27,829 [ scc.merge] INFO
2024-03-27 00:42:27,829 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-03-27 00:42:27,829 [ scc.merge] INFO Excluded PRs:
2024-03-27 00:42:27,829 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-03-27 00:42:27,829 [ scc.merge] INFO Already up to date.
2024-03-27 00:42:27,829 [ scc.merge] INFO
2024-03-27 00:42:27,829 [ scc.merge] INFO Merged PRs:
2024-03-27 00:42:27,829 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-03-27 00:42:27,829 [ scc.merge] INFO
2024-03-27 00:42:27,829 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-03-27 00:42:27,829 [ scc.merge] INFO Excluded PRs:
2024-03-27 00:42:27,829 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-03-27 00:42:27,830 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-03-27 00:42:27,830 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-03-27 00:42:27,830 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-03-27 00:42:27,830 [ scc.merge] INFO Already up to date.
2024-03-27 00:42:27,830 [ scc.merge] INFO
2024-03-27 00:42:27,830 [ scc.merge] INFO Merged PRs:
2024-03-27 00:42:27,830 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-03-27 00:42:27,830 [ scc.merge] INFO
2024-03-27 00:42:27,830 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-03-27 00:42:27,830 [ scc.merge] INFO Excluded PRs:
2024-03-27 00:42:27,830 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-03-27 00:42:27,830 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-03-27 00:42:27,830 [ scc.merge] INFO Already up to date.
2024-03-27 00:42:27,830 [ scc.merge] INFO
2024-03-27 00:42:27,830 [ scc.merge] INFO Merged PRs:
2024-03-27 00:42:27,830 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-03-27 00:42:27,830 [ scc.merge] INFO
2024-03-27 00:42:27,830 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-27 00:42:27,830 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-03-27 00:42:27,830 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-03-27 00:42:27,830 [ scc.merge] INFO
2024-03-27 00:42:27,830 [ scc.merge] INFO Repository: ome/omero-figure
2024-03-27 00:42:27,830 [ scc.merge] INFO Excluded PRs:
2024-03-27 00:42:27,830 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-03-27 00:42:27,830 [ scc.merge] INFO Already up to date.
2024-03-27 00:42:27,830 [ scc.merge] INFO
2024-03-27 00:42:27,830 [ scc.merge] INFO Merged PRs:
2024-03-27 00:42:27,830 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-03-27 00:42:27,830 [ scc.merge] INFO - PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
2024-03-27 00:42:27,830 [ scc.merge] INFO
2024-03-27 00:42:27,830 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-03-27 00:42:27,830 [ scc.merge] INFO Already up to date.
2024-03-27 00:42:27,830 [ scc.merge] INFO
2024-03-27 00:42:27,830 [ scc.merge] INFO Merged PRs:
2024-03-27 00:42:27,830 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-03-27 00:42:27,830 [ scc.merge] INFO
2024-03-27 00:42:27,831 [ scc.merge] INFO Repository: ome/omero-gallery
2024-03-27 00:42:27,831 [ scc.merge] INFO Already up to date.
2024-03-27 00:42:27,831 [ scc.merge] INFO
2024-03-27 00:42:27,831 [ scc.merge] INFO Merged PRs:
2024-03-27 00:42:27,831 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-03-27 00:42:27,831 [ scc.merge] INFO
2024-03-27 00:42:27,831 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-03-27 00:42:27,831 [ scc.merge] INFO Excluded PRs:
2024-03-27 00:42:27,831 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-03-27 00:42:27,831 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-03-27 00:42:27,831 [ scc.merge] INFO Already up to date.
2024-03-27 00:42:27,831 [ scc.merge] INFO
2024-03-27 00:42:27,831 [ scc.merge] INFO Merged PRs:
2024-03-27 00:42:27,831 [ scc.merge] INFO - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-03-27 00:42:27,831 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-03-27 00:42:27,831 [ scc.merge] INFO - PR 464 will-moore 'Tile load error warning'
2024-03-27 00:42:27,831 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-03-27 00:42:27,831 [ scc.merge] INFO - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-03-27 00:42:27,831 [ scc.merge] INFO
2024-03-27 00:42:27,831 [ scc.merge] INFO Repository: ome/omero-mapr
2024-03-27 00:42:27,831 [ scc.merge] INFO Excluded PRs:
2024-03-27 00:42:27,831 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-03-27 00:42:27,831 [ scc.merge] INFO Already up to date.
2024-03-27 00:42:27,831 [ scc.merge] INFO
2024-03-27 00:42:27,831 [ scc.merge] INFO Merged PRs:
2024-03-27 00:42:27,831 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-03-27 00:42:27,831 [ scc.merge] INFO
2024-03-27 00:42:27,831 [ scc.merge] INFO Repository: ome/omero-metadata
2024-03-27 00:42:27,831 [ scc.merge] INFO Already up to date.
2024-03-27 00:42:27,831 [ scc.merge] INFO
2024-03-27 00:42:27,831 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-27 00:42:27,831 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-03-27 00:42:27,831 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-03-27 00:42:27,831 [ scc.merge] INFO
2024-03-27 00:42:27,831 [ scc.merge] INFO Repository: ome/omero-parade
2024-03-27 00:42:27,831 [ scc.merge] INFO Excluded PRs:
2024-03-27 00:42:27,831 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-03-27 00:42:27,832 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-03-27 00:42:27,832 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-03-27 00:42:27,832 [ scc.merge] INFO Already up to date.
2024-03-27 00:42:27,832 [ scc.merge] INFO
2024-03-27 00:42:27,832 [ scc.merge] INFO Merged PRs:
2024-03-27 00:42:27,832 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-03-27 00:42:27,832 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-03-27 00:42:27,832 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-03-27 00:42:27,832 [ scc.merge] INFO
2024-03-27 00:42:27,832 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-03-27 00:42:27,832 [ scc.merge] INFO Already up to date.
2024-03-27 00:42:27,832 [ scc.merge] INFO
2024-03-27 00:42:27,832 [ scc.merge] INFO Merged PRs:
2024-03-27 00:42:27,832 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-03-27 00:42:27,832 [ scc.merge] INFO
2024-03-27 00:42:27,832 [ scc.merge] INFO Repository: ome/omero-rois
2024-03-27 00:42:27,832 [ scc.merge] INFO Excluded PRs:
2024-03-27 00:42:27,832 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-03-27 00:42:27,832 [ scc.merge] INFO Already up to date.
2024-03-27 00:42:27,832 [ scc.merge] INFO
2024-03-27 00:42:27,832 [ scc.merge] INFO Merged PRs:
2024-03-27 00:42:27,832 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-03-27 00:42:27,832 [ scc.merge] INFO
2024-03-27 00:42:27,832 [ scc.merge] INFO Repository: ome/omero-signup
2024-03-27 00:42:27,832 [ scc.merge] INFO Already up to date.
2024-03-27 00:42:27,832 [ scc.merge] INFO
2024-03-27 00:42:27,832 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-27 00:42:27,832 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-03-27 00:42:27,832 [ scc.merge] INFO
2024-03-27 00:42:27,832 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-03-27 00:42:27,832 [ scc.merge] INFO Already up to date.
2024-03-27 00:42:27,832 [ scc.merge] INFO
2024-03-27 00:42:27,832 [ scc.merge] INFO Merged PRs:
2024-03-27 00:42:27,832 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-03-27 00:42:27,832 [ scc.merge] INFO
2024-03-27 00:42:27,832 [ scc.merge] INFO Repository: ome/omero-upload
2024-03-27 00:42:27,832 [ scc.merge] INFO Already up to date.
2024-03-27 00:42:27,832 [ scc.merge] INFO
2024-03-27 00:42:27,833 [ scc.merge] INFO
2024-03-27 00:42:27,833 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-03-27 00:42:27,833 [ scc.merge] INFO Already up to date.
2024-03-27 00:42:27,833 [ scc.merge] INFO
2024-03-27 00:42:27,833 [ scc.merge] INFO
2024-03-27 00:42:27,833 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-03-27 00:42:27,833 [ scc.merge] INFO Excluded PRs:
2024-03-27 00:42:27,833 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-03-27 00:42:27,833 [ scc.merge] INFO Already up to date.
2024-03-27 00:42:27,833 [ scc.merge] INFO
2024-03-27 00:42:27,833 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-27 00:42:27,833 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-03-27 00:42:27,833 [ scc.merge] INFO
2024-03-27 00:42:27,833 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-03-27 00:42:27,833 [ scc.merge] INFO Already up to date.
2024-03-27 00:42:27,833 [ scc.merge] INFO
2024-03-27 00:42:27,833 [ scc.merge] INFO
2024-03-27 00:42:27,833 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-03-27 00:42:27,833 [ scc.merge] INFO Already up to date.
2024-03-27 00:42:27,833 [ scc.merge] INFO
2024-03-27 00:42:27,833 [ scc.merge] INFO
2024-03-27 00:42:27,833 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-03-27 00:42:27,833 [ scc.merge] INFO Already up to date.
2024-03-27 00:42:27,833 [ scc.merge] INFO
2024-03-27 00:42:27,833 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-27 00:42:27,833 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-03-27 00:42:27,833 [ scc.merge] INFO
2024-03-27 00:42:27,833 [ scc.merge] INFO Repository: ome/scripts
2024-03-27 00:42:27,833 [ scc.merge] INFO Excluded PRs:
2024-03-27 00:42:27,833 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-03-27 00:42:27,833 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-03-27 00:42:27,833 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-03-27 00:42:27,833 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-03-27 00:42:27,833 [ scc.merge] INFO Already up to date.
2024-03-27 00:42:27,833 [ scc.merge] INFO
2024-03-27 00:42:27,833 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-27 00:42:27,833 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-03-27 00:42:27,834 [ scc.merge] INFO
2024-03-27 00:42:27,834 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-03-27 00:42:27,834 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:42:27,838 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-03-27 00:42:27,838 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:42:27,842 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:27,842 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-03-27 00:42:27,842 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:42:27,846 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:27,846 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-03-27 00:42:27,846 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:42:27,850 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:27,851 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-03-27 00:42:27,851 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:42:27,855 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:27,855 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-03-27 00:42:27,855 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:42:27,859 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:27,859 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-03-27 00:42:27,859 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:42:27,863 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:27,863 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-03-27 00:42:27,863 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:42:27,867 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:27,867 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-03-27 00:42:27,867 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:42:27,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:27,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-03-27 00:42:27,872 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:42:27,875 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:27,876 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-03-27 00:42:27,876 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:42:27,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:27,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-03-27 00:42:27,880 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:42:27,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:27,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-03-27 00:42:27,884 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:42:27,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:27,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-03-27 00:42:27,888 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:42:27,892 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:27,892 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-03-27 00:42:27,893 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:42:27,896 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:27,897 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-03-27 00:42:27,897 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:42:27,900 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:27,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-03-27 00:42:27,901 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:42:27,905 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:27,905 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-03-27 00:42:27,905 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:42:27,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:27,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-03-27 00:42:27,909 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:42:27,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:27,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-03-27 00:42:27,913 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:42:27,917 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:27,917 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-03-27 00:42:27,917 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:42:27,921 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:27,921 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-03-27 00:42:27,921 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:42:27,925 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-03-27 00:42:27,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-03-27 00:42:27,926 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:42:27,930 [ 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 5cdff93] 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 3b7ccfa8
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 a232ed0
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 8d1cd36] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-03-27 00:43:12,103 [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-03-27 00:43:20,848 [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-03-27 00:43:23,180 [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-03-27 00:43:27,749 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-03-27 00:44:15,093 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/4be69ed6/images/svgs/logo.svg){kind=logo}
