Skipping 124 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/js/bootstrap.js
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-3.0.0/js/bootstrap.min.js
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.css
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.js
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-1.11.1/jquery.min.js
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.base.css
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.slider.css
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/jquery-ui.min.js
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/json2.js
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.js
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.min.js
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/mousetrap-1.5.3/mousetrap.min.js
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael-min.js
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael.js
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/scaleraphael.js
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/underscore-1.13.1-umd-min.js
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100644 omero_figure/templates/figure/index.html
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100644 spec/ViewportViewSpec.js
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100644 spec/images/testImage.png
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100644 spec/javascripts/PanelSpec.js
2024-04-15 00:45:52,747 [ scc.git] DEBUG delete mode 100644 spec/javascripts/ViewportViewSpec.js
2024-04-15 00:45:52,748 [ scc.git] DEBUG delete mode 100644 spec/javascripts/fixtures/previewTab.html
2024-04-15 00:45:52,748 [ scc.git] DEBUG create mode 100644 src/.env
2024-04-15 00:45:52,748 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/css/figure.css (70%)
2024-04-15 00:45:52,748 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/arrow-icon-16.png (100%)
2024-04-15 00:45:52,748 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-04-15 00:45:52,748 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-04-15 00:45:52,748 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-04-15 00:45:52,748 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-04-15 00:45:52,748 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-04-15 00:45:52,748 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-04-15 00:45:52,748 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-04-15 00:45:52,748 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-04-15 00:45:52,748 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-04-15 00:45:52,748 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-15 00:45:52,748 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-04-15 00:45:52,748 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-04-15 00:45:52,748 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-04-15 00:45:52,748 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-04-15 00:45:52,748 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-04-15 00:45:52,748 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-04-15 00:45:52,748 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-04-15 00:45:52,748 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-04-15 00:45:52,748 [ scc.git] DEBUG create mode 100644 src/index.html
2024-04-15 00:45:52,748 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-04-15 00:45:52,748 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-04-15 00:45:52,748 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-04-15 00:45:52,748 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-04-15 00:45:52,748 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-04-15 00:45:52,748 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-04-15 00:45:52,748 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-04-15 00:45:52,748 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-04-15 00:45:52,748 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-04-15 00:45:52,748 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-15 00:45:52,748 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-04-15 00:45:52,749 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-04-15 00:45:52,749 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-04-15 00:45:52,749 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-04-15 00:45:52,749 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-04-15 00:45:52,749 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-04-15 00:45:52,749 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-04-15 00:45:52,749 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-04-15 00:45:52,749 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-04-15 00:45:52,749 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-04-15 00:45:52,749 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-04-15 00:45:52,749 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-04-15 00:45:52,749 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-04-15 00:45:52,749 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-04-15 00:45:52,749 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-04-15 00:45:52,749 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-04-15 00:45:52,749 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-04-15 00:45:52,749 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-04-15 00:45:52,749 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-04-15 00:45:52,749 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-04-15 00:45:52,749 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-04-15 00:45:52,749 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-04-15 00:45:52,749 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-04-15 00:45:52,749 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-04-15 00:45:52,749 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-04-15 00:45:52,749 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-04-15 00:45:52,749 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-04-15 00:45:52,749 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-04-15 00:45:52,749 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-04-15 00:45:52,749 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-04-15 00:45:52,749 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-04-15 00:45:52,749 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-04-15 00:45:52,749 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-04-15 00:45:52,749 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-04-15 00:45:52,749 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-04-15 00:45:52,749 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-04-15 00:45:52,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:45:52,899 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 00:45:52,946 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:45:52,947 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:45:52,953 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 00:45:53,006 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 00:45:53,023 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f462d0b4be0> has no local changes
2024-04-15 00:45:53,024 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 549 will-moore 'Inset feature' (stage: draft)
- PR 543 will-moore 'Plate well labels' (stage: draft)
Updating 852b5109..ded0caab
Previously merged:
- PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
- PR 550 will-moore 'Don't update zoom to undefined on setId'
Merged PRs:
- PR 477 will-moore 'Vite'
Generated by OMERO-plugins-push#32 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/)'
2024-04-15 00:45:53,035 [ scc.git] DEBUG [detached HEAD 101cf11e] merge master -Dorg -Ssuccess-only
2024-04-15 00:45:53,036 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:45:53,036 [ scc.repo] DEBUG ## PRs found:
2024-04-15 00:45:53,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-04-15 00:45:53,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-04-15 00:45:54,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-04-15 00:45:54,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-15 00:45:55,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-15 00:45:55,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-15 00:45:56,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-04-15 00:45:56,187 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-04-15 00:45:56,187 [ scc.repo] DEBUG ## Branches found:
2024-04-15 00:45:56,187 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-15 00:45:56,187 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:45:56,187 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:45:56,194 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 00:45:56,206 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 00:45:56,206 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 00:45:56,215 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 00:45:56,225 [ scc.git] DEBUG Already up to date.
2024-04-15 00:45:56,225 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-04-15 00:45:56,640 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-04-15 00:45:56,640 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-04-15 00:45:56,649 [ scc.git] DEBUG ## Unique users: []
2024-04-15 00:45:56,649 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:45:56,649 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:45:56,657 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-15 00:45:56,665 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:45:56,673 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-15 00:45:56,711 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-04-15 00:45:56,711 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 00:45:56,714 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-04-15 00:45:56,715 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-15 00:45:56,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:45:56,885 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 00:45:56,930 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:45:56,930 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:45:56,937 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 00:45:57,001 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 00:45:57,008 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f462d06b550> has no local changes
2024-04-15 00:45:57,009 [ 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#32 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/)'
2024-04-15 00:45:57,021 [ scc.git] DEBUG [detached HEAD af036e8] merge master -Dorg -Ssuccess-only
2024-04-15 00:45:57,021 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:45:57,022 [ scc.repo] DEBUG ## PRs found:
2024-04-15 00:45:57,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-04-15 00:45:57,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-04-15 00:45:57,825 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-15 00:45:58,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-15 00:45:58,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-15 00:45:59,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-15 00:45:59,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-15 00:46:00,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-04-15 00:46:00,298 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-15 00:46:00,298 [ scc.repo] DEBUG ## Branches found:
2024-04-15 00:46:00,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-15 00:46:00,298 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:46:00,298 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:00,307 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 00:46:00,315 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 00:46:00,316 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 00:46:00,324 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 00:46:00,333 [ scc.git] DEBUG Already up to date.
2024-04-15 00:46:00,333 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-04-15 00:46:00,772 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-04-15 00:46:00,773 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-04-15 00:46:00,779 [ scc.git] DEBUG ## Unique users: []
2024-04-15 00:46:00,779 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:46:00,779 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:00,785 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-15 00:46:00,791 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:00,798 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-15 00:46:00,810 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 00:46:00,814 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-04-15 00:46:00,814 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-04-15 00:46:00,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:46:00,987 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 00:46:01,043 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:46:01,043 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:01,049 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 00:46:01,094 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 00:46:01,103 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f462d07a9d0> has no local changes
2024-04-15 00:46:01,104 [ 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#32 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/)'
2024-04-15 00:46:01,114 [ scc.git] DEBUG [detached HEAD e43069e] merge master -Dorg -Ssuccess-only
2024-04-15 00:46:01,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:46:01,115 [ scc.repo] DEBUG ## PRs found:
2024-04-15 00:46:01,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-04-15 00:46:01,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-04-15 00:46:02,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-15 00:46:02,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-15 00:46:03,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-15 00:46:03,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-15 00:46:04,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/ca8b5aabef9a5358f93add750f4cbb51c864b7fe?per_page=1 HTTP/1.1" 200 2
2024-04-15 00:46:04,407 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-04-15 00:46:04,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-04-15 00:46:05,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-04-15 00:46:05,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/efda99710532f9743896717e88f0e68ca23ec3b2 HTTP/1.1" 200 None
2024-04-15 00:46:06,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/efda99710532f9743896717e88f0e68ca23ec3b2/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-15 00:46:06,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/efda99710532f9743896717e88f0e68ca23ec3b2/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-15 00:46:07,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/efda99710532f9743896717e88f0e68ca23ec3b2 HTTP/1.1" 200 None
2024-04-15 00:46:07,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/efda99710532f9743896717e88f0e68ca23ec3b2?per_page=1 HTTP/1.1" 200 2
2024-04-15 00:46:07,688 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-04-15 00:46:08,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464 HTTP/1.1" 200 None
2024-04-15 00:46:08,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464/comments HTTP/1.1" 200 None
2024-04-15 00:46:09,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-04-15 00:46:09,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-15 00:46:10,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-15 00:46:10,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-04-15 00:46:10,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/97542d9b749f93d4902f7dce703bbf2a04316a98?per_page=1 HTTP/1.1" 200 2
2024-04-15 00:46:10,917 [ scc.repo] DEBUG - PR 464 will-moore 'Tile load error warning'
2024-04-15 00:46:11,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-04-15 00:46:11,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-04-15 00:46:12,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-15 00:46:12,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-15 00:46:13,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-15 00:46:13,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-04-15 00:46:13,688 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-04-15 00:46:14,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456 HTTP/1.1" 200 None
2024-04-15 00:46:14,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456/comments HTTP/1.1" 200 None
2024-04-15 00:46:15,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-04-15 00:46:15,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-15 00:46:16,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-15 00:46:16,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-04-15 00:46:16,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745?per_page=1 HTTP/1.1" 200 2
2024-04-15 00:46:16,947 [ scc.repo] DEBUG - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-04-15 00:46:16,947 [ scc.repo] DEBUG ## Branches found:
2024-04-15 00:46:16,947 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-15 00:46:16,947 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:46:16,947 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:16,953 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 00:46:16,958 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 00:46:16,959 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 00:46:16,965 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 00:46:16,970 [ scc.git] DEBUG Already up to date.
2024-04-15 00:46:16,971 [ scc.git] DEBUG Calling 'git fetch origin pull/456/head'
2024-04-15 00:46:17,484 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-15 00:46:17,484 [ scc.git] DEBUG * branch refs/pull/456/head -> FETCH_HEAD
2024-04-15 00:46:17,489 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-04-15 00:46:17,904 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-15 00:46:17,904 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-04-15 00:46:17,910 [ scc.git] DEBUG Calling 'git fetch origin pull/464/head'
2024-04-15 00:46:18,408 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-15 00:46:18,409 [ scc.git] DEBUG * branch refs/pull/464/head -> FETCH_HEAD
2024-04-15 00:46:18,415 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-04-15 00:46:19,248 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-15 00:46:19,248 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-04-15 00:46:19,255 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-04-15 00:46:19,678 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-15 00:46:19,678 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-04-15 00:46:19,683 [ scc.git] DEBUG ## Unique users: []
2024-04-15 00:46:19,684 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:46:19,684 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:19,691 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-04-15 00:46:19,700 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:19,706 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 456 (Don't use tiles for non-big movies) 2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-04-15 00:46:19,733 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 00:46:19,736 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 5 +++--
2024-04-15 00:46:19,736 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-04-15 00:46:19,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:46:19,903 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-15 00:46:19,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:19,917 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-15 00:46:19,941 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 00:46:19,946 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-04-15 00:46:19,946 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-04-15 00:46:19,946 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-04-15 00:46:20,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:46:20,323 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-04-15 00:46:20,330 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:20,336 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 464 (Tile load error warning) 97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-04-15 00:46:20,394 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 00:46:20,399 [ scc.git] DEBUG css/app.css | 22 ++++++++++++++++++++++
2024-04-15 00:46:20,399 [ scc.git] DEBUG src/events/events.js | 2 ++
2024-04-15 00:46:20,399 [ scc.git] DEBUG src/index-dev.html | 6 +++---
2024-04-15 00:46:20,399 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 2 +-
2024-04-15 00:46:20,399 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 4 +++-
2024-04-15 00:46:20,399 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 39 +++++++++++++++++++++++++++++++++++++--
2024-04-15 00:46:20,399 [ scc.git] DEBUG 6 files changed, 68 insertions(+), 7 deletions(-)
2024-04-15 00:46:20,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:46:20,741 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...efda99710532f9743896717e88f0e68ca23ec3b2'
2024-04-15 00:46:20,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:20,755 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) efda99710532f9743896717e88f0e68ca23ec3b2'
2024-04-15 00:46:20,842 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-04-15 00:46:20,843 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 00:46:20,849 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-04-15 00:46:20,849 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-04-15 00:46:20,849 [ scc.git] DEBUG src/app/header.html | 5 +
2024-04-15 00:46:20,849 [ scc.git] DEBUG src/app/header.js | 46 ++++++++-
2024-04-15 00:46:20,849 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-04-15 00:46:20,849 [ scc.git] DEBUG src/utils/figure.js | 210 ++++++++++++++++++++++++++++++++++++++++++
2024-04-15 00:46:20,849 [ scc.git] DEBUG 6 files changed, 284 insertions(+), 6 deletions(-)
2024-04-15 00:46:20,849 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-04-15 00:46:21,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:46:21,144 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-15 00:46:21,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:21,159 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-15 00:46:21,184 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 00:46:21,187 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-04-15 00:46:21,187 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-04-15 00:46:21,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:46:21,554 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 00:46:21,597 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:46:21,598 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:21,604 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 00:46:21,645 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 00:46:21,653 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f462d0535b0> has no local changes
2024-04-15 00:46:21,653 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 456 will-moore 'Don't use tiles for non-big movies'
- PR 460 will-moore 'Channel min spinner fix'
- PR 464 will-moore 'Tile load error warning'
- PR 465 will-moore 'Save as Figure'
- PR 469 will-moore 'changelog 0.14.0'
Generated by OMERO-plugins-push#32 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/)'
2024-04-15 00:46:21,662 [ scc.git] DEBUG [detached HEAD 4b6557e] merge master -Dorg -Ssuccess-only
2024-04-15 00:46:21,662 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:46:21,663 [ scc.repo] DEBUG ## PRs found:
2024-04-15 00:46:22,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-04-15 00:46:22,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-04-15 00:46:22,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-04-15 00:46:23,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-15 00:46:23,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-15 00:46:24,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-15 00:46:24,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-15 00:46:25,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-04-15 00:46:25,380 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-04-15 00:46:25,380 [ scc.repo] DEBUG ## Branches found:
2024-04-15 00:46:25,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-15 00:46:25,381 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:46:25,381 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:25,388 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 00:46:25,397 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 00:46:25,397 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 00:46:25,403 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 00:46:25,410 [ scc.git] DEBUG Already up to date.
2024-04-15 00:46:25,410 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-04-15 00:46:25,771 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-04-15 00:46:25,771 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-04-15 00:46:25,776 [ scc.git] DEBUG ## Unique users: []
2024-04-15 00:46:25,777 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:46:25,777 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:25,782 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-15 00:46:25,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:25,793 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-15 00:46:25,805 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 00:46:25,808 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-04-15 00:46:25,808 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-04-15 00:46:25,808 [ scc.git] DEBUG requirements.txt | 2 +-
2024-04-15 00:46:25,808 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-04-15 00:46:25,808 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-04-15 00:46:25,808 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-04-15 00:46:26,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:46:26,003 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 00:46:26,047 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:46:26,048 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:26,054 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 00:46:26,097 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 00:46:26,104 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f462d0664f0> has no local changes
2024-04-15 00:46:26,104 [ 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#32 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/)'
2024-04-15 00:46:26,113 [ scc.git] DEBUG [detached HEAD fb0b153] merge master -Dorg -Ssuccess-only
2024-04-15 00:46:26,114 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:46:26,114 [ scc.repo] DEBUG ## PRs found:
2024-04-15 00:46:26,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-04-15 00:46:26,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-04-15 00:46:27,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-04-15 00:46:28,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-15 00:46:28,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-15 00:46:28,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-15 00:46:29,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-04-15 00:46:29,318 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-15 00:46:29,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-04-15 00:46:30,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-04-15 00:46:30,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-15 00:46:31,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-15 00:46:31,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-15 00:46:32,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-04-15 00:46:32,060 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-15 00:46:32,060 [ scc.repo] DEBUG ## Branches found:
2024-04-15 00:46:32,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-15 00:46:32,061 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:46:32,061 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:32,067 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 00:46:32,072 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 00:46:32,073 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 00:46:32,079 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 00:46:32,085 [ scc.git] DEBUG Already up to date.
2024-04-15 00:46:32,086 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-04-15 00:46:32,662 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-15 00:46:32,662 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-04-15 00:46:32,668 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-04-15 00:46:33,261 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-15 00:46:33,261 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-04-15 00:46:33,266 [ scc.git] DEBUG ## Unique users: []
2024-04-15 00:46:33,266 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:46:33,266 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:33,272 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-15 00:46:33,278 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:33,283 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-15 00:46:33,347 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-04-15 00:46:33,348 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-04-15 00:46:33,348 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-15 00:46:33,348 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-15 00:46:33,348 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-15 00:46:33,349 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-15 00:46:33,354 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-15 00:46:33,360 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-15 00:46:33,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:46:33,527 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-15 00:46:33,535 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-15 00:46:33,541 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#32](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-04-15 00:46:33,548 [ scc.config] DEBUG Found github.token
2024-04-15 00:46:33,548 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-04-15 00:46:33,548 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-15 00:46:33,555 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:33,560 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-15 00:46:33,590 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-15 00:46:33,591 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-15 00:46:33,591 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-04-15 00:46:33,591 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-15 00:46:33,591 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-15 00:46:33,598 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-15 00:46:33,606 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-15 00:46:33,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:46:33,944 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-15 00:46:33,951 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-15 00:46:33,957 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#32](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2024-04-15 00:46:33,962 [ scc.config] DEBUG Found github.token
2024-04-15 00:46:33,963 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-04-15 00:46:33,963 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 00:46:34,000 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:46:34,001 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:34,006 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 00:46:34,044 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 00:46:34,051 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f462d053550> has no local changes
2024-04-15 00:46:34,051 [ 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#32 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/)'
2024-04-15 00:46:34,059 [ scc.git] DEBUG [detached HEAD 91f1f9d] merge master -Dorg -Ssuccess-only
2024-04-15 00:46:34,059 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:46:34,060 [ scc.repo] DEBUG ## PRs found:
2024-04-15 00:46:34,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-04-15 00:46:34,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-04-15 00:46:34,980 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-15 00:46:35,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-15 00:46:36,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-15 00:46:36,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-15 00:46:36,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-15 00:46:37,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-04-15 00:46:37,377 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-15 00:46:37,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-04-15 00:46:37,838 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-15 00:46:38,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-15 00:46:38,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-15 00:46:39,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-15 00:46:39,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-15 00:46:40,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-04-15 00:46:40,383 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-15 00:46:40,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-04-15 00:46:40,846 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-15 00:46:41,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-15 00:46:41,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-15 00:46:42,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-15 00:46:42,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-15 00:46:43,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-04-15 00:46:43,338 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-15 00:46:43,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-04-15 00:46:44,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-04-15 00:46:44,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-04-15 00:46:45,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-04-15 00:46:45,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-04-15 00:46:46,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-04-15 00:46:46,228 [ scc.repo] DEBUG ## Branches found:
2024-04-15 00:46:46,228 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-15 00:46:46,228 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:46:46,229 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:46,234 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 00:46:46,239 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 00:46:46,239 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 00:46:46,244 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 00:46:46,251 [ scc.git] DEBUG Already up to date.
2024-04-15 00:46:46,251 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-04-15 00:46:46,633 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-15 00:46:46,633 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-04-15 00:46:46,638 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-04-15 00:46:47,019 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-15 00:46:47,020 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-04-15 00:46:47,025 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-15 00:46:47,388 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-15 00:46:47,388 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-15 00:46:47,393 [ scc.git] DEBUG ## Unique users: []
2024-04-15 00:46:47,393 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:46:47,393 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:47,398 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-15 00:46:47,403 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:47,408 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-15 00:46:47,417 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 00:46:47,419 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-04-15 00:46:47,419 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-04-15 00:46:47,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:46:47,581 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-15 00:46:47,588 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:47,595 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-15 00:46:47,667 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-15 00:46:47,668 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 00:46:47,671 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-04-15 00:46:47,671 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-04-15 00:46:47,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:46:47,977 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-15 00:46:47,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:47,988 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-15 00:46:48,013 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-15 00:46:48,014 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 00:46:48,017 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-04-15 00:46:48,017 [ scc.git] DEBUG package.json | 2 +-
2024-04-15 00:46:48,017 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-04-15 00:46:48,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:46:48,387 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 00:46:48,428 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:46:48,428 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:48,433 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 00:46:48,477 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 00:46:48,485 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f462d054fd0> has no local changes
2024-04-15 00:46:48,485 [ 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#32 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/)'
2024-04-15 00:46:48,510 [ scc.git] DEBUG [detached HEAD 7d9ad93] merge master -Dorg -Ssuccess-only
2024-04-15 00:46:48,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:46:48,511 [ scc.repo] DEBUG ## PRs found:
2024-04-15 00:46:48,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-04-15 00:46:49,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-04-15 00:46:49,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-15 00:46:50,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-15 00:46:50,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-15 00:46:51,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-04-15 00:46:51,146 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-04-15 00:46:51,146 [ scc.repo] DEBUG ## Branches found:
2024-04-15 00:46:51,146 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-15 00:46:51,146 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:46:51,146 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:51,153 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 00:46:51,158 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 00:46:51,158 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 00:46:51,163 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 00:46:51,169 [ scc.git] DEBUG Already up to date.
2024-04-15 00:46:51,169 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-15 00:46:51,552 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-04-15 00:46:51,552 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-15 00:46:51,560 [ scc.git] DEBUG ## Unique users: []
2024-04-15 00:46:51,560 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:46:51,560 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:51,572 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-15 00:46:51,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:51,588 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-15 00:46:51,601 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 00:46:51,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:46:51,766 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 00:46:51,821 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:46:51,821 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:51,828 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 00:46:51,870 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 00:46:51,878 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f461c79b340> has no local changes
2024-04-15 00:46:51,878 [ 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#32 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/)'
2024-04-15 00:46:51,888 [ scc.git] DEBUG [detached HEAD 6c63c97] merge master -Dorg -Ssuccess-only
2024-04-15 00:46:51,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:46:51,889 [ scc.repo] DEBUG ## PRs found:
2024-04-15 00:46:52,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-04-15 00:46:52,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-04-15 00:46:53,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-04-15 00:46:53,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-04-15 00:46:54,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-15 00:46:54,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-15 00:46:55,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-15 00:46:55,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-04-15 00:46:55,454 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-15 00:46:55,454 [ scc.repo] DEBUG ## Branches found:
2024-04-15 00:46:55,454 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-15 00:46:55,454 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:46:55,454 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:55,460 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 00:46:55,465 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 00:46:55,466 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 00:46:55,471 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 00:46:55,478 [ scc.git] DEBUG Already up to date.
2024-04-15 00:46:55,478 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-04-15 00:46:56,193 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-04-15 00:46:56,193 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-04-15 00:46:56,198 [ scc.git] DEBUG ## Unique users: []
2024-04-15 00:46:56,198 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:46:56,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:56,204 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-15 00:46:56,210 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:56,215 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-15 00:46:56,226 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-04-15 00:46:56,227 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 00:46:56,229 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-04-15 00:46:56,229 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-04-15 00:46:56,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:46:56,394 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 00:46:56,444 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:46:56,444 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:56,450 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 00:46:56,493 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 00:46:56,501 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f461cfdc5b0> has no local changes
2024-04-15 00:46:56,502 [ 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#32 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/)'
2024-04-15 00:46:56,513 [ scc.git] DEBUG [detached HEAD c7fd3ec] merge master -Dorg -Ssuccess-only
2024-04-15 00:46:56,513 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:46:56,514 [ scc.repo] DEBUG ## PRs found:
2024-04-15 00:46:56,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-04-15 00:46:57,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-04-15 00:46:57,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-04-15 00:46:58,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-15 00:46:58,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-15 00:46:59,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-15 00:46:59,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-04-15 00:46:59,753 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-15 00:46:59,753 [ scc.repo] DEBUG ## Branches found:
2024-04-15 00:46:59,753 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-15 00:46:59,753 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:46:59,753 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:46:59,759 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 00:46:59,765 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 00:46:59,765 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 00:46:59,772 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 00:46:59,778 [ scc.git] DEBUG Already up to date.
2024-04-15 00:46:59,778 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-15 00:47:00,199 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-04-15 00:47:00,200 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-15 00:47:00,207 [ scc.git] DEBUG ## Unique users: []
2024-04-15 00:47:00,207 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:00,207 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:00,213 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-15 00:47:00,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:00,226 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-15 00:47:00,263 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-04-15 00:47:00,263 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-04-15 00:47:00,263 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-04-15 00:47:00,263 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-04-15 00:47:00,263 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-04-15 00:47:00,263 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-04-15 00:47:00,263 [ scc.git] DEBUG Auto-merging setup.py
2024-04-15 00:47:00,263 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-04-15 00:47:00,263 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-15 00:47:00,264 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-15 00:47:00,271 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-15 00:47:00,278 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-04-15 00:47:00,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:00,441 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-15 00:47:00,448 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-15 00:47:00,454 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#32](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- setup.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
--conflicts
2024-04-15 00:47:00,460 [ scc.config] DEBUG Found github.token
2024-04-15 00:47:00,460 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-04-15 00:47:00,460 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 00:47:00,499 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:00,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:00,505 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 00:47:00,544 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 00:47:00,552 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f462d07ae80> has no local changes
2024-04-15 00:47:00,552 [ 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#32 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/)'
2024-04-15 00:47:00,561 [ scc.git] DEBUG [detached HEAD 12e4d37] merge master -Dorg -Ssuccess-only
2024-04-15 00:47:00,562 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:00,562 [ scc.repo] DEBUG ## PRs found:
2024-04-15 00:47:00,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-04-15 00:47:01,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-04-15 00:47:01,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-04-15 00:47:02,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-15 00:47:02,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-15 00:47:03,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-15 00:47:03,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-04-15 00:47:03,789 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-15 00:47:03,789 [ scc.repo] DEBUG ## Branches found:
2024-04-15 00:47:03,789 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-15 00:47:03,789 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:03,789 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:03,795 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 00:47:03,800 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 00:47:03,801 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 00:47:03,807 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 00:47:03,814 [ scc.git] DEBUG Already up to date.
2024-04-15 00:47:03,814 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-04-15 00:47:04,220 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-04-15 00:47:04,220 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-04-15 00:47:04,225 [ scc.git] DEBUG ## Unique users: []
2024-04-15 00:47:04,226 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:04,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:04,232 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-04-15 00:47:04,239 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:04,245 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2024-04-15 00:47:04,270 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-15 00:47:04,273 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-04-15 00:47:04,273 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-04-15 00:47:04,273 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-04-15 00:47:04,273 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-04-15 00:47:04,273 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-04-15 00:47:04,273 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-04-15 00:47:04,273 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-04-15 00:47:04,273 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-04-15 00:47:04,275 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-04-15 00:47:04,275 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-04-15 00:47:04,275 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-04-15 00:47:04,275 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-04-15 00:47:04,276 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-04-15 00:47:04,276 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-04-15 00:47:04,276 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-04-15 00:47:04,276 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-04-15 00:47:04,276 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-04-15 00:47:04,276 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-04-15 00:47:04,276 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-04-15 00:47:04,276 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-04-15 00:47:04,276 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-04-15 00:47:04,276 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-04-15 00:47:04,276 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-04-15 00:47:04,276 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-04-15 00:47:04,276 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-04-15 00:47:04,276 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-04-15 00:47:04,276 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-04-15 00:47:04,276 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-04-15 00:47:04,276 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-04-15 00:47:04,276 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-04-15 00:47:04,276 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-04-15 00:47:04,276 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-04-15 00:47:04,276 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-04-15 00:47:04,276 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-04-15 00:47:04,276 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-04-15 00:47:04,277 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-04-15 00:47:04,277 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-04-15 00:47:04,277 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-04-15 00:47:04,277 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-04-15 00:47:04,277 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-04-15 00:47:04,277 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-04-15 00:47:04,277 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-04-15 00:47:04,277 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-04-15 00:47:04,277 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-04-15 00:47:04,277 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-04-15 00:47:04,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:04,461 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 00:47:04,502 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:04,503 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:04,508 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 00:47:04,548 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 00:47:04,555 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f462d054df0> has no local changes
2024-04-15 00:47:04,555 [ 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#32 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/)'
2024-04-15 00:47:04,578 [ scc.git] DEBUG [detached HEAD c6f5dad] merge master -Dorg -Ssuccess-only
2024-04-15 00:47:04,578 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:04,578 [ scc.repo] DEBUG ## PRs found:
2024-04-15 00:47:04,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-04-15 00:47:04,892 [ scc.repo] DEBUG ## Branches found:
2024-04-15 00:47:04,892 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-15 00:47:04,892 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:04,892 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:04,899 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 00:47:04,906 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 00:47:04,907 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 00:47:04,914 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 00:47:04,923 [ scc.git] DEBUG Already up to date.
2024-04-15 00:47:04,923 [ scc.git] DEBUG ## Unique users: []
2024-04-15 00:47:04,923 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:04,923 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:04,930 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 00:47:04,971 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:04,972 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:04,977 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 00:47:05,016 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 00:47:05,023 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f461cfe0fa0> has no local changes
2024-04-15 00:47:05,023 [ 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#32 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/)'
2024-04-15 00:47:05,031 [ scc.git] DEBUG [detached HEAD 9379f5e] merge master -Dorg -Ssuccess-only
2024-04-15 00:47:05,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:05,032 [ scc.repo] DEBUG ## PRs found:
2024-04-15 00:47:05,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-04-15 00:47:05,316 [ scc.repo] DEBUG ## Branches found:
2024-04-15 00:47:05,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-15 00:47:05,316 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:05,316 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:05,324 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 00:47:05,330 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 00:47:05,330 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 00:47:05,336 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 00:47:05,344 [ scc.git] DEBUG Already up to date.
2024-04-15 00:47:05,344 [ scc.git] DEBUG ## Unique users: []
2024-04-15 00:47:05,344 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:05,344 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:05,350 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 00:47:05,396 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:05,396 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:05,403 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 00:47:05,444 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 00:47:05,451 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f461c78cf70> has no local changes
2024-04-15 00:47:05,451 [ 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#32 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/)'
2024-04-15 00:47:05,460 [ scc.git] DEBUG [detached HEAD dafb2af] merge master -Dorg -Ssuccess-only
2024-04-15 00:47:05,461 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:05,461 [ scc.git] INFO Overriding base-branch from master to main
2024-04-15 00:47:05,461 [ scc.repo] DEBUG ## PRs found:
2024-04-15 00:47:05,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-04-15 00:47:06,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-04-15 00:47:06,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-04-15 00:47:07,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-04-15 00:47:07,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-15 00:47:08,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-15 00:47:08,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-15 00:47:09,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-15 00:47:09,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-04-15 00:47:09,726 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-15 00:47:09,727 [ scc.repo] DEBUG ## Branches found:
2024-04-15 00:47:09,727 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-15 00:47:09,727 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:09,727 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:09,733 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-04-15 00:47:09,739 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 00:47:09,739 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-04-15 00:47:09,745 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-04-15 00:47:09,752 [ scc.git] DEBUG Already up to date.
2024-04-15 00:47:09,753 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-15 00:47:10,207 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-04-15 00:47:10,207 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-15 00:47:10,213 [ scc.git] DEBUG ## Unique users: []
2024-04-15 00:47:10,213 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:10,213 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:10,218 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-15 00:47:10,225 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:10,230 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-15 00:47:10,262 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-04-15 00:47:10,262 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-04-15 00:47:10,262 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-15 00:47:10,262 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-15 00:47:10,269 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-15 00:47:10,275 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-04-15 00:47:10,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:10,431 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-15 00:47:10,437 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-15 00:47:10,443 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#32](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-04-15 00:47:10,448 [ scc.config] DEBUG Found github.token
2024-04-15 00:47:10,449 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-04-15 00:47:10,449 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 00:47:10,491 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:10,491 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:10,497 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 00:47:10,538 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 00:47:10,546 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f461c768b50> has no local changes
2024-04-15 00:47:10,546 [ 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#32 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/)'
2024-04-15 00:47:10,557 [ scc.git] DEBUG [detached HEAD e9de5ab] merge master -Dorg -Ssuccess-only
2024-04-15 00:47:10,558 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:10,558 [ scc.repo] DEBUG ## PRs found:
2024-04-15 00:47:10,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-04-15 00:47:10,858 [ scc.repo] DEBUG ## Branches found:
2024-04-15 00:47:10,858 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-15 00:47:10,858 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:10,858 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:10,863 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 00:47:10,868 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 00:47:10,868 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 00:47:10,873 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 00:47:10,878 [ scc.git] DEBUG Already up to date.
2024-04-15 00:47:10,878 [ scc.git] DEBUG ## Unique users: []
2024-04-15 00:47:10,878 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:10,878 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:10,883 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 00:47:10,920 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:10,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:10,925 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 00:47:10,963 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 00:47:10,969 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f461c782e50> has no local changes
2024-04-15 00:47:10,969 [ 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#32 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/)'
2024-04-15 00:47:10,977 [ scc.git] DEBUG [detached HEAD cfe3396] merge master -Dorg -Ssuccess-only
2024-04-15 00:47:10,977 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:10,977 [ scc.repo] DEBUG ## PRs found:
2024-04-15 00:47:11,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-04-15 00:47:11,282 [ scc.repo] DEBUG ## Branches found:
2024-04-15 00:47:11,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-15 00:47:11,282 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:11,282 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:11,287 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 00:47:11,293 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 00:47:11,293 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 00:47:11,299 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 00:47:11,305 [ scc.git] DEBUG Already up to date.
2024-04-15 00:47:11,305 [ scc.git] DEBUG ## Unique users: []
2024-04-15 00:47:11,305 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:11,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:11,310 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 00:47:11,348 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:11,348 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:11,353 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 00:47:11,392 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 00:47:11,398 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f461c6bc940> has no local changes
2024-04-15 00:47:11,398 [ 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#32 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/)'
2024-04-15 00:47:11,406 [ scc.git] DEBUG [detached HEAD d4c0774] merge master -Dorg -Ssuccess-only
2024-04-15 00:47:11,407 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:11,407 [ scc.repo] DEBUG ## PRs found:
2024-04-15 00:47:11,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-04-15 00:47:12,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-04-15 00:47:12,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-04-15 00:47:13,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-15 00:47:13,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-15 00:47:14,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-15 00:47:14,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-04-15 00:47:14,591 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-04-15 00:47:14,591 [ scc.repo] DEBUG ## Branches found:
2024-04-15 00:47:14,591 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-15 00:47:14,591 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:14,591 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:14,598 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-15 00:47:14,604 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 00:47:14,605 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-15 00:47:14,611 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-15 00:47:14,618 [ scc.git] DEBUG Already up to date.
2024-04-15 00:47:14,618 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-04-15 00:47:15,067 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-04-15 00:47:15,067 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-04-15 00:47:15,072 [ scc.git] DEBUG ## Unique users: []
2024-04-15 00:47:15,072 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:15,072 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:15,078 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-15 00:47:15,084 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:15,089 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-15 00:47:15,125 [ scc.git] DEBUG Auto-merging Dockerfile
2024-04-15 00:47:15,125 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-04-15 00:47:15,125 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-15 00:47:15,127 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-15 00:47:15,140 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-15 00:47:15,149 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-04-15 00:47:15,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:15,300 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-15 00:47:15,307 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-15 00:47:15,313 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#32](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-04-15 00:47:15,319 [ scc.config] DEBUG Found github.token
2024-04-15 00:47:15,319 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-04-15 00:47:15,319 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 00:47:15,361 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:15,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:15,367 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 00:47:15,411 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 00:47:15,418 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f461c71c310> has no local changes
2024-04-15 00:47:15,419 [ 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#32 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/)'
2024-04-15 00:47:15,428 [ scc.git] DEBUG [detached HEAD 8480043] merge master -Dorg -Ssuccess-only
2024-04-15 00:47:15,428 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:15,429 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-15 00:47:15,429 [ scc.repo] DEBUG ## PRs found:
2024-04-15 00:47:15,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-15 00:47:16,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-15 00:47:16,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-15 00:47:17,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-15 00:47:17,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-15 00:47:18,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-15 00:47:18,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-15 00:47:19,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-15 00:47:19,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-15 00:47:20,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-15 00:47:20,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-04-15 00:47:20,465 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-15 00:47:20,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-15 00:47:21,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-15 00:47:21,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-15 00:47:22,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-15 00:47:22,485 [ scc.repo] DEBUG ## Branches found:
2024-04-15 00:47:22,485 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-15 00:47:22,485 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:22,485 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:22,491 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-15 00:47:22,496 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-15 00:47:22,496 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-15 00:47:22,502 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-15 00:47:22,508 [ scc.git] DEBUG Already up to date.
2024-04-15 00:47:22,508 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-15 00:47:22,914 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-04-15 00:47:22,914 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-15 00:47:22,919 [ scc.git] DEBUG ## Unique users: []
2024-04-15 00:47:22,919 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:22,919 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:22,924 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-15 00:47:22,931 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:22,937 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-15 00:47:22,961 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-15 00:47:22,961 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-15 00:47:22,961 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-15 00:47:22,962 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-15 00:47:22,968 [ scc.git] DEBUG Calling 'git reset --hard 2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-15 00:47:22,974 [ scc.git] DEBUG HEAD is now at 2078ac7 Bump version: 5.8.0 → 5.8.1.dev0
2024-04-15 00:47:23,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:23,130 [ scc.git] DEBUG Calling 'git merge-base 2078ac72dbf11f2733e685000a274eff81c2ac2d 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-15 00:47:23,137 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-15 00:47:23,145 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#32](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-15 00:47:23,152 [ scc.config] DEBUG Found github.token
2024-04-15 00:47:23,152 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-15 00:47:23,153 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-15 00:47:23,197 [ scc.git] DEBUG Get sha1 of %s
2024-04-15 00:47:23,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-15 00:47:23,204 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 00:47:23,247 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 00:47:23,254 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f461c6bcbb0> has no local changes
2024-04-15 00:47:23,255 [ 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#32 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/)'
2024-04-15 00:47:23,263 [ scc.git] DEBUG [detached HEAD a4adc3f] merge master -Dorg -Ssuccess-only
2024-04-15 00:47:23,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:23,263 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-15 00:47:23,364 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-04-15 00:47:23,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:23,586 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-04-15 00:47:23,592 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-04-15 00:47:23,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:23,997 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-04-15 00:47:24,004 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-04-15 00:47:24,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:24,403 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-04-15 00:47:24,409 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-04-15 00:47:24,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:24,827 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-04-15 00:47:25,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:25,232 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-04-15 00:47:25,238 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-04-15 00:47:25,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:25,649 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-04-15 00:47:25,654 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-04-15 00:47:26,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:26,048 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-04-15 00:47:26,053 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-04-15 00:47:26,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:26,469 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-04-15 00:47:26,474 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-04-15 00:47:26,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:26,877 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-04-15 00:47:26,882 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-04-15 00:47:27,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:27,279 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-04-15 00:47:27,283 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-04-15 00:47:27,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:27,697 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-04-15 00:47:27,702 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-04-15 00:47:28,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:28,100 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-04-15 00:47:28,105 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-04-15 00:47:28,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:28,516 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-04-15 00:47:28,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:28,937 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-04-15 00:47:29,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:29,337 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-04-15 00:47:29,342 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-04-15 00:47:29,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:29,763 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-04-15 00:47:30,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:30,168 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-04-15 00:47:30,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:30,591 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-04-15 00:47:30,598 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-04-15 00:47:30,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:30,998 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-04-15 00:47:31,006 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-04-15 00:47:31,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:31,401 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-04-15 00:47:31,407 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-04-15 00:47:31,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:31,811 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-04-15 00:47:31,832 [ scc.config] DEBUG Found submodule.scripts.url
2024-04-15 00:47:32,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-15 00:47:32,234 [ scc.config] DEBUG Found submodule.scripts.branch
2024-04-15 00:47:32,235 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-15 00:47:32,320 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f463050e460> has local changes
2024-04-15 00:47:32,320 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 359 dependabot[bot] 'Bump omero-figure from `3b7ccfa` to `852b510`'
- PR 360 dependabot[bot] 'Bump omero-iviewer from `a232ed0` to `9d8d147`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 549 will-moore 'Inset feature' (stage: draft)
- PR 543 will-moore 'Plate well labels' (stage: draft)
Updating 852b5109..ded0caab
Previously merged:
- PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
- PR 550 will-moore 'Don't update zoom to undefined on setId'
Merged PRs:
- PR 477 will-moore 'Vite'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 456 will-moore 'Don't use tiles for non-big movies'
- PR 460 will-moore 'Channel min spinner fix'
- PR 464 will-moore 'Tile load error warning'
- PR 465 will-moore 'Save as Figure'
- PR 469 will-moore 'changelog 0.14.0'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#32 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/32/)'
2024-04-15 00:47:32,338 [ scc.git] DEBUG [detached HEAD 31dd385] merge master -Dorg -Ssuccess-only
2024-04-15 00:47:32,338 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-04-15 00:47:32,338 [ scc.merge] INFO Repository: ome/omero-plugins
2024-04-15 00:47:32,338 [ scc.merge] INFO Already up to date.
2024-04-15 00:47:32,338 [ scc.merge] INFO
2024-04-15 00:47:32,338 [ scc.merge] INFO Merged PRs:
2024-04-15 00:47:32,339 [ scc.merge] INFO - PR 359 dependabot[bot] 'Bump omero-figure from `3b7ccfa` to `852b510`'
2024-04-15 00:47:32,339 [ scc.merge] INFO - PR 360 dependabot[bot] 'Bump omero-iviewer from `a232ed0` to `9d8d147`'
2024-04-15 00:47:32,339 [ scc.merge] INFO
2024-04-15 00:47:32,339 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-04-15 00:47:32,339 [ scc.merge] INFO Already up to date.
2024-04-15 00:47:32,339 [ scc.merge] INFO
2024-04-15 00:47:32,339 [ scc.merge] INFO
2024-04-15 00:47:32,339 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-04-15 00:47:32,339 [ scc.merge] INFO Excluded PRs:
2024-04-15 00:47:32,339 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-04-15 00:47:32,339 [ scc.merge] INFO Already up to date.
2024-04-15 00:47:32,339 [ scc.merge] INFO
2024-04-15 00:47:32,339 [ scc.merge] INFO Merged PRs:
2024-04-15 00:47:32,339 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-04-15 00:47:32,339 [ scc.merge] INFO
2024-04-15 00:47:32,339 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-04-15 00:47:32,339 [ scc.merge] INFO Excluded PRs:
2024-04-15 00:47:32,339 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-04-15 00:47:32,339 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-04-15 00:47:32,339 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-04-15 00:47:32,339 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-04-15 00:47:32,339 [ scc.merge] INFO Already up to date.
2024-04-15 00:47:32,339 [ scc.merge] INFO
2024-04-15 00:47:32,339 [ scc.merge] INFO Merged PRs:
2024-04-15 00:47:32,339 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-04-15 00:47:32,339 [ scc.merge] INFO
2024-04-15 00:47:32,339 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-04-15 00:47:32,339 [ scc.merge] INFO Excluded PRs:
2024-04-15 00:47:32,339 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-15 00:47:32,340 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-04-15 00:47:32,340 [ scc.merge] INFO Already up to date.
2024-04-15 00:47:32,340 [ scc.merge] INFO
2024-04-15 00:47:32,340 [ scc.merge] INFO Merged PRs:
2024-04-15 00:47:32,340 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-04-15 00:47:32,340 [ scc.merge] INFO
2024-04-15 00:47:32,340 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-15 00:47:32,340 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-04-15 00:47:32,340 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-04-15 00:47:32,340 [ scc.merge] INFO
2024-04-15 00:47:32,340 [ scc.merge] INFO Repository: ome/omero-figure
2024-04-15 00:47:32,340 [ scc.merge] INFO Excluded PRs:
2024-04-15 00:47:32,340 [ scc.merge] INFO - PR 549 will-moore 'Inset feature' (stage: draft)
2024-04-15 00:47:32,340 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-04-15 00:47:32,340 [ scc.merge] INFO Updating 852b5109..ded0caab
2024-04-15 00:47:32,340 [ scc.merge] INFO Previously merged:
2024-04-15 00:47:32,340 [ scc.merge] INFO - PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
2024-04-15 00:47:32,340 [ scc.merge] INFO - PR 550 will-moore 'Don't update zoom to undefined on setId'
2024-04-15 00:47:32,340 [ scc.merge] INFO
2024-04-15 00:47:32,340 [ scc.merge] INFO Merged PRs:
2024-04-15 00:47:32,340 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-04-15 00:47:32,340 [ scc.merge] INFO
2024-04-15 00:47:32,340 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-04-15 00:47:32,340 [ scc.merge] INFO Already up to date.
2024-04-15 00:47:32,340 [ scc.merge] INFO
2024-04-15 00:47:32,340 [ scc.merge] INFO Merged PRs:
2024-04-15 00:47:32,340 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-04-15 00:47:32,340 [ scc.merge] INFO
2024-04-15 00:47:32,340 [ scc.merge] INFO Repository: ome/omero-gallery
2024-04-15 00:47:32,340 [ scc.merge] INFO Already up to date.
2024-04-15 00:47:32,340 [ scc.merge] INFO
2024-04-15 00:47:32,340 [ scc.merge] INFO Merged PRs:
2024-04-15 00:47:32,340 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-15 00:47:32,341 [ scc.merge] INFO
2024-04-15 00:47:32,341 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-04-15 00:47:32,341 [ scc.merge] INFO Excluded PRs:
2024-04-15 00:47:32,341 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-04-15 00:47:32,341 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-04-15 00:47:32,341 [ scc.merge] INFO Already up to date.
2024-04-15 00:47:32,341 [ scc.merge] INFO
2024-04-15 00:47:32,341 [ scc.merge] INFO Merged PRs:
2024-04-15 00:47:32,341 [ scc.merge] INFO - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-04-15 00:47:32,341 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-04-15 00:47:32,341 [ scc.merge] INFO - PR 464 will-moore 'Tile load error warning'
2024-04-15 00:47:32,341 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-04-15 00:47:32,341 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-04-15 00:47:32,341 [ scc.merge] INFO
2024-04-15 00:47:32,341 [ scc.merge] INFO Repository: ome/omero-mapr
2024-04-15 00:47:32,341 [ scc.merge] INFO Excluded PRs:
2024-04-15 00:47:32,341 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-04-15 00:47:32,341 [ scc.merge] INFO Already up to date.
2024-04-15 00:47:32,341 [ scc.merge] INFO
2024-04-15 00:47:32,341 [ scc.merge] INFO Merged PRs:
2024-04-15 00:47:32,341 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-04-15 00:47:32,341 [ scc.merge] INFO
2024-04-15 00:47:32,341 [ scc.merge] INFO Repository: ome/omero-metadata
2024-04-15 00:47:32,341 [ scc.merge] INFO Already up to date.
2024-04-15 00:47:32,341 [ scc.merge] INFO
2024-04-15 00:47:32,341 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-15 00:47:32,341 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-15 00:47:32,341 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-15 00:47:32,341 [ scc.merge] INFO
2024-04-15 00:47:32,341 [ scc.merge] INFO Repository: ome/omero-parade
2024-04-15 00:47:32,341 [ scc.merge] INFO Excluded PRs:
2024-04-15 00:47:32,341 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-04-15 00:47:32,341 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-04-15 00:47:32,341 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-04-15 00:47:32,342 [ scc.merge] INFO Already up to date.
2024-04-15 00:47:32,342 [ scc.merge] INFO
2024-04-15 00:47:32,342 [ scc.merge] INFO Merged PRs:
2024-04-15 00:47:32,342 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-15 00:47:32,342 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-15 00:47:32,342 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-15 00:47:32,342 [ scc.merge] INFO
2024-04-15 00:47:32,342 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-04-15 00:47:32,342 [ scc.merge] INFO Already up to date.
2024-04-15 00:47:32,342 [ scc.merge] INFO
2024-04-15 00:47:32,342 [ scc.merge] INFO Merged PRs:
2024-04-15 00:47:32,342 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-04-15 00:47:32,342 [ scc.merge] INFO
2024-04-15 00:47:32,342 [ scc.merge] INFO Repository: ome/omero-rois
2024-04-15 00:47:32,342 [ scc.merge] INFO Excluded PRs:
2024-04-15 00:47:32,342 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-15 00:47:32,342 [ scc.merge] INFO Already up to date.
2024-04-15 00:47:32,342 [ scc.merge] INFO
2024-04-15 00:47:32,342 [ scc.merge] INFO Merged PRs:
2024-04-15 00:47:32,342 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-15 00:47:32,342 [ scc.merge] INFO
2024-04-15 00:47:32,342 [ scc.merge] INFO Repository: ome/omero-signup
2024-04-15 00:47:32,342 [ scc.merge] INFO Already up to date.
2024-04-15 00:47:32,342 [ scc.merge] INFO
2024-04-15 00:47:32,342 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-15 00:47:32,342 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-15 00:47:32,342 [ scc.merge] INFO
2024-04-15 00:47:32,342 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-04-15 00:47:32,342 [ scc.merge] INFO Already up to date.
2024-04-15 00:47:32,342 [ scc.merge] INFO
2024-04-15 00:47:32,342 [ scc.merge] INFO Merged PRs:
2024-04-15 00:47:32,342 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-15 00:47:32,342 [ scc.merge] INFO
2024-04-15 00:47:32,342 [ scc.merge] INFO Repository: ome/omero-upload
2024-04-15 00:47:32,343 [ scc.merge] INFO Already up to date.
2024-04-15 00:47:32,343 [ scc.merge] INFO
2024-04-15 00:47:32,343 [ scc.merge] INFO
2024-04-15 00:47:32,343 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-04-15 00:47:32,343 [ scc.merge] INFO Already up to date.
2024-04-15 00:47:32,343 [ scc.merge] INFO
2024-04-15 00:47:32,343 [ scc.merge] INFO
2024-04-15 00:47:32,343 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-04-15 00:47:32,343 [ scc.merge] INFO Excluded PRs:
2024-04-15 00:47:32,343 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-04-15 00:47:32,343 [ scc.merge] INFO Already up to date.
2024-04-15 00:47:32,343 [ scc.merge] INFO
2024-04-15 00:47:32,343 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-15 00:47:32,343 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-15 00:47:32,343 [ scc.merge] INFO
2024-04-15 00:47:32,343 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-04-15 00:47:32,343 [ scc.merge] INFO Already up to date.
2024-04-15 00:47:32,343 [ scc.merge] INFO
2024-04-15 00:47:32,343 [ scc.merge] INFO
2024-04-15 00:47:32,343 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-04-15 00:47:32,343 [ scc.merge] INFO Already up to date.
2024-04-15 00:47:32,343 [ scc.merge] INFO
2024-04-15 00:47:32,343 [ scc.merge] INFO
2024-04-15 00:47:32,343 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-04-15 00:47:32,343 [ scc.merge] INFO Already up to date.
2024-04-15 00:47:32,343 [ scc.merge] INFO
2024-04-15 00:47:32,343 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-15 00:47:32,343 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-04-15 00:47:32,343 [ scc.merge] INFO
2024-04-15 00:47:32,343 [ scc.merge] INFO Repository: ome/scripts
2024-04-15 00:47:32,343 [ scc.merge] INFO Excluded PRs:
2024-04-15 00:47:32,343 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-15 00:47:32,343 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-15 00:47:32,343 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-15 00:47:32,343 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-15 00:47:32,343 [ scc.merge] INFO Already up to date.
2024-04-15 00:47:32,344 [ scc.merge] INFO
2024-04-15 00:47:32,344 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-15 00:47:32,344 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-15 00:47:32,344 [ scc.merge] INFO
2024-04-15 00:47:32,344 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-15 00:47:32,344 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 00:47:32,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-04-15 00:47:32,350 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 00:47:32,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:32,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-04-15 00:47:32,355 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 00:47:32,361 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:32,361 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-04-15 00:47:32,361 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 00:47:32,367 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:32,367 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-04-15 00:47:32,368 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 00:47:32,374 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:32,375 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-04-15 00:47:32,375 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 00:47:32,382 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:32,382 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-15 00:47:32,382 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 00:47:32,389 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:32,389 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-15 00:47:32,389 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 00:47:32,396 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:32,396 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-15 00:47:32,396 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 00:47:32,403 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:32,403 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-15 00:47:32,404 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 00:47:32,410 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:32,411 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-15 00:47:32,411 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 00:47:32,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:32,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-15 00:47:32,417 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 00:47:32,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:32,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-15 00:47:32,424 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 00:47:32,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:32,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-15 00:47:32,431 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 00:47:32,436 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:32,436 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-15 00:47:32,436 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 00:47:32,441 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:32,441 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-15 00:47:32,442 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 00:47:32,446 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:32,447 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-15 00:47:32,447 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 00:47:32,453 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:32,453 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-15 00:47:32,453 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 00:47:32,460 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:32,461 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-15 00:47:32,461 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 00:47:32,468 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:32,468 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-15 00:47:32,468 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 00:47:32,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:32,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-15 00:47:32,475 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 00:47:32,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:32,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-15 00:47:32,482 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 00:47:32,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-15 00:47:32,489 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-15 00:47:32,489 [ scc.git] DEBUG Calling 'git remote'
2024-04-15 00:47:32,495 [ 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 a09e123] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 2ca566b
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from 852b5109
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 9d8d147
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from a0148a6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 2078ac7
nothing to commit, working tree clean
[detached HEAD f7cf008] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-04-15 00:48:21,043 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2024-04-15 00:48:29,999 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2024-04-15 00:48:32,348 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-15 00:48:36,891 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-15 00:49:23,479 [ 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/eed02e22/images/svgs/logo.svg){kind=logo}
