Skipping 120 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-04-03 00:41:52,301 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/mousetrap-1.5.3/mousetrap.min.js
2024-04-03 00:41:52,301 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael-min.js
2024-04-03 00:41:52,301 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael.js
2024-04-03 00:41:52,301 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/scaleraphael.js
2024-04-03 00:41:52,301 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/underscore-1.13.1-umd-min.js
2024-04-03 00:41:52,301 [ scc.git] DEBUG delete mode 100644 omero_figure/templates/figure/index.html
2024-04-03 00:41:52,301 [ scc.git] DEBUG delete mode 100644 spec/ViewportViewSpec.js
2024-04-03 00:41:52,301 [ scc.git] DEBUG delete mode 100644 spec/images/testImage.png
2024-04-03 00:41:52,301 [ scc.git] DEBUG delete mode 100644 spec/javascripts/PanelSpec.js
2024-04-03 00:41:52,301 [ scc.git] DEBUG delete mode 100644 spec/javascripts/ViewportViewSpec.js
2024-04-03 00:41:52,301 [ scc.git] DEBUG delete mode 100644 spec/javascripts/fixtures/previewTab.html
2024-04-03 00:41:52,301 [ scc.git] DEBUG create mode 100644 src/.env
2024-04-03 00:41:52,301 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/css/figure.css (70%)
2024-04-03 00:41:52,301 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/arrow-icon-16.png (100%)
2024-04-03 00:41:52,301 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-04-03 00:41:52,301 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-04-03 00:41:52,301 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-04-03 00:41:52,301 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-04-03 00:41:52,301 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-04-03 00:41:52,301 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-04-03 00:41:52,301 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-04-03 00:41:52,301 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-04-03 00:41:52,301 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-04-03 00:41:52,301 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-03 00:41:52,301 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-04-03 00:41:52,301 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-04-03 00:41:52,301 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-04-03 00:41:52,301 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-04-03 00:41:52,301 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-04-03 00:41:52,301 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-04-03 00:41:52,301 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-04-03 00:41:52,301 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-04-03 00:41:52,301 [ scc.git] DEBUG create mode 100644 src/index.html
2024-04-03 00:41:52,301 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-04-03 00:41:52,301 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-04-03 00:41:52,302 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-04-03 00:41:52,302 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-04-03 00:41:52,302 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-04-03 00:41:52,302 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-04-03 00:41:52,302 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-04-03 00:41:52,302 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-04-03 00:41:52,302 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-04-03 00:41:52,302 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-03 00:41:52,302 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-04-03 00:41:52,302 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-04-03 00:41:52,302 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-04-03 00:41:52,302 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-04-03 00:41:52,302 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-04-03 00:41:52,302 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-04-03 00:41:52,302 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-04-03 00:41:52,302 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-04-03 00:41:52,302 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-04-03 00:41:52,302 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-04-03 00:41:52,302 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-04-03 00:41:52,302 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-04-03 00:41:52,302 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-04-03 00:41:52,302 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-04-03 00:41:52,302 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-04-03 00:41:52,302 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-04-03 00:41:52,302 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-04-03 00:41:52,302 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-04-03 00:41:52,302 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-04-03 00:41:52,302 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-04-03 00:41:52,302 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-04-03 00:41:52,302 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-04-03 00:41:52,302 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-04-03 00:41:52,302 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-04-03 00:41:52,302 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-04-03 00:41:52,302 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-04-03 00:41:52,302 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-04-03 00:41:52,302 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-04-03 00:41:52,302 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-04-03 00:41:52,303 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-04-03 00:41:52,303 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-04-03 00:41:52,303 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-04-03 00:41:52,303 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-04-03 00:41:52,303 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-04-03 00:41:52,303 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-04-03 00:41:52,303 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-04-03 00:41:52,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:41:52,460 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...32b0ccd55ce3c95dabcf8ebf817b032e4b864438'
2024-04-03 00:41:52,467 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:41:52,471 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 548 (Fix cropping of panel labels and float usage for shape labels) 32b0ccd55ce3c95dabcf8ebf817b032e4b864438'
2024-04-03 00:41:52,490 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-03 00:41:52,493 [ scc.git] DEBUG omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 6 +++---
2024-04-03 00:41:52,493 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-04-03 00:41:52,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:41:52,874 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-03 00:41:52,909 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:41:52,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:41:52,914 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-03 00:41:52,947 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-03 00:41:52,957 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f701f56ffd0> has no local changes
2024-04-03 00:41:52,957 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
Generated by OMERO-plugins-push#20 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/)'
2024-04-03 00:41:52,976 [ scc.git] DEBUG [detached HEAD 1b6f9c31] merge master -Dorg -Ssuccess-only
2024-04-03 00:41:52,976 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:41:52,976 [ scc.repo] DEBUG ## PRs found:
2024-04-03 00:41:53,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-04-03 00:41:53,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-04-03 00:41:54,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-04-03 00:41:54,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-03 00:41:55,239 [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-03 00:41:55,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-03 00:41:56,176 [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-03 00:41:56,177 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-04-03 00:41:56,177 [ scc.repo] DEBUG ## Branches found:
2024-04-03 00:41:56,177 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-03 00:41:56,177 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:41:56,177 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:41:56,182 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-03 00:41:56,187 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-03 00:41:56,187 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-03 00:41:56,191 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-03 00:41:56,196 [ scc.git] DEBUG Already up to date.
2024-04-03 00:41:56,196 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-04-03 00:41:56,606 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-04-03 00:41:56,606 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-04-03 00:41:56,609 [ scc.git] DEBUG ## Unique users: []
2024-04-03 00:41:56,610 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:41:56,610 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:41:56,615 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-03 00:41:56,620 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:41:56,624 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-03 00:41:56,664 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-04-03 00:41:56,665 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-03 00:41:56,667 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-04-03 00:41:56,667 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-03 00:41:56,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:41:56,824 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-03 00:41:56,858 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:41:56,858 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:41:56,862 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-03 00:41:56,895 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-03 00:41:56,900 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f701e4e54f0> has no local changes
2024-04-03 00:41:56,900 [ 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#20 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/)'
2024-04-03 00:41:56,907 [ scc.git] DEBUG [detached HEAD c2e5351] merge master -Dorg -Ssuccess-only
2024-04-03 00:41:56,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:41:56,907 [ scc.repo] DEBUG ## PRs found:
2024-04-03 00:41:57,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-04-03 00:41:57,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-04-03 00:41:57,784 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-03 00:41:58,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-03 00:41:58,872 [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-03 00:41:59,346 [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-03 00:41:59,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-03 00:42:00,306 [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-03 00:42:00,306 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-03 00:42:00,306 [ scc.repo] DEBUG ## Branches found:
2024-04-03 00:42:00,306 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-03 00:42:00,306 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:42:00,307 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:00,312 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-03 00:42:00,315 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-03 00:42:00,316 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-03 00:42:00,320 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-03 00:42:00,325 [ scc.git] DEBUG Already up to date.
2024-04-03 00:42:00,325 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-04-03 00:42:00,703 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-04-03 00:42:00,704 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-04-03 00:42:00,707 [ scc.git] DEBUG ## Unique users: []
2024-04-03 00:42:00,707 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:42:00,707 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:00,711 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-03 00:42:00,716 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:00,720 [ 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-03 00:42:00,729 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-03 00:42:00,732 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-04-03 00:42:00,733 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-04-03 00:42:00,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:42:00,888 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-03 00:42:00,923 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:42:00,923 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:00,927 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-03 00:42:00,960 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-03 00:42:00,966 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f701e4e1a90> has no local changes
2024-04-03 00:42:00,966 [ 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#20 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/)'
2024-04-03 00:42:00,974 [ scc.git] DEBUG [detached HEAD 8e5e66c] merge master -Dorg -Ssuccess-only
2024-04-03 00:42:00,974 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:42:00,974 [ scc.repo] DEBUG ## PRs found:
2024-04-03 00:42:01,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-04-03 00:42:01,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/468 HTTP/1.1" 200 None
2024-04-03 00:42:01,900 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-03 00:42:02,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d HTTP/1.1" 200 None
2024-04-03 00:42:03,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-03 00:42:03,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-03 00:42:04,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d HTTP/1.1" 200 None
2024-04-03 00:42:04,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/9f06f398570cddff1332355e1eda0fe54d88881d?per_page=1 HTTP/1.1" 200 2
2024-04-03 00:42:04,471 [ scc.repo] DEBUG - PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
2024-04-03 00:42:04,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/467 HTTP/1.1" 200 None
2024-04-03 00:42:04,942 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-03 00:42:05,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-04-03 00:42:06,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-03 00:42:06,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-03 00:42:06,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-04-03 00:42:07,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/78e253cccecbd349db3bcb16514f5c8b2c4185e6?per_page=1 HTTP/1.1" 200 2
2024-04-03 00:42:07,398 [ scc.repo] DEBUG - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-04-03 00:42:07,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-04-03 00:42:08,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407 HTTP/1.1" 200 None
2024-04-03 00:42:08,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-03 00:42:09,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-03 00:42:09,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407 HTTP/1.1" 200 None
2024-04-03 00:42:10,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/105a9369cdb853508da5ec4e0839c6f448bf3407?per_page=1 HTTP/1.1" 200 2
2024-04-03 00:42:10,245 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-04-03 00:42:10,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464 HTTP/1.1" 200 None
2024-04-03 00:42:11,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464/comments HTTP/1.1" 200 None
2024-04-03 00:42:11,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-04-03 00:42:12,182 [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-03 00:42:12,643 [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-03 00:42:13,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-04-03 00:42:13,537 [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-03 00:42:13,537 [ scc.repo] DEBUG - PR 464 will-moore 'Tile load error warning'
2024-04-03 00:42:14,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-04-03 00:42:14,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-04-03 00:42:14,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-03 00:42:15,376 [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-03 00:42:15,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-03 00:42:16,320 [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-03 00:42:16,320 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-04-03 00:42:16,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456 HTTP/1.1" 200 None
2024-04-03 00:42:17,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456/comments HTTP/1.1" 200 None
2024-04-03 00:42:17,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-04-03 00:42:18,251 [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-03 00:42:18,743 [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-03 00:42:19,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-04-03 00:42:19,588 [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-03 00:42:19,588 [ scc.repo] DEBUG - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-04-03 00:42:19,588 [ scc.repo] DEBUG ## Branches found:
2024-04-03 00:42:19,588 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-03 00:42:19,588 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:42:19,588 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:19,594 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-03 00:42:19,598 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-03 00:42:19,598 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-03 00:42:19,602 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-03 00:42:19,607 [ scc.git] DEBUG Already up to date.
2024-04-03 00:42:19,607 [ scc.git] DEBUG Calling 'git fetch origin pull/456/head'
2024-04-03 00:42:20,073 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-03 00:42:20,073 [ scc.git] DEBUG * branch refs/pull/456/head -> FETCH_HEAD
2024-04-03 00:42:20,077 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-04-03 00:42:20,476 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-03 00:42:20,477 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-04-03 00:42:20,480 [ scc.git] DEBUG Calling 'git fetch origin pull/464/head'
2024-04-03 00:42:21,016 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-03 00:42:21,016 [ scc.git] DEBUG * branch refs/pull/464/head -> FETCH_HEAD
2024-04-03 00:42:21,019 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-04-03 00:42:21,722 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-03 00:42:21,722 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-04-03 00:42:21,726 [ scc.git] DEBUG Calling 'git fetch origin pull/467/head'
2024-04-03 00:42:22,113 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-03 00:42:22,113 [ scc.git] DEBUG * branch refs/pull/467/head -> FETCH_HEAD
2024-04-03 00:42:22,117 [ scc.git] DEBUG Calling 'git fetch origin pull/468/head'
2024-04-03 00:42:22,506 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-03 00:42:22,506 [ scc.git] DEBUG * branch refs/pull/468/head -> FETCH_HEAD
2024-04-03 00:42:22,510 [ scc.git] DEBUG ## Unique users: []
2024-04-03 00:42:22,510 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:42:22,510 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:22,514 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-04-03 00:42:22,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:22,523 [ 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-03 00:42:22,533 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-03 00:42:22,535 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 5 +++--
2024-04-03 00:42:22,535 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-04-03 00:42:22,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:42:22,684 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-03 00:42:22,689 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:22,692 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-03 00:42:22,716 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-03 00:42:22,719 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-04-03 00:42:22,719 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-04-03 00:42:22,719 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-04-03 00:42:23,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:42:23,077 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-04-03 00:42:23,082 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:23,086 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 464 (Tile load error warning) 97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-04-03 00:42:23,097 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-03 00:42:23,102 [ scc.git] DEBUG css/app.css | 22 ++++++++++++++++++++++
2024-04-03 00:42:23,102 [ scc.git] DEBUG src/events/events.js | 2 ++
2024-04-03 00:42:23,103 [ scc.git] DEBUG src/index-dev.html | 6 +++---
2024-04-03 00:42:23,103 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 2 +-
2024-04-03 00:42:23,103 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 4 +++-
2024-04-03 00:42:23,103 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 39 +++++++++++++++++++++++++++++++++++++--
2024-04-03 00:42:23,103 [ scc.git] DEBUG 6 files changed, 68 insertions(+), 7 deletions(-)
2024-04-03 00:42:23,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:42:23,483 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...105a9369cdb853508da5ec4e0839c6f448bf3407'
2024-04-03 00:42:23,488 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:23,492 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 105a9369cdb853508da5ec4e0839c6f448bf3407'
2024-04-03 00:42:23,508 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-04-03 00:42:23,509 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-03 00:42:23,512 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-04-03 00:42:23,512 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-04-03 00:42:23,512 [ scc.git] DEBUG src/app/header.html | 5 +
2024-04-03 00:42:23,512 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-04-03 00:42:23,512 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-04-03 00:42:23,512 [ scc.git] DEBUG src/utils/figure.js | 210 ++++++++++++++++++++++++++++++++++++++++++
2024-04-03 00:42:23,512 [ scc.git] DEBUG 6 files changed, 283 insertions(+), 6 deletions(-)
2024-04-03 00:42:23,513 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-04-03 00:42:23,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:42:23,885 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e253cccecbd349db3bcb16514f5c8b2c4185e6'
2024-04-03 00:42:23,904 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:23,908 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 467 (Bump webpack-dev-middleware from 5.3.3 to 5.3.4) 78e253cccecbd349db3bcb16514f5c8b2c4185e6'
2024-04-03 00:42:23,980 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-03 00:42:23,988 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2024-04-03 00:42:23,988 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2024-04-03 00:42:24,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:42:24,286 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9f06f398570cddff1332355e1eda0fe54d88881d'
2024-04-03 00:42:24,291 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:24,295 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 468 (Bump express from 4.18.2 to 4.19.2) 9f06f398570cddff1332355e1eda0fe54d88881d'
2024-04-03 00:42:24,442 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-03 00:42:24,443 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-03 00:42:24,451 [ scc.git] DEBUG package-lock.json | 76 +++++++++++++++++++++++++++----------------------------
2024-04-03 00:42:24,451 [ scc.git] DEBUG 1 file changed, 38 insertions(+), 38 deletions(-)
2024-04-03 00:42:24,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:42:24,690 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-03 00:42:24,723 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:42:24,724 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:24,728 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-03 00:42:24,760 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-03 00:42:24,768 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f701f51bf40> has no local changes
2024-04-03 00:42:24,768 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 456 will-moore 'Don't use tiles for non-big movies'
- PR 460 will-moore 'Channel min spinner fix'
- PR 464 will-moore 'Tile load error warning'
- PR 465 will-moore 'Save as Figure'
- PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
- PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
Generated by OMERO-plugins-push#20 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/)'
2024-04-03 00:42:24,778 [ scc.git] DEBUG [detached HEAD a4703c7] merge master -Dorg -Ssuccess-only
2024-04-03 00:42:24,778 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:42:24,778 [ scc.repo] DEBUG ## PRs found:
2024-04-03 00:42:25,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-04-03 00:42:25,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-04-03 00:42:26,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-04-03 00:42:26,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-03 00:42:27,176 [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-03 00:42:27,650 [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-03 00:42:28,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-03 00:42:28,562 [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-03 00:42:28,563 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-04-03 00:42:28,563 [ scc.repo] DEBUG ## Branches found:
2024-04-03 00:42:28,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-03 00:42:28,563 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:42:28,563 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:28,568 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-03 00:42:28,572 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-03 00:42:28,572 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-03 00:42:28,577 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-03 00:42:28,581 [ scc.git] DEBUG Already up to date.
2024-04-03 00:42:28,581 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-04-03 00:42:28,976 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-04-03 00:42:28,977 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-04-03 00:42:28,979 [ scc.git] DEBUG ## Unique users: []
2024-04-03 00:42:28,980 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:42:28,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:28,984 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-03 00:42:28,989 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:28,993 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-03 00:42:29,001 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-03 00:42:29,003 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-04-03 00:42:29,003 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-04-03 00:42:29,003 [ scc.git] DEBUG requirements.txt | 2 +-
2024-04-03 00:42:29,003 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-04-03 00:42:29,003 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-04-03 00:42:29,003 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-04-03 00:42:29,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:42:29,159 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-03 00:42:29,192 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:42:29,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:29,196 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-03 00:42:29,230 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-03 00:42:29,235 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f701f538490> has no local changes
2024-04-03 00:42:29,235 [ 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#20 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/)'
2024-04-03 00:42:29,242 [ scc.git] DEBUG [detached HEAD 0a5ded2] merge master -Dorg -Ssuccess-only
2024-04-03 00:42:29,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:42:29,242 [ scc.repo] DEBUG ## PRs found:
2024-04-03 00:42:29,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-04-03 00:42:30,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-04-03 00:42:30,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-04-03 00:42:31,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-03 00:42:31,605 [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-03 00:42:32,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-03 00:42:32,489 [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-03 00:42:32,489 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-03 00:42:32,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-04-03 00:42:33,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-04-03 00:42:33,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-03 00:42:34,314 [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-03 00:42:34,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-03 00:42:35,232 [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-03 00:42:35,232 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-03 00:42:35,232 [ scc.repo] DEBUG ## Branches found:
2024-04-03 00:42:35,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-03 00:42:35,232 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:42:35,232 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:35,238 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-03 00:42:35,242 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-03 00:42:35,242 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-03 00:42:35,246 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-03 00:42:35,251 [ scc.git] DEBUG Already up to date.
2024-04-03 00:42:35,251 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-04-03 00:42:36,215 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-03 00:42:36,215 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-04-03 00:42:36,219 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-04-03 00:42:37,056 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-03 00:42:37,056 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-04-03 00:42:37,060 [ scc.git] DEBUG ## Unique users: []
2024-04-03 00:42:37,060 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:42:37,060 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:37,064 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-03 00:42:37,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:37,074 [ 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-03 00:42:37,098 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-04-03 00:42:37,098 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-04-03 00:42:37,098 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-03 00:42:37,098 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-03 00:42:37,098 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-03 00:42:37,098 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-03 00:42:37,103 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-03 00:42:37,108 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-03 00:42:37,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:42:37,269 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-03 00:42:37,274 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-03 00:42:37,279 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#20](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-04-03 00:42:37,282 [ scc.config] DEBUG Found github.token
2024-04-03 00:42:37,283 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-04-03 00:42:37,283 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-03 00:42:37,288 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:37,292 [ 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-03 00:42:37,309 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-03 00:42:37,309 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-03 00:42:37,309 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-04-03 00:42:37,309 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-03 00:42:37,309 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-03 00:42:37,314 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-03 00:42:37,320 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-03 00:42:37,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:42:37,704 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-03 00:42:37,709 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-03 00:42:37,714 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#20](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/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-03 00:42:37,717 [ scc.config] DEBUG Found github.token
2024-04-03 00:42:37,718 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-04-03 00:42:37,718 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-03 00:42:37,751 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:42:37,751 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:37,755 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-03 00:42:37,787 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-03 00:42:37,793 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f701f51de80> has no local changes
2024-04-03 00:42:37,793 [ 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#20 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/)'
2024-04-03 00:42:37,801 [ scc.git] DEBUG [detached HEAD 1e7b4f4] merge master -Dorg -Ssuccess-only
2024-04-03 00:42:37,801 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:42:37,801 [ scc.repo] DEBUG ## PRs found:
2024-04-03 00:42:38,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-04-03 00:42:38,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-04-03 00:42:38,696 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-03 00:42:39,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-03 00:42:39,738 [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-03 00:42:40,222 [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-03 00:42:40,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-03 00:42:41,146 [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-03 00:42:41,146 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-03 00:42:41,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-04-03 00:42:41,599 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-03 00:42:42,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-03 00:42:42,647 [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-03 00:42:43,141 [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-03 00:42:43,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-03 00:42:44,006 [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-03 00:42:44,006 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-03 00:42:44,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-04-03 00:42:44,476 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-03 00:42:44,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-03 00:42:45,486 [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-03 00:42:46,013 [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-03 00:42:46,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-03 00:42:46,967 [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-03 00:42:46,968 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-03 00:42:47,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-04-03 00:42:47,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-04-03 00:42:48,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-04-03 00:42:48,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-04-03 00:42:49,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-04-03 00:42:49,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-04-03 00:42:49,764 [ scc.repo] DEBUG ## Branches found:
2024-04-03 00:42:49,764 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-03 00:42:49,765 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:42:49,765 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:49,770 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-03 00:42:49,774 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-03 00:42:49,774 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-03 00:42:49,778 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-03 00:42:49,783 [ scc.git] DEBUG Already up to date.
2024-04-03 00:42:49,783 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-04-03 00:42:50,163 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-03 00:42:50,163 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-04-03 00:42:50,166 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-04-03 00:42:50,541 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-03 00:42:50,542 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-04-03 00:42:50,545 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-03 00:42:50,928 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-03 00:42:50,928 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-03 00:42:50,931 [ scc.git] DEBUG ## Unique users: []
2024-04-03 00:42:50,931 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:42:50,932 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:50,936 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-03 00:42:50,940 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:50,944 [ 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-03 00:42:50,952 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-03 00:42:50,954 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-04-03 00:42:50,954 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-04-03 00:42:51,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:42:51,107 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-03 00:42:51,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:51,115 [ 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-03 00:42:51,162 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-03 00:42:51,162 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-03 00:42:51,164 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-04-03 00:42:51,164 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-04-03 00:42:51,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:42:51,509 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-03 00:42:51,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:51,518 [ 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-03 00:42:51,528 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-03 00:42:51,528 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-03 00:42:51,531 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-04-03 00:42:51,531 [ scc.git] DEBUG package.json | 2 +-
2024-04-03 00:42:51,531 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-04-03 00:42:51,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:42:51,929 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-03 00:42:51,962 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:42:51,962 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:51,966 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-03 00:42:51,999 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-03 00:42:52,004 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f701c443f10> has no local changes
2024-04-03 00:42:52,004 [ 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#20 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/)'
2024-04-03 00:42:52,011 [ scc.git] DEBUG [detached HEAD 76a52aa] merge master -Dorg -Ssuccess-only
2024-04-03 00:42:52,011 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:42:52,012 [ scc.repo] DEBUG ## PRs found:
2024-04-03 00:42:52,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-04-03 00:42:52,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-04-03 00:42:53,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-03 00:42:53,857 [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-03 00:42:54,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-03 00:42:54,767 [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-03 00:42:54,767 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-04-03 00:42:54,767 [ scc.repo] DEBUG ## Branches found:
2024-04-03 00:42:54,767 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-03 00:42:54,767 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:42:54,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:54,772 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-03 00:42:54,776 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-03 00:42:54,776 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-03 00:42:54,781 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-03 00:42:54,785 [ scc.git] DEBUG Already up to date.
2024-04-03 00:42:54,785 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-03 00:42:55,174 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-04-03 00:42:55,174 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-03 00:42:55,178 [ scc.git] DEBUG ## Unique users: []
2024-04-03 00:42:55,178 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:42:55,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:55,182 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-03 00:42:55,187 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:55,191 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-03 00:42:55,198 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-03 00:42:55,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:42:55,356 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-03 00:42:55,389 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:42:55,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:55,393 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-03 00:42:55,425 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-03 00:42:55,430 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f701c495250> has no local changes
2024-04-03 00:42:55,430 [ 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#20 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/)'
2024-04-03 00:42:55,437 [ scc.git] DEBUG [detached HEAD 9c1c2df] merge master -Dorg -Ssuccess-only
2024-04-03 00:42:55,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:42:55,437 [ scc.repo] DEBUG ## PRs found:
2024-04-03 00:42:55,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-04-03 00:42:56,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-04-03 00:42:56,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-04-03 00:42:57,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-04-03 00:42:57,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-03 00:42:58,135 [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-03 00:42:58,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-03 00:42:59,047 [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-03 00:42:59,047 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-03 00:42:59,048 [ scc.repo] DEBUG ## Branches found:
2024-04-03 00:42:59,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-03 00:42:59,048 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:42:59,048 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:59,053 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-03 00:42:59,057 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-03 00:42:59,057 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-03 00:42:59,061 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-03 00:42:59,066 [ scc.git] DEBUG Already up to date.
2024-04-03 00:42:59,066 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-04-03 00:42:59,507 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-04-03 00:42:59,507 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-04-03 00:42:59,510 [ scc.git] DEBUG ## Unique users: []
2024-04-03 00:42:59,511 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:42:59,511 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:59,515 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-03 00:42:59,520 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:59,523 [ 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-03 00:42:59,532 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-04-03 00:42:59,533 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-03 00:42:59,535 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-04-03 00:42:59,535 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-04-03 00:42:59,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:42:59,684 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-03 00:42:59,718 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:42:59,718 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:42:59,722 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-03 00:42:59,755 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-03 00:42:59,760 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f701c4ab550> has no local changes
2024-04-03 00:42:59,760 [ 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#20 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/)'
2024-04-03 00:42:59,767 [ scc.git] DEBUG [detached HEAD 2a294ad] merge master -Dorg -Ssuccess-only
2024-04-03 00:42:59,767 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:42:59,767 [ scc.repo] DEBUG ## PRs found:
2024-04-03 00:43:00,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-04-03 00:43:00,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-04-03 00:43:01,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-04-03 00:43:01,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-03 00:43:02,029 [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-03 00:43:02,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-03 00:43:02,887 [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-03 00:43:02,888 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-03 00:43:02,888 [ scc.repo] DEBUG ## Branches found:
2024-04-03 00:43:02,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-03 00:43:02,888 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:02,888 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:02,893 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-03 00:43:02,898 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-03 00:43:02,898 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-03 00:43:02,902 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-03 00:43:02,907 [ scc.git] DEBUG Already up to date.
2024-04-03 00:43:02,907 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-03 00:43:03,381 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-04-03 00:43:03,381 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-03 00:43:03,385 [ scc.git] DEBUG ## Unique users: []
2024-04-03 00:43:03,385 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:03,385 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:03,390 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-03 00:43:03,395 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:03,399 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-03 00:43:03,615 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-04-03 00:43:03,615 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-04-03 00:43:03,615 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-04-03 00:43:03,616 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-04-03 00:43:03,616 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-04-03 00:43:03,616 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-04-03 00:43:03,616 [ scc.git] DEBUG Auto-merging setup.py
2024-04-03 00:43:03,616 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-04-03 00:43:03,616 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-03 00:43:03,616 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-03 00:43:03,620 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-03 00:43:03,626 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-04-03 00:43:03,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:03,770 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-03 00:43:03,775 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-03 00:43:03,780 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#20](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/views.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
--conflicts
2024-04-03 00:43:03,784 [ scc.config] DEBUG Found github.token
2024-04-03 00:43:03,784 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-04-03 00:43:03,785 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-03 00:43:03,818 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:03,818 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:03,822 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-03 00:43:03,855 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-03 00:43:03,860 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f701c495490> has no local changes
2024-04-03 00:43:03,860 [ 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#20 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/)'
2024-04-03 00:43:03,867 [ scc.git] DEBUG [detached HEAD 0d87b59] merge master -Dorg -Ssuccess-only
2024-04-03 00:43:03,868 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:03,868 [ scc.repo] DEBUG ## PRs found:
2024-04-03 00:43:04,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-04-03 00:43:04,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-04-03 00:43:05,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-04-03 00:43:05,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-03 00:43:06,126 [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-03 00:43:06,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-03 00:43:07,049 [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-03 00:43:07,050 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-03 00:43:07,050 [ scc.repo] DEBUG ## Branches found:
2024-04-03 00:43:07,050 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-03 00:43:07,050 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:07,050 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:07,055 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-03 00:43:07,059 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-03 00:43:07,059 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-03 00:43:07,064 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-03 00:43:07,069 [ scc.git] DEBUG Already up to date.
2024-04-03 00:43:07,069 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-04-03 00:43:07,574 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-04-03 00:43:07,574 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-04-03 00:43:07,577 [ scc.git] DEBUG ## Unique users: []
2024-04-03 00:43:07,578 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:07,578 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:07,582 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-04-03 00:43:07,588 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:07,592 [ 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-03 00:43:07,603 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-03 00:43:07,605 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-04-03 00:43:07,605 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-04-03 00:43:07,605 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-04-03 00:43:07,605 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-04-03 00:43:07,605 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-04-03 00:43:07,605 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-04-03 00:43:07,607 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-04-03 00:43:07,607 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-04-03 00:43:07,607 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-04-03 00:43:07,607 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-04-03 00:43:07,607 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-04-03 00:43:07,608 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-04-03 00:43:07,608 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-04-03 00:43:07,608 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-04-03 00:43:07,608 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-04-03 00:43:07,608 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-04-03 00:43:07,608 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-04-03 00:43:07,608 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-04-03 00:43:07,608 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-04-03 00:43:07,608 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-04-03 00:43:07,608 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-04-03 00:43:07,608 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-04-03 00:43:07,608 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-04-03 00:43:07,608 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-04-03 00:43:07,608 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-04-03 00:43:07,608 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-04-03 00:43:07,608 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-04-03 00:43:07,608 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-04-03 00:43:07,608 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-04-03 00:43:07,608 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-04-03 00:43:07,608 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-04-03 00:43:07,608 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-04-03 00:43:07,608 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-04-03 00:43:07,608 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-04-03 00:43:07,608 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-04-03 00:43:07,608 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-04-03 00:43:07,608 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-04-03 00:43:07,608 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-04-03 00:43:07,608 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-04-03 00:43:07,608 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-04-03 00:43:07,608 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-04-03 00:43:07,608 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-04-03 00:43:07,608 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-04-03 00:43:07,608 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-04-03 00:43:07,608 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-04-03 00:43:07,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:07,758 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-03 00:43:07,792 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:07,792 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:07,796 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-03 00:43:07,830 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-03 00:43:07,835 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f701c443370> has no local changes
2024-04-03 00:43:07,835 [ 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#20 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/)'
2024-04-03 00:43:07,843 [ scc.git] DEBUG [detached HEAD bb22912] merge master -Dorg -Ssuccess-only
2024-04-03 00:43:07,843 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:07,843 [ scc.repo] DEBUG ## PRs found:
2024-04-03 00:43:08,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-04-03 00:43:08,180 [ scc.repo] DEBUG ## Branches found:
2024-04-03 00:43:08,180 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-03 00:43:08,180 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:08,180 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:08,184 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-03 00:43:08,188 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-03 00:43:08,188 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-03 00:43:08,193 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-03 00:43:08,197 [ scc.git] DEBUG Already up to date.
2024-04-03 00:43:08,197 [ scc.git] DEBUG ## Unique users: []
2024-04-03 00:43:08,197 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:08,197 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:08,201 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-03 00:43:08,234 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:08,235 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:08,239 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-03 00:43:08,271 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-03 00:43:08,276 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f701c4c0fa0> has no local changes
2024-04-03 00:43:08,276 [ 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#20 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/)'
2024-04-03 00:43:08,283 [ scc.git] DEBUG [detached HEAD 889dfcd] merge master -Dorg -Ssuccess-only
2024-04-03 00:43:08,283 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:08,283 [ scc.repo] DEBUG ## PRs found:
2024-04-03 00:43:08,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-04-03 00:43:08,635 [ scc.repo] DEBUG ## Branches found:
2024-04-03 00:43:08,635 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-03 00:43:08,635 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:08,636 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:08,640 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-03 00:43:08,644 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-03 00:43:08,644 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-03 00:43:08,648 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-03 00:43:08,653 [ scc.git] DEBUG Already up to date.
2024-04-03 00:43:08,653 [ scc.git] DEBUG ## Unique users: []
2024-04-03 00:43:08,653 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:08,653 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:08,658 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-03 00:43:08,691 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:08,691 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:08,695 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-03 00:43:08,728 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-03 00:43:08,733 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f701c460fd0> has no local changes
2024-04-03 00:43:08,733 [ 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#20 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/)'
2024-04-03 00:43:08,740 [ scc.git] DEBUG [detached HEAD f7ee4a4] merge master -Dorg -Ssuccess-only
2024-04-03 00:43:08,741 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:08,741 [ scc.git] INFO Overriding base-branch from master to main
2024-04-03 00:43:08,741 [ scc.repo] DEBUG ## PRs found:
2024-04-03 00:43:09,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-04-03 00:43:09,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-04-03 00:43:10,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-04-03 00:43:10,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-04-03 00:43:10,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-03 00:43:11,466 [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-03 00:43:11,930 [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-03 00:43:12,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-03 00:43:12,786 [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-03 00:43:12,787 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-03 00:43:12,787 [ scc.repo] DEBUG ## Branches found:
2024-04-03 00:43:12,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-03 00:43:12,787 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:12,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:12,792 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-04-03 00:43:12,796 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-03 00:43:12,796 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-04-03 00:43:12,800 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-04-03 00:43:12,805 [ scc.git] DEBUG Already up to date.
2024-04-03 00:43:12,805 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-03 00:43:13,234 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-04-03 00:43:13,235 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-03 00:43:13,238 [ scc.git] DEBUG ## Unique users: []
2024-04-03 00:43:13,238 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:13,238 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:13,243 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-03 00:43:13,247 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:13,251 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-03 00:43:13,260 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-04-03 00:43:13,260 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-04-03 00:43:13,260 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-03 00:43:13,261 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-03 00:43:13,265 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-03 00:43:13,270 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-04-03 00:43:13,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:13,524 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-03 00:43:13,528 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-03 00:43:13,533 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#20](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-04-03 00:43:13,537 [ scc.config] DEBUG Found github.token
2024-04-03 00:43:13,537 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-04-03 00:43:13,537 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-03 00:43:13,570 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:13,570 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:13,574 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-03 00:43:13,607 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-03 00:43:13,613 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f701c3cefd0> has no local changes
2024-04-03 00:43:13,613 [ 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#20 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/)'
2024-04-03 00:43:13,621 [ scc.git] DEBUG [detached HEAD cd962e9] merge master -Dorg -Ssuccess-only
2024-04-03 00:43:13,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:13,621 [ scc.repo] DEBUG ## PRs found:
2024-04-03 00:43:13,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-04-03 00:43:13,949 [ scc.repo] DEBUG ## Branches found:
2024-04-03 00:43:13,949 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-03 00:43:13,949 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:13,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:13,953 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-03 00:43:13,957 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-03 00:43:13,957 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-03 00:43:13,962 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-03 00:43:13,966 [ scc.git] DEBUG Already up to date.
2024-04-03 00:43:13,966 [ scc.git] DEBUG ## Unique users: []
2024-04-03 00:43:13,966 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:13,966 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:13,971 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-03 00:43:14,004 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:14,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:14,008 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-03 00:43:14,041 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-03 00:43:14,045 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f701c460f10> has no local changes
2024-04-03 00:43:14,046 [ 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#20 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/)'
2024-04-03 00:43:14,052 [ scc.git] DEBUG [detached HEAD 7c91f61] merge master -Dorg -Ssuccess-only
2024-04-03 00:43:14,053 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:14,053 [ scc.repo] DEBUG ## PRs found:
2024-04-03 00:43:14,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-04-03 00:43:14,416 [ scc.repo] DEBUG ## Branches found:
2024-04-03 00:43:14,416 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-03 00:43:14,416 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:14,416 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:14,420 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-03 00:43:14,424 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-03 00:43:14,424 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-03 00:43:14,428 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-03 00:43:14,433 [ scc.git] DEBUG Already up to date.
2024-04-03 00:43:14,433 [ scc.git] DEBUG ## Unique users: []
2024-04-03 00:43:14,433 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:14,433 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:14,437 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-03 00:43:14,470 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:14,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:14,474 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-03 00:43:14,507 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-03 00:43:14,512 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f701c3e2520> has no local changes
2024-04-03 00:43:14,512 [ 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#20 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/)'
2024-04-03 00:43:14,519 [ scc.git] DEBUG [detached HEAD 0f84327] merge master -Dorg -Ssuccess-only
2024-04-03 00:43:14,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:14,519 [ scc.repo] DEBUG ## PRs found:
2024-04-03 00:43:14,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-04-03 00:43:15,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-04-03 00:43:15,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-04-03 00:43:16,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-03 00:43:16,765 [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-03 00:43:17,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-03 00:43:17,680 [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-03 00:43:17,680 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-04-03 00:43:17,680 [ scc.repo] DEBUG ## Branches found:
2024-04-03 00:43:17,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-03 00:43:17,681 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:17,681 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:17,685 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-03 00:43:17,689 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-03 00:43:17,689 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-03 00:43:17,693 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-03 00:43:17,698 [ scc.git] DEBUG Already up to date.
2024-04-03 00:43:17,698 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-04-03 00:43:18,197 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-04-03 00:43:18,197 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-04-03 00:43:18,200 [ scc.git] DEBUG ## Unique users: []
2024-04-03 00:43:18,200 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:18,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:18,205 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-03 00:43:18,209 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:18,213 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-03 00:43:18,380 [ scc.git] DEBUG Auto-merging Dockerfile
2024-04-03 00:43:18,381 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-04-03 00:43:18,381 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-03 00:43:18,381 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-03 00:43:18,385 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-03 00:43:18,391 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-04-03 00:43:18,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:18,530 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-03 00:43:18,534 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-03 00:43:18,539 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#20](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-04-03 00:43:18,543 [ scc.config] DEBUG Found github.token
2024-04-03 00:43:18,543 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-04-03 00:43:18,543 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-03 00:43:18,576 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:18,576 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:18,580 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-03 00:43:18,612 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-03 00:43:18,618 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f701c3f88e0> has no local changes
2024-04-03 00:43:18,618 [ 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#20 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/)'
2024-04-03 00:43:18,625 [ scc.git] DEBUG [detached HEAD 2e9da20] merge master -Dorg -Ssuccess-only
2024-04-03 00:43:18,625 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:18,625 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-03 00:43:18,625 [ scc.repo] DEBUG ## PRs found:
2024-04-03 00:43:19,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-03 00:43:19,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-03 00:43:20,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-03 00:43:20,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-03 00:43:20,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-03 00:43:21,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-03 00:43:21,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-03 00:43:22,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-03 00:43:22,857 [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-03 00:43:23,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-03 00:43:23,707 [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-03 00:43:23,708 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-03 00:43:24,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-03 00:43:25,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-03 00:43:26,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-03 00:43:26,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-03 00:43:26,600 [ scc.repo] DEBUG ## Branches found:
2024-04-03 00:43:26,600 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-03 00:43:26,600 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:26,600 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:26,605 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-03 00:43:26,609 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-03 00:43:26,609 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-03 00:43:26,614 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-03 00:43:26,618 [ scc.git] DEBUG Already up to date.
2024-04-03 00:43:26,618 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-03 00:43:27,327 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-04-03 00:43:27,328 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-03 00:43:27,331 [ scc.git] DEBUG ## Unique users: []
2024-04-03 00:43:27,331 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:27,331 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:27,336 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-03 00:43:27,341 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:27,345 [ 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-03 00:43:27,371 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-03 00:43:27,371 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-03 00:43:27,372 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-03 00:43:27,372 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-03 00:43:27,376 [ scc.git] DEBUG Calling 'git reset --hard 2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-03 00:43:27,381 [ scc.git] DEBUG HEAD is now at 2078ac7 Bump version: 5.8.0 → 5.8.1.dev0
2024-04-03 00:43:27,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:27,533 [ scc.git] DEBUG Calling 'git merge-base 2078ac72dbf11f2733e685000a274eff81c2ac2d 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-03 00:43:27,539 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-03 00:43:27,543 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#20](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-03 00:43:27,547 [ scc.config] DEBUG Found github.token
2024-04-03 00:43:27,547 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-03 00:43:27,547 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-03 00:43:27,580 [ scc.git] DEBUG Get sha1 of %s
2024-04-03 00:43:27,580 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-03 00:43:27,584 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-03 00:43:27,616 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-03 00:43:27,622 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f701c3f2b50> has no local changes
2024-04-03 00:43:27,622 [ 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#20 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/)'
2024-04-03 00:43:27,629 [ scc.git] DEBUG [detached HEAD b9d7d5b] merge master -Dorg -Ssuccess-only
2024-04-03 00:43:27,629 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:27,629 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-03 00:43:27,693 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-04-03 00:43:27,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:27,960 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-04-03 00:43:27,964 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-04-03 00:43:28,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:28,360 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-04-03 00:43:28,364 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-04-03 00:43:28,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:28,770 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-04-03 00:43:28,774 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-04-03 00:43:29,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:29,175 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-04-03 00:43:29,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:29,570 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-04-03 00:43:29,573 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-04-03 00:43:29,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:30,002 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-04-03 00:43:30,006 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-04-03 00:43:30,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:30,405 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-04-03 00:43:30,409 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-04-03 00:43:30,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:30,807 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-04-03 00:43:30,811 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-04-03 00:43:31,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:31,210 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-04-03 00:43:31,214 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-04-03 00:43:31,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:31,610 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-04-03 00:43:31,613 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-04-03 00:43:32,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:32,010 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-04-03 00:43:32,014 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-04-03 00:43:32,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:32,409 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-04-03 00:43:32,413 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-04-03 00:43:32,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:32,822 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-04-03 00:43:33,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:33,226 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-04-03 00:43:33,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:33,634 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-04-03 00:43:33,638 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-04-03 00:43:34,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:34,050 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-04-03 00:43:34,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:34,455 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-04-03 00:43:34,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:34,852 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-04-03 00:43:34,855 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-04-03 00:43:35,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:35,254 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-04-03 00:43:35,258 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-04-03 00:43:35,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:35,661 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-04-03 00:43:35,665 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-04-03 00:43:36,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:36,070 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-04-03 00:43:36,074 [ scc.config] DEBUG Found submodule.scripts.url
2024-04-03 00:43:36,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-03 00:43:36,469 [ scc.config] DEBUG Found submodule.scripts.branch
2024-04-03 00:43:36,469 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-03 00:43:36,545 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7020aa7af0> has local changes
2024-04-03 00:43:36,545 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 543 will-moore 'Plate well labels' (stage: draft)
Already up to date.
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
Already up to date.
Merged PRs:
- PR 456 will-moore 'Don't use tiles for non-big movies'
- PR 460 will-moore 'Channel min spinner fix'
- PR 464 will-moore 'Tile load error warning'
- PR 465 will-moore 'Save as Figure'
- PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
- PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
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#20 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/20/)'
2024-04-03 00:43:36,558 [ scc.git] DEBUG [detached HEAD 350dd9e] merge master -Dorg -Ssuccess-only
2024-04-03 00:43:36,559 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-04-03 00:43:36,559 [ scc.merge] INFO Repository: ome/omero-plugins
2024-04-03 00:43:36,559 [ scc.merge] INFO Already up to date.
2024-04-03 00:43:36,559 [ scc.merge] INFO
2024-04-03 00:43:36,559 [ scc.merge] INFO
2024-04-03 00:43:36,559 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-04-03 00:43:36,559 [ scc.merge] INFO Already up to date.
2024-04-03 00:43:36,559 [ scc.merge] INFO
2024-04-03 00:43:36,559 [ scc.merge] INFO
2024-04-03 00:43:36,559 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-04-03 00:43:36,559 [ scc.merge] INFO Excluded PRs:
2024-04-03 00:43:36,559 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-04-03 00:43:36,559 [ scc.merge] INFO Already up to date.
2024-04-03 00:43:36,559 [ scc.merge] INFO
2024-04-03 00:43:36,559 [ scc.merge] INFO Merged PRs:
2024-04-03 00:43:36,559 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-04-03 00:43:36,559 [ scc.merge] INFO
2024-04-03 00:43:36,559 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-04-03 00:43:36,559 [ scc.merge] INFO Excluded PRs:
2024-04-03 00:43:36,559 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-04-03 00:43:36,559 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-04-03 00:43:36,559 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-04-03 00:43:36,559 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-04-03 00:43:36,559 [ scc.merge] INFO Already up to date.
2024-04-03 00:43:36,559 [ scc.merge] INFO
2024-04-03 00:43:36,559 [ scc.merge] INFO Merged PRs:
2024-04-03 00:43:36,560 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-04-03 00:43:36,560 [ scc.merge] INFO
2024-04-03 00:43:36,560 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-04-03 00:43:36,560 [ scc.merge] INFO Excluded PRs:
2024-04-03 00:43:36,560 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-03 00:43:36,560 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-04-03 00:43:36,560 [ scc.merge] INFO Already up to date.
2024-04-03 00:43:36,560 [ scc.merge] INFO
2024-04-03 00:43:36,560 [ scc.merge] INFO Merged PRs:
2024-04-03 00:43:36,560 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-04-03 00:43:36,560 [ scc.merge] INFO
2024-04-03 00:43:36,560 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-03 00:43:36,560 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-04-03 00:43:36,560 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-04-03 00:43:36,560 [ scc.merge] INFO
2024-04-03 00:43:36,560 [ scc.merge] INFO Repository: ome/omero-figure
2024-04-03 00:43:36,560 [ scc.merge] INFO Excluded PRs:
2024-04-03 00:43:36,560 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-04-03 00:43:36,560 [ scc.merge] INFO Already up to date.
2024-04-03 00:43:36,560 [ scc.merge] INFO
2024-04-03 00:43:36,560 [ scc.merge] INFO Merged PRs:
2024-04-03 00:43:36,560 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-04-03 00:43:36,560 [ scc.merge] INFO - PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
2024-04-03 00:43:36,560 [ scc.merge] INFO
2024-04-03 00:43:36,560 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-04-03 00:43:36,560 [ scc.merge] INFO Already up to date.
2024-04-03 00:43:36,560 [ scc.merge] INFO
2024-04-03 00:43:36,560 [ scc.merge] INFO Merged PRs:
2024-04-03 00:43:36,560 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-04-03 00:43:36,560 [ scc.merge] INFO
2024-04-03 00:43:36,560 [ scc.merge] INFO Repository: ome/omero-gallery
2024-04-03 00:43:36,560 [ scc.merge] INFO Already up to date.
2024-04-03 00:43:36,560 [ scc.merge] INFO
2024-04-03 00:43:36,560 [ scc.merge] INFO Merged PRs:
2024-04-03 00:43:36,560 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-03 00:43:36,560 [ scc.merge] INFO
2024-04-03 00:43:36,560 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-04-03 00:43:36,560 [ scc.merge] INFO Excluded PRs:
2024-04-03 00:43:36,561 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-04-03 00:43:36,561 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-04-03 00:43:36,561 [ scc.merge] INFO Already up to date.
2024-04-03 00:43:36,561 [ scc.merge] INFO
2024-04-03 00:43:36,561 [ scc.merge] INFO Merged PRs:
2024-04-03 00:43:36,561 [ scc.merge] INFO - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-04-03 00:43:36,561 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-04-03 00:43:36,561 [ scc.merge] INFO - PR 464 will-moore 'Tile load error warning'
2024-04-03 00:43:36,561 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-04-03 00:43:36,561 [ scc.merge] INFO - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-04-03 00:43:36,561 [ scc.merge] INFO - PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
2024-04-03 00:43:36,561 [ scc.merge] INFO
2024-04-03 00:43:36,561 [ scc.merge] INFO Repository: ome/omero-mapr
2024-04-03 00:43:36,561 [ scc.merge] INFO Excluded PRs:
2024-04-03 00:43:36,561 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-04-03 00:43:36,561 [ scc.merge] INFO Already up to date.
2024-04-03 00:43:36,561 [ scc.merge] INFO
2024-04-03 00:43:36,561 [ scc.merge] INFO Merged PRs:
2024-04-03 00:43:36,561 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-04-03 00:43:36,561 [ scc.merge] INFO
2024-04-03 00:43:36,561 [ scc.merge] INFO Repository: ome/omero-metadata
2024-04-03 00:43:36,561 [ scc.merge] INFO Already up to date.
2024-04-03 00:43:36,561 [ scc.merge] INFO
2024-04-03 00:43:36,561 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-03 00:43:36,561 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-03 00:43:36,561 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-03 00:43:36,561 [ scc.merge] INFO
2024-04-03 00:43:36,561 [ scc.merge] INFO Repository: ome/omero-parade
2024-04-03 00:43:36,561 [ scc.merge] INFO Excluded PRs:
2024-04-03 00:43:36,561 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-04-03 00:43:36,561 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-04-03 00:43:36,561 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-04-03 00:43:36,561 [ scc.merge] INFO Already up to date.
2024-04-03 00:43:36,561 [ scc.merge] INFO
2024-04-03 00:43:36,561 [ scc.merge] INFO Merged PRs:
2024-04-03 00:43:36,561 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-03 00:43:36,561 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-03 00:43:36,561 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-03 00:43:36,561 [ scc.merge] INFO
2024-04-03 00:43:36,561 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-04-03 00:43:36,562 [ scc.merge] INFO Already up to date.
2024-04-03 00:43:36,562 [ scc.merge] INFO
2024-04-03 00:43:36,562 [ scc.merge] INFO Merged PRs:
2024-04-03 00:43:36,562 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-04-03 00:43:36,562 [ scc.merge] INFO
2024-04-03 00:43:36,562 [ scc.merge] INFO Repository: ome/omero-rois
2024-04-03 00:43:36,562 [ scc.merge] INFO Excluded PRs:
2024-04-03 00:43:36,562 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-03 00:43:36,562 [ scc.merge] INFO Already up to date.
2024-04-03 00:43:36,562 [ scc.merge] INFO
2024-04-03 00:43:36,562 [ scc.merge] INFO Merged PRs:
2024-04-03 00:43:36,562 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-03 00:43:36,562 [ scc.merge] INFO
2024-04-03 00:43:36,562 [ scc.merge] INFO Repository: ome/omero-signup
2024-04-03 00:43:36,562 [ scc.merge] INFO Already up to date.
2024-04-03 00:43:36,562 [ scc.merge] INFO
2024-04-03 00:43:36,562 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-03 00:43:36,562 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-03 00:43:36,562 [ scc.merge] INFO
2024-04-03 00:43:36,562 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-04-03 00:43:36,562 [ scc.merge] INFO Already up to date.
2024-04-03 00:43:36,562 [ scc.merge] INFO
2024-04-03 00:43:36,562 [ scc.merge] INFO Merged PRs:
2024-04-03 00:43:36,562 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-03 00:43:36,562 [ scc.merge] INFO
2024-04-03 00:43:36,562 [ scc.merge] INFO Repository: ome/omero-upload
2024-04-03 00:43:36,562 [ scc.merge] INFO Already up to date.
2024-04-03 00:43:36,562 [ scc.merge] INFO
2024-04-03 00:43:36,562 [ scc.merge] INFO
2024-04-03 00:43:36,562 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-04-03 00:43:36,562 [ scc.merge] INFO Already up to date.
2024-04-03 00:43:36,562 [ scc.merge] INFO
2024-04-03 00:43:36,562 [ scc.merge] INFO
2024-04-03 00:43:36,562 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-04-03 00:43:36,562 [ scc.merge] INFO Excluded PRs:
2024-04-03 00:43:36,562 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-04-03 00:43:36,562 [ scc.merge] INFO Already up to date.
2024-04-03 00:43:36,562 [ scc.merge] INFO
2024-04-03 00:43:36,562 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-03 00:43:36,563 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-03 00:43:36,563 [ scc.merge] INFO
2024-04-03 00:43:36,563 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-04-03 00:43:36,563 [ scc.merge] INFO Already up to date.
2024-04-03 00:43:36,563 [ scc.merge] INFO
2024-04-03 00:43:36,563 [ scc.merge] INFO
2024-04-03 00:43:36,563 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-04-03 00:43:36,563 [ scc.merge] INFO Already up to date.
2024-04-03 00:43:36,563 [ scc.merge] INFO
2024-04-03 00:43:36,563 [ scc.merge] INFO
2024-04-03 00:43:36,563 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-04-03 00:43:36,563 [ scc.merge] INFO Already up to date.
2024-04-03 00:43:36,563 [ scc.merge] INFO
2024-04-03 00:43:36,563 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-03 00:43:36,563 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-04-03 00:43:36,563 [ scc.merge] INFO
2024-04-03 00:43:36,563 [ scc.merge] INFO Repository: ome/scripts
2024-04-03 00:43:36,563 [ scc.merge] INFO Excluded PRs:
2024-04-03 00:43:36,563 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-03 00:43:36,563 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-03 00:43:36,563 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-03 00:43:36,563 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-03 00:43:36,563 [ scc.merge] INFO Already up to date.
2024-04-03 00:43:36,563 [ scc.merge] INFO
2024-04-03 00:43:36,563 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-03 00:43:36,563 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-03 00:43:36,563 [ scc.merge] INFO
2024-04-03 00:43:36,563 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-03 00:43:36,563 [ scc.git] DEBUG Calling 'git remote'
2024-04-03 00:43:36,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-04-03 00:43:36,568 [ scc.git] DEBUG Calling 'git remote'
2024-04-03 00:43:36,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:36,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-04-03 00:43:36,572 [ scc.git] DEBUG Calling 'git remote'
2024-04-03 00:43:36,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:36,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-04-03 00:43:36,576 [ scc.git] DEBUG Calling 'git remote'
2024-04-03 00:43:36,580 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:36,580 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-04-03 00:43:36,580 [ scc.git] DEBUG Calling 'git remote'
2024-04-03 00:43:36,584 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:36,584 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-04-03 00:43:36,584 [ scc.git] DEBUG Calling 'git remote'
2024-04-03 00:43:36,588 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:36,589 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-03 00:43:36,589 [ scc.git] DEBUG Calling 'git remote'
2024-04-03 00:43:36,592 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:36,593 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-03 00:43:36,593 [ scc.git] DEBUG Calling 'git remote'
2024-04-03 00:43:36,597 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:36,597 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-03 00:43:36,597 [ scc.git] DEBUG Calling 'git remote'
2024-04-03 00:43:36,601 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:36,601 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-03 00:43:36,601 [ scc.git] DEBUG Calling 'git remote'
2024-04-03 00:43:36,605 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:36,605 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-03 00:43:36,605 [ scc.git] DEBUG Calling 'git remote'
2024-04-03 00:43:36,609 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:36,609 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-03 00:43:36,609 [ scc.git] DEBUG Calling 'git remote'
2024-04-03 00:43:36,613 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:36,613 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-03 00:43:36,614 [ scc.git] DEBUG Calling 'git remote'
2024-04-03 00:43:36,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:36,618 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-03 00:43:36,618 [ scc.git] DEBUG Calling 'git remote'
2024-04-03 00:43:36,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:36,622 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-03 00:43:36,622 [ scc.git] DEBUG Calling 'git remote'
2024-04-03 00:43:36,626 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:36,626 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-03 00:43:36,626 [ scc.git] DEBUG Calling 'git remote'
2024-04-03 00:43:36,630 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:36,630 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-03 00:43:36,630 [ scc.git] DEBUG Calling 'git remote'
2024-04-03 00:43:36,634 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:36,634 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-03 00:43:36,634 [ scc.git] DEBUG Calling 'git remote'
2024-04-03 00:43:36,638 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:36,638 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-03 00:43:36,638 [ scc.git] DEBUG Calling 'git remote'
2024-04-03 00:43:36,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:36,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-03 00:43:36,642 [ scc.git] DEBUG Calling 'git remote'
2024-04-03 00:43:36,646 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:36,646 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-03 00:43:36,646 [ scc.git] DEBUG Calling 'git remote'
2024-04-03 00:43:36,650 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:36,650 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-03 00:43:36,650 [ scc.git] DEBUG Calling 'git remote'
2024-04-03 00:43:36,654 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-03 00:43:36,655 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-03 00:43:36,655 [ scc.git] DEBUG Calling 'git remote'
2024-04-03 00:43:36,658 [ 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 7116bab] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 2ca566b
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from 3b7ccfa8
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from a232ed0
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from a0148a6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 2078ac7
nothing to commit, working tree clean
[detached HEAD e73fd39] 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-03 00:44:21,246 [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-03 00:44:30,327 [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-03 00:44:32,611 [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-03 00:44:37,099 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-03 00:45:24,233 [ 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/28c89a1b/images/svgs/logo.svg){kind=logo}
