Skipping 121 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-04-05 10:19:21,249 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael-min.js
2024-04-05 10:19:21,249 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael.js
2024-04-05 10:19:21,249 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/scaleraphael.js
2024-04-05 10:19:21,249 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/underscore-1.13.1-umd-min.js
2024-04-05 10:19:21,249 [ scc.git] DEBUG delete mode 100644 omero_figure/templates/figure/index.html
2024-04-05 10:19:21,249 [ scc.git] DEBUG delete mode 100644 spec/ViewportViewSpec.js
2024-04-05 10:19:21,249 [ scc.git] DEBUG delete mode 100644 spec/images/testImage.png
2024-04-05 10:19:21,249 [ scc.git] DEBUG delete mode 100644 spec/javascripts/PanelSpec.js
2024-04-05 10:19:21,249 [ scc.git] DEBUG delete mode 100644 spec/javascripts/ViewportViewSpec.js
2024-04-05 10:19:21,249 [ scc.git] DEBUG delete mode 100644 spec/javascripts/fixtures/previewTab.html
2024-04-05 10:19:21,249 [ scc.git] DEBUG create mode 100644 src/.env
2024-04-05 10:19:21,249 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/css/figure.css (70%)
2024-04-05 10:19:21,249 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/arrow-icon-16.png (100%)
2024-04-05 10:19:21,249 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-04-05 10:19:21,250 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-04-05 10:19:21,250 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-04-05 10:19:21,250 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-04-05 10:19:21,250 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-04-05 10:19:21,250 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-04-05 10:19:21,250 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-04-05 10:19:21,250 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-04-05 10:19:21,250 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-04-05 10:19:21,250 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-05 10:19:21,250 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-04-05 10:19:21,250 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-04-05 10:19:21,250 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-04-05 10:19:21,250 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-04-05 10:19:21,250 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-04-05 10:19:21,250 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-04-05 10:19:21,250 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-04-05 10:19:21,250 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-04-05 10:19:21,250 [ scc.git] DEBUG create mode 100644 src/index.html
2024-04-05 10:19:21,250 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-04-05 10:19:21,250 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-04-05 10:19:21,250 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-04-05 10:19:21,251 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-04-05 10:19:21,251 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-04-05 10:19:21,251 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-04-05 10:19:21,251 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-04-05 10:19:21,251 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-04-05 10:19:21,251 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-04-05 10:19:21,251 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-05 10:19:21,251 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-04-05 10:19:21,251 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-04-05 10:19:21,251 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-04-05 10:19:21,251 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-04-05 10:19:21,251 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-04-05 10:19:21,251 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-04-05 10:19:21,251 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-04-05 10:19:21,251 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-04-05 10:19:21,251 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-04-05 10:19:21,251 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-04-05 10:19:21,251 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-04-05 10:19:21,251 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-04-05 10:19:21,251 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-04-05 10:19:21,251 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-04-05 10:19:21,251 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-04-05 10:19:21,251 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-04-05 10:19:21,252 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-04-05 10:19:21,252 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-04-05 10:19:21,252 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-04-05 10:19:21,252 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-04-05 10:19:21,252 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-04-05 10:19:21,252 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-04-05 10:19:21,252 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-04-05 10:19:21,252 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-04-05 10:19:21,252 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-04-05 10:19:21,252 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-04-05 10:19:21,252 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-04-05 10:19:21,252 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-04-05 10:19:21,252 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-04-05 10:19:21,252 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-04-05 10:19:21,252 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-04-05 10:19:21,252 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-04-05 10:19:21,252 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-04-05 10:19:21,252 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-04-05 10:19:21,252 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-04-05 10:19:21,252 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-04-05 10:19:21,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:19:21,393 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...32b0ccd55ce3c95dabcf8ebf817b032e4b864438'
2024-04-05 10:19:21,406 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:19:21,414 [ 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-05 10:19:21,452 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-05 10:19:21,456 [ scc.git] DEBUG omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 6 +++---
2024-04-05 10:19:21,456 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-04-05 10:19:21,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:19:21,813 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-05 10:19:21,855 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:19:21,855 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:19:21,862 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-05 10:19:21,903 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-05 10:19:21,917 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7cc9c04df0> has no local changes
2024-04-05 10:19:21,917 [ 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#22 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/)'
2024-04-05 10:19:21,932 [ scc.git] DEBUG [detached HEAD 6807b18b] merge master -Dorg -Ssuccess-only
2024-04-05 10:19:21,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:19:21,933 [ scc.repo] DEBUG ## PRs found:
2024-04-05 10:19:22,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-04-05 10:19:22,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-04-05 10:19:23,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-04-05 10:19:23,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-05 10:19:24,218 [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-05 10:19:24,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-05 10:19:25,131 [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-05 10:19:25,132 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-04-05 10:19:25,132 [ scc.repo] DEBUG ## Branches found:
2024-04-05 10:19:25,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-05 10:19:25,132 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:19:25,133 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:19:25,139 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-05 10:19:25,146 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-05 10:19:25,146 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-05 10:19:25,152 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-05 10:19:25,158 [ scc.git] DEBUG Already up to date.
2024-04-05 10:19:25,158 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-04-05 10:19:25,592 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-04-05 10:19:25,592 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-04-05 10:19:25,598 [ scc.git] DEBUG ## Unique users: []
2024-04-05 10:19:25,598 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:19:25,599 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:19:25,607 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-05 10:19:25,615 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:19:25,623 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-05 10:19:25,670 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-04-05 10:19:25,671 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-05 10:19:25,675 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-04-05 10:19:25,675 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-05 10:19:25,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:19:25,834 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-05 10:19:25,876 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:19:25,876 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:19:25,882 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-05 10:19:25,928 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-05 10:19:25,937 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7cc8b7b520> has no local changes
2024-04-05 10:19:25,937 [ 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#22 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/)'
2024-04-05 10:19:25,948 [ scc.git] DEBUG [detached HEAD e235f08] merge master -Dorg -Ssuccess-only
2024-04-05 10:19:25,949 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:19:25,949 [ scc.repo] DEBUG ## PRs found:
2024-04-05 10:19:26,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-04-05 10:19:26,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-04-05 10:19:26,837 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-05 10:19:27,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-05 10:19:27,879 [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-05 10:19:28,397 [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-05 10:19:28,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-05 10:19:29,339 [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-05 10:19:29,340 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-05 10:19:29,341 [ scc.repo] DEBUG ## Branches found:
2024-04-05 10:19:29,341 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-05 10:19:29,341 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:19:29,341 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:19:29,348 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-05 10:19:29,355 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-05 10:19:29,355 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-05 10:19:29,362 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-05 10:19:29,369 [ scc.git] DEBUG Already up to date.
2024-04-05 10:19:29,369 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-04-05 10:19:29,762 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-04-05 10:19:29,762 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-04-05 10:19:29,771 [ scc.git] DEBUG ## Unique users: []
2024-04-05 10:19:29,771 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:19:29,771 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:19:29,780 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-05 10:19:29,789 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:19:29,801 [ 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-05 10:19:29,817 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-05 10:19:29,821 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-04-05 10:19:29,821 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-04-05 10:19:29,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:19:29,982 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-05 10:19:30,059 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:19:30,060 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:19:30,068 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-05 10:19:30,122 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-05 10:19:30,131 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7cc8b70970> has no local changes
2024-04-05 10:19:30,131 [ 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#22 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/)'
2024-04-05 10:19:30,142 [ scc.git] DEBUG [detached HEAD 5cfade8] merge master -Dorg -Ssuccess-only
2024-04-05 10:19:30,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:19:30,143 [ scc.repo] DEBUG ## PRs found:
2024-04-05 10:19:30,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-04-05 10:19:31,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/468 HTTP/1.1" 200 None
2024-04-05 10:19:31,283 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-05 10:19:31,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d HTTP/1.1" 200 None
2024-04-05 10:19:32,400 [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-05 10:19:32,919 [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-05 10:19:33,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d HTTP/1.1" 200 None
2024-04-05 10:19:33,773 [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-05 10:19:33,774 [ scc.repo] DEBUG - PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
2024-04-05 10:19:34,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/467 HTTP/1.1" 200 None
2024-04-05 10:19:34,244 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-05 10:19:34,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-04-05 10:19:35,313 [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-05 10:19:35,780 [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-05 10:19:36,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-04-05 10:19:36,720 [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-05 10:19:36,721 [ scc.repo] DEBUG - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-04-05 10:19:37,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-04-05 10:19:37,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-04-05 10:19:38,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407 HTTP/1.1" 200 None
2024-04-05 10:19:38,580 [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-05 10:19:39,037 [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-05 10:19:39,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407 HTTP/1.1" 200 None
2024-04-05 10:19:39,882 [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-05 10:19:39,884 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-04-05 10:19:40,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464 HTTP/1.1" 200 None
2024-04-05 10:19:40,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464/comments HTTP/1.1" 200 None
2024-04-05 10:19:41,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-04-05 10:19:41,816 [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-05 10:19:42,268 [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-05 10:19:42,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-04-05 10:19:43,151 [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-05 10:19:43,152 [ scc.repo] DEBUG - PR 464 will-moore 'Tile load error warning'
2024-04-05 10:19:43,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-04-05 10:19:44,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-04-05 10:19:44,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-05 10:19:45,064 [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-05 10:19:45,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-05 10:19:45,939 [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-05 10:19:45,941 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-04-05 10:19:46,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456 HTTP/1.1" 200 None
2024-04-05 10:19:46,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456/comments HTTP/1.1" 200 None
2024-04-05 10:19:47,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-04-05 10:19:47,806 [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-05 10:19:48,254 [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-05 10:19:48,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-04-05 10:19:49,180 [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-05 10:19:49,181 [ scc.repo] DEBUG - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-04-05 10:19:49,181 [ scc.repo] DEBUG ## Branches found:
2024-04-05 10:19:49,181 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-05 10:19:49,182 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:19:49,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:19:49,187 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-05 10:19:49,192 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-05 10:19:49,192 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-05 10:19:49,198 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-05 10:19:49,203 [ scc.git] DEBUG Already up to date.
2024-04-05 10:19:49,204 [ scc.git] DEBUG Calling 'git fetch origin pull/456/head'
2024-04-05 10:19:49,700 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-05 10:19:49,700 [ scc.git] DEBUG * branch refs/pull/456/head -> FETCH_HEAD
2024-04-05 10:19:49,708 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-04-05 10:19:50,152 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-05 10:19:50,152 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-04-05 10:19:50,158 [ scc.git] DEBUG Calling 'git fetch origin pull/464/head'
2024-04-05 10:19:50,722 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-05 10:19:50,722 [ scc.git] DEBUG * branch refs/pull/464/head -> FETCH_HEAD
2024-04-05 10:19:50,729 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-04-05 10:19:51,587 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-05 10:19:51,587 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-04-05 10:19:51,593 [ scc.git] DEBUG Calling 'git fetch origin pull/467/head'
2024-04-05 10:19:52,002 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-05 10:19:52,003 [ scc.git] DEBUG * branch refs/pull/467/head -> FETCH_HEAD
2024-04-05 10:19:52,014 [ scc.git] DEBUG Calling 'git fetch origin pull/468/head'
2024-04-05 10:19:52,431 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-05 10:19:52,431 [ scc.git] DEBUG * branch refs/pull/468/head -> FETCH_HEAD
2024-04-05 10:19:52,436 [ scc.git] DEBUG ## Unique users: []
2024-04-05 10:19:52,437 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:19:52,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:19:52,443 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-04-05 10:19:52,450 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:19:52,456 [ 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-05 10:19:52,622 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-05 10:19:52,625 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 5 +++--
2024-04-05 10:19:52,625 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-04-05 10:19:52,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:19:52,781 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-05 10:19:52,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:19:52,794 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-05 10:19:52,837 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-05 10:19:52,841 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-04-05 10:19:52,841 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-04-05 10:19:52,841 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-04-05 10:19:53,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:19:53,190 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-04-05 10:19:53,197 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:19:53,205 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 464 (Tile load error warning) 97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-04-05 10:19:53,255 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-05 10:19:53,261 [ scc.git] DEBUG css/app.css | 22 ++++++++++++++++++++++
2024-04-05 10:19:53,261 [ scc.git] DEBUG src/events/events.js | 2 ++
2024-04-05 10:19:53,261 [ scc.git] DEBUG src/index-dev.html | 6 +++---
2024-04-05 10:19:53,261 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 2 +-
2024-04-05 10:19:53,261 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 4 +++-
2024-04-05 10:19:53,261 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 39 +++++++++++++++++++++++++++++++++++++--
2024-04-05 10:19:53,262 [ scc.git] DEBUG 6 files changed, 68 insertions(+), 7 deletions(-)
2024-04-05 10:19:53,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:19:53,601 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...105a9369cdb853508da5ec4e0839c6f448bf3407'
2024-04-05 10:19:53,608 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:19:53,616 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 105a9369cdb853508da5ec4e0839c6f448bf3407'
2024-04-05 10:19:53,767 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-04-05 10:19:53,768 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-05 10:19:53,774 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-04-05 10:19:53,774 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-04-05 10:19:53,774 [ scc.git] DEBUG src/app/header.html | 5 +
2024-04-05 10:19:53,774 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-04-05 10:19:53,774 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-04-05 10:19:53,775 [ scc.git] DEBUG src/utils/figure.js | 210 ++++++++++++++++++++++++++++++++++++++++++
2024-04-05 10:19:53,775 [ scc.git] DEBUG 6 files changed, 283 insertions(+), 6 deletions(-)
2024-04-05 10:19:53,775 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-04-05 10:19:54,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:19:54,005 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e253cccecbd349db3bcb16514f5c8b2c4185e6'
2024-04-05 10:19:54,025 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:19:54,038 [ 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-05 10:19:54,172 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-05 10:19:54,181 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2024-04-05 10:19:54,182 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2024-04-05 10:19:54,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:19:54,403 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9f06f398570cddff1332355e1eda0fe54d88881d'
2024-04-05 10:19:54,433 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:19:54,440 [ 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-05 10:19:54,548 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-05 10:19:54,549 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-05 10:19:54,559 [ scc.git] DEBUG package-lock.json | 76 +++++++++++++++++++++++++++----------------------------
2024-04-05 10:19:54,560 [ scc.git] DEBUG 1 file changed, 38 insertions(+), 38 deletions(-)
2024-04-05 10:19:54,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:19:54,795 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-05 10:19:54,843 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:19:54,843 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:19:54,850 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-05 10:19:54,896 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-05 10:19:54,906 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7cc9ba1f70> has no local changes
2024-04-05 10:19:54,907 [ 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#22 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/)'
2024-04-05 10:19:54,921 [ scc.git] DEBUG [detached HEAD caab461] merge master -Dorg -Ssuccess-only
2024-04-05 10:19:54,921 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:19:54,921 [ scc.repo] DEBUG ## PRs found:
2024-04-05 10:19:55,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-04-05 10:19:55,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-04-05 10:19:56,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-04-05 10:19:56,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-05 10:19:57,268 [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-05 10:19:57,733 [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-05 10:19:58,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-05 10:19:58,597 [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-05 10:19:58,599 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-04-05 10:19:58,599 [ scc.repo] DEBUG ## Branches found:
2024-04-05 10:19:58,600 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-05 10:19:58,600 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:19:58,600 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:19:58,606 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-05 10:19:58,612 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-05 10:19:58,612 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-05 10:19:58,618 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-05 10:19:58,625 [ scc.git] DEBUG Already up to date.
2024-04-05 10:19:58,625 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-04-05 10:19:59,008 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-04-05 10:19:59,008 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-04-05 10:19:59,014 [ scc.git] DEBUG ## Unique users: []
2024-04-05 10:19:59,015 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:19:59,015 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:19:59,022 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-05 10:19:59,031 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:19:59,039 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-05 10:19:59,055 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-05 10:19:59,059 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-04-05 10:19:59,059 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-04-05 10:19:59,059 [ scc.git] DEBUG requirements.txt | 2 +-
2024-04-05 10:19:59,059 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-04-05 10:19:59,059 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-04-05 10:19:59,059 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-04-05 10:19:59,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:19:59,232 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-05 10:19:59,294 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:19:59,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:19:59,302 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-05 10:19:59,345 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-05 10:19:59,354 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7cc9bd84c0> has no local changes
2024-04-05 10:19:59,355 [ 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#22 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/)'
2024-04-05 10:19:59,367 [ scc.git] DEBUG [detached HEAD a371657] merge master -Dorg -Ssuccess-only
2024-04-05 10:19:59,367 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:19:59,368 [ scc.repo] DEBUG ## PRs found:
2024-04-05 10:19:59,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-04-05 10:20:00,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-04-05 10:20:00,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-04-05 10:20:01,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-05 10:20:01,726 [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-05 10:20:02,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-05 10:20:02,652 [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-05 10:20:02,652 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-05 10:20:03,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-04-05 10:20:03,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-04-05 10:20:04,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-05 10:20:04,549 [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-05 10:20:04,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-05 10:20:05,430 [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-05 10:20:05,430 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-05 10:20:05,430 [ scc.repo] DEBUG ## Branches found:
2024-04-05 10:20:05,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-05 10:20:05,431 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:05,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:05,437 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-05 10:20:05,441 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-05 10:20:05,441 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-05 10:20:05,447 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-05 10:20:05,453 [ scc.git] DEBUG Already up to date.
2024-04-05 10:20:05,454 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-04-05 10:20:06,020 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-05 10:20:06,024 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-04-05 10:20:06,032 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-04-05 10:20:06,670 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-05 10:20:06,671 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-04-05 10:20:06,677 [ scc.git] DEBUG ## Unique users: []
2024-04-05 10:20:06,677 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:06,677 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:06,684 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-05 10:20:06,692 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:06,699 [ 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-05 10:20:06,792 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-04-05 10:20:06,793 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-04-05 10:20:06,793 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-05 10:20:06,793 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-05 10:20:06,793 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-05 10:20:06,794 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-05 10:20:06,801 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-05 10:20:06,808 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-05 10:20:06,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:20:06,965 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-05 10:20:06,984 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-05 10:20:07,004 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#22](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-04-05 10:20:07,023 [ scc.config] DEBUG Found github.token
2024-04-05 10:20:07,024 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-04-05 10:20:07,024 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-05 10:20:07,044 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:07,059 [ 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-05 10:20:07,103 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-05 10:20:07,103 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-05 10:20:07,103 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-04-05 10:20:07,103 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-05 10:20:07,104 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-05 10:20:07,113 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-05 10:20:07,121 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-05 10:20:07,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:20:07,390 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-05 10:20:07,399 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-05 10:20:07,405 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#22](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/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-05 10:20:07,411 [ scc.config] DEBUG Found github.token
2024-04-05 10:20:07,411 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-04-05 10:20:07,412 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-05 10:20:07,459 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:07,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:07,473 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-05 10:20:07,524 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-05 10:20:07,533 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7cc9b9feb0> has no local changes
2024-04-05 10:20:07,533 [ 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#22 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/)'
2024-04-05 10:20:07,545 [ scc.git] DEBUG [detached HEAD f6c2bc1] merge master -Dorg -Ssuccess-only
2024-04-05 10:20:07,546 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:20:07,546 [ scc.repo] DEBUG ## PRs found:
2024-04-05 10:20:07,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-04-05 10:20:08,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-04-05 10:20:08,448 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-05 10:20:09,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-05 10:20:09,577 [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-05 10:20:10,052 [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-05 10:20:10,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-05 10:20:11,046 [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-05 10:20:11,047 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-05 10:20:11,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-04-05 10:20:11,527 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-05 10:20:12,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-05 10:20:12,602 [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-05 10:20:13,093 [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-05 10:20:13,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-05 10:20:13,998 [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-05 10:20:13,999 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-05 10:20:14,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-04-05 10:20:14,485 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-05 10:20:15,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-05 10:20:15,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-05 10:20:16,014 [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-05 10:20:16,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-05 10:20:16,969 [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-05 10:20:16,972 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-05 10:20:17,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-04-05 10:20:17,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-04-05 10:20:18,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-04-05 10:20:18,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-04-05 10:20:19,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-04-05 10:20:19,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-04-05 10:20:19,762 [ scc.repo] DEBUG ## Branches found:
2024-04-05 10:20:19,763 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-05 10:20:19,763 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:19,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:19,773 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-05 10:20:19,781 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-05 10:20:19,781 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-05 10:20:19,789 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-05 10:20:19,797 [ scc.git] DEBUG Already up to date.
2024-04-05 10:20:19,798 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-04-05 10:20:20,218 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-05 10:20:20,218 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-04-05 10:20:20,225 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-04-05 10:20:20,637 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-05 10:20:20,637 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-04-05 10:20:20,644 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-05 10:20:21,043 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-05 10:20:21,043 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-05 10:20:21,050 [ scc.git] DEBUG ## Unique users: []
2024-04-05 10:20:21,050 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:21,050 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:21,058 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-05 10:20:21,065 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:21,070 [ 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-05 10:20:21,079 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-05 10:20:21,082 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-04-05 10:20:21,082 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-04-05 10:20:21,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:20:21,248 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-05 10:20:21,258 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:21,263 [ 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-05 10:20:21,316 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-05 10:20:21,316 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-05 10:20:21,320 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-04-05 10:20:21,320 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-04-05 10:20:21,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:20:21,654 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-05 10:20:21,660 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:21,666 [ 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-05 10:20:21,693 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-05 10:20:21,694 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-05 10:20:21,699 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-04-05 10:20:21,699 [ scc.git] DEBUG package.json | 2 +-
2024-04-05 10:20:21,699 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-04-05 10:20:22,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:20:22,053 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-05 10:20:22,102 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:22,102 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:22,108 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-05 10:20:22,152 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-05 10:20:22,159 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7cc82dbf40> has no local changes
2024-04-05 10:20:22,159 [ 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#22 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/)'
2024-04-05 10:20:22,168 [ scc.git] DEBUG [detached HEAD 51d6aca] merge master -Dorg -Ssuccess-only
2024-04-05 10:20:22,168 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:20:22,168 [ scc.repo] DEBUG ## PRs found:
2024-04-05 10:20:22,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-04-05 10:20:22,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-04-05 10:20:23,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-05 10:20:23,953 [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-05 10:20:24,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-05 10:20:24,879 [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-05 10:20:24,880 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-04-05 10:20:24,880 [ scc.repo] DEBUG ## Branches found:
2024-04-05 10:20:24,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-05 10:20:24,881 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:24,881 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:24,888 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-05 10:20:24,895 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-05 10:20:24,896 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-05 10:20:24,903 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-05 10:20:24,910 [ scc.git] DEBUG Already up to date.
2024-04-05 10:20:24,910 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-05 10:20:25,307 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-04-05 10:20:25,307 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-05 10:20:25,314 [ scc.git] DEBUG ## Unique users: []
2024-04-05 10:20:25,314 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:25,314 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:25,325 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-05 10:20:25,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:25,341 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-05 10:20:25,351 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-05 10:20:25,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:20:25,504 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-05 10:20:25,547 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:25,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:25,553 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-05 10:20:25,593 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-05 10:20:25,602 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7cc832c280> has no local changes
2024-04-05 10:20:25,603 [ 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#22 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/)'
2024-04-05 10:20:25,613 [ scc.git] DEBUG [detached HEAD d4766c2] merge master -Dorg -Ssuccess-only
2024-04-05 10:20:25,614 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:20:25,614 [ scc.repo] DEBUG ## PRs found:
2024-04-05 10:20:26,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-04-05 10:20:26,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-04-05 10:20:27,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-04-05 10:20:27,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-04-05 10:20:27,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-05 10:20:28,502 [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-05 10:20:29,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-05 10:20:29,417 [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-05 10:20:29,418 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-05 10:20:29,418 [ scc.repo] DEBUG ## Branches found:
2024-04-05 10:20:29,418 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-05 10:20:29,418 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:29,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:29,426 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-05 10:20:29,434 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-05 10:20:29,434 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-05 10:20:29,441 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-05 10:20:29,448 [ scc.git] DEBUG Already up to date.
2024-04-05 10:20:29,448 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-04-05 10:20:30,026 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-04-05 10:20:30,026 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-04-05 10:20:30,032 [ scc.git] DEBUG ## Unique users: []
2024-04-05 10:20:30,032 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:30,032 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:30,039 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-05 10:20:30,046 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:30,053 [ 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-05 10:20:30,064 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-04-05 10:20:30,065 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-05 10:20:30,068 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-04-05 10:20:30,068 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-04-05 10:20:30,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:20:30,234 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-05 10:20:30,277 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:30,278 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:30,295 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-05 10:20:30,337 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-05 10:20:30,345 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7cc834c580> has no local changes
2024-04-05 10:20:30,345 [ 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#22 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/)'
2024-04-05 10:20:30,358 [ scc.git] DEBUG [detached HEAD b3f24cc] merge master -Dorg -Ssuccess-only
2024-04-05 10:20:30,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:20:30,359 [ scc.repo] DEBUG ## PRs found:
2024-04-05 10:20:30,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-04-05 10:20:31,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-04-05 10:20:31,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-04-05 10:20:32,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-05 10:20:32,624 [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-05 10:20:33,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-05 10:20:33,545 [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-05 10:20:33,546 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-05 10:20:33,546 [ scc.repo] DEBUG ## Branches found:
2024-04-05 10:20:33,546 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-05 10:20:33,546 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:33,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:33,554 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-05 10:20:33,562 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-05 10:20:33,562 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-05 10:20:33,571 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-05 10:20:33,579 [ scc.git] DEBUG Already up to date.
2024-04-05 10:20:33,580 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-05 10:20:34,061 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-04-05 10:20:34,062 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-05 10:20:34,067 [ scc.git] DEBUG ## Unique users: []
2024-04-05 10:20:34,067 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:34,067 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:34,073 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-05 10:20:34,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:34,086 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-05 10:20:34,162 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-04-05 10:20:34,162 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-04-05 10:20:34,162 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-04-05 10:20:34,162 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-04-05 10:20:34,162 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-04-05 10:20:34,163 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-04-05 10:20:34,163 [ scc.git] DEBUG Auto-merging setup.py
2024-04-05 10:20:34,163 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-04-05 10:20:34,163 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-05 10:20:34,163 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-05 10:20:34,171 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-05 10:20:34,181 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-04-05 10:20:34,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:20:34,344 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-05 10:20:34,352 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-05 10:20:34,359 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#22](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
- setup.py
--conflicts
2024-04-05 10:20:34,365 [ scc.config] DEBUG Found github.token
2024-04-05 10:20:34,365 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-04-05 10:20:34,366 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-05 10:20:34,411 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:34,411 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:34,418 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-05 10:20:34,463 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-05 10:20:34,471 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7cc832c4f0> has no local changes
2024-04-05 10:20:34,472 [ 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#22 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/)'
2024-04-05 10:20:34,484 [ scc.git] DEBUG [detached HEAD 5134067] merge master -Dorg -Ssuccess-only
2024-04-05 10:20:34,485 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:20:34,485 [ scc.repo] DEBUG ## PRs found:
2024-04-05 10:20:34,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-04-05 10:20:35,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-04-05 10:20:35,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-04-05 10:20:36,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-05 10:20:36,690 [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-05 10:20:37,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-05 10:20:37,624 [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-05 10:20:37,625 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-05 10:20:37,625 [ scc.repo] DEBUG ## Branches found:
2024-04-05 10:20:37,625 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-05 10:20:37,626 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:37,626 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:37,634 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-05 10:20:37,642 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-05 10:20:37,642 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-05 10:20:37,651 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-05 10:20:37,659 [ scc.git] DEBUG Already up to date.
2024-04-05 10:20:37,659 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-04-05 10:20:38,140 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-04-05 10:20:38,140 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-04-05 10:20:38,146 [ scc.git] DEBUG ## Unique users: []
2024-04-05 10:20:38,146 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:38,147 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:38,153 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-04-05 10:20:38,161 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:38,167 [ 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-05 10:20:38,191 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-05 10:20:38,194 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-04-05 10:20:38,194 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-04-05 10:20:38,194 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-04-05 10:20:38,194 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-04-05 10:20:38,194 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-04-05 10:20:38,194 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-04-05 10:20:38,194 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-04-05 10:20:38,194 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-04-05 10:20:38,194 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-04-05 10:20:38,194 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-04-05 10:20:38,194 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-04-05 10:20:38,196 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-04-05 10:20:38,196 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-04-05 10:20:38,196 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-04-05 10:20:38,196 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-04-05 10:20:38,197 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-04-05 10:20:38,197 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-04-05 10:20:38,197 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-04-05 10:20:38,197 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-04-05 10:20:38,197 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-04-05 10:20:38,197 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-04-05 10:20:38,197 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-04-05 10:20:38,197 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-04-05 10:20:38,197 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-04-05 10:20:38,197 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-04-05 10:20:38,197 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-04-05 10:20:38,197 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-04-05 10:20:38,197 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-04-05 10:20:38,197 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-04-05 10:20:38,197 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-04-05 10:20:38,197 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-04-05 10:20:38,197 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-04-05 10:20:38,197 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-04-05 10:20:38,197 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-04-05 10:20:38,197 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-04-05 10:20:38,197 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-04-05 10:20:38,198 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-04-05 10:20:38,198 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-04-05 10:20:38,198 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-04-05 10:20:38,198 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-04-05 10:20:38,198 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-04-05 10:20:38,198 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-04-05 10:20:38,198 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-04-05 10:20:38,198 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-04-05 10:20:38,198 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-04-05 10:20:38,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:20:38,357 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-05 10:20:38,401 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:38,401 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:38,410 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-05 10:20:38,461 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-05 10:20:38,472 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7cc82db3a0> has no local changes
2024-04-05 10:20:38,472 [ 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#22 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/)'
2024-04-05 10:20:38,487 [ scc.git] DEBUG [detached HEAD f27f90a] merge master -Dorg -Ssuccess-only
2024-04-05 10:20:38,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:20:38,489 [ scc.repo] DEBUG ## PRs found:
2024-04-05 10:20:38,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-04-05 10:20:38,783 [ scc.repo] DEBUG ## Branches found:
2024-04-05 10:20:38,784 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-05 10:20:38,784 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:38,784 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:38,792 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-05 10:20:38,798 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-05 10:20:38,799 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-05 10:20:38,808 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-05 10:20:38,818 [ scc.git] DEBUG Already up to date.
2024-04-05 10:20:38,819 [ scc.git] DEBUG ## Unique users: []
2024-04-05 10:20:38,819 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:38,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:38,827 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-05 10:20:38,887 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:38,887 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:38,898 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-05 10:20:38,952 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-05 10:20:38,961 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7cc8329fd0> has no local changes
2024-04-05 10:20:38,962 [ 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#22 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/)'
2024-04-05 10:20:38,977 [ scc.git] DEBUG [detached HEAD 624b81b] merge master -Dorg -Ssuccess-only
2024-04-05 10:20:38,977 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:20:38,978 [ scc.repo] DEBUG ## PRs found:
2024-04-05 10:20:39,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-04-05 10:20:39,301 [ scc.repo] DEBUG ## Branches found:
2024-04-05 10:20:39,302 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-05 10:20:39,302 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:39,302 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:39,309 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-05 10:20:39,315 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-05 10:20:39,315 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-05 10:20:39,321 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-05 10:20:39,327 [ scc.git] DEBUG Already up to date.
2024-04-05 10:20:39,328 [ scc.git] DEBUG ## Unique users: []
2024-04-05 10:20:39,328 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:39,328 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:39,333 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-05 10:20:39,374 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:39,375 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:39,381 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-05 10:20:39,420 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-05 10:20:39,428 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7cc82e6fd0> has no local changes
2024-04-05 10:20:39,428 [ 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#22 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/)'
2024-04-05 10:20:39,437 [ scc.git] DEBUG [detached HEAD 5100b58] merge master -Dorg -Ssuccess-only
2024-04-05 10:20:39,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:20:39,437 [ scc.git] INFO Overriding base-branch from master to main
2024-04-05 10:20:39,438 [ scc.repo] DEBUG ## PRs found:
2024-04-05 10:20:39,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-04-05 10:20:40,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-04-05 10:20:40,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-04-05 10:20:41,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-04-05 10:20:41,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-05 10:20:42,239 [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-05 10:20:42,713 [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-05 10:20:43,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-05 10:20:43,583 [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-05 10:20:43,585 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-05 10:20:43,585 [ scc.repo] DEBUG ## Branches found:
2024-04-05 10:20:43,586 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-05 10:20:43,586 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:43,586 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:43,597 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-04-05 10:20:43,608 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-05 10:20:43,608 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-04-05 10:20:43,620 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-04-05 10:20:43,633 [ scc.git] DEBUG Already up to date.
2024-04-05 10:20:43,634 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-05 10:20:44,104 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-04-05 10:20:44,104 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-05 10:20:44,122 [ scc.git] DEBUG ## Unique users: []
2024-04-05 10:20:44,123 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:44,123 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:44,143 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-05 10:20:44,166 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:44,194 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-05 10:20:44,241 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-04-05 10:20:44,242 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-04-05 10:20:44,242 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-05 10:20:44,243 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-05 10:20:44,261 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-05 10:20:44,277 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-04-05 10:20:44,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:20:44,446 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-05 10:20:44,476 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-05 10:20:44,500 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#22](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-04-05 10:20:44,518 [ scc.config] DEBUG Found github.token
2024-04-05 10:20:44,519 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-04-05 10:20:44,520 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-05 10:20:44,587 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:44,588 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:44,600 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-05 10:20:44,684 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-05 10:20:44,706 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7cc8267fd0> has no local changes
2024-04-05 10:20:44,706 [ 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#22 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/)'
2024-04-05 10:20:44,737 [ scc.git] DEBUG [detached HEAD 2a3484c] merge master -Dorg -Ssuccess-only
2024-04-05 10:20:44,738 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:20:44,738 [ scc.repo] DEBUG ## PRs found:
2024-04-05 10:20:44,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-04-05 10:20:44,917 [ scc.repo] DEBUG ## Branches found:
2024-04-05 10:20:44,918 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-05 10:20:44,918 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:44,918 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:44,939 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-05 10:20:44,952 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-05 10:20:44,953 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-05 10:20:44,970 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-05 10:20:44,990 [ scc.git] DEBUG Already up to date.
2024-04-05 10:20:44,990 [ scc.git] DEBUG ## Unique users: []
2024-04-05 10:20:44,991 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:44,991 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:45,003 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-05 10:20:45,098 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:45,098 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:45,112 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-05 10:20:45,176 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-05 10:20:45,187 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7cc82e6f10> has no local changes
2024-04-05 10:20:45,188 [ 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#22 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/)'
2024-04-05 10:20:45,204 [ scc.git] DEBUG [detached HEAD fff6a5a] merge master -Dorg -Ssuccess-only
2024-04-05 10:20:45,205 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:20:45,205 [ scc.repo] DEBUG ## PRs found:
2024-04-05 10:20:45,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-04-05 10:20:45,373 [ scc.repo] DEBUG ## Branches found:
2024-04-05 10:20:45,374 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-05 10:20:45,374 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:45,374 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:45,386 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-05 10:20:45,393 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-05 10:20:45,394 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-05 10:20:45,409 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-05 10:20:45,421 [ scc.git] DEBUG Already up to date.
2024-04-05 10:20:45,421 [ scc.git] DEBUG ## Unique users: []
2024-04-05 10:20:45,422 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:45,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:45,437 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-05 10:20:45,553 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:45,554 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:45,577 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-05 10:20:45,661 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-05 10:20:45,677 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7cc827b520> has no local changes
2024-04-05 10:20:45,678 [ 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#22 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/)'
2024-04-05 10:20:45,704 [ scc.git] DEBUG [detached HEAD 0cf204f] merge master -Dorg -Ssuccess-only
2024-04-05 10:20:45,704 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:20:45,705 [ scc.repo] DEBUG ## PRs found:
2024-04-05 10:20:45,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-04-05 10:20:46,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-04-05 10:20:46,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-04-05 10:20:47,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-05 10:20:47,776 [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-05 10:20:48,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-05 10:20:48,676 [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-05 10:20:48,677 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-04-05 10:20:48,677 [ scc.repo] DEBUG ## Branches found:
2024-04-05 10:20:48,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-05 10:20:48,677 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:48,677 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:48,685 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-05 10:20:48,691 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-05 10:20:48,691 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-05 10:20:48,698 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-05 10:20:48,704 [ scc.git] DEBUG Already up to date.
2024-04-05 10:20:48,705 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-04-05 10:20:49,139 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-04-05 10:20:49,140 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-04-05 10:20:49,145 [ scc.git] DEBUG ## Unique users: []
2024-04-05 10:20:49,145 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:49,146 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:49,152 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-05 10:20:49,158 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:49,164 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-05 10:20:49,203 [ scc.git] DEBUG Auto-merging Dockerfile
2024-04-05 10:20:49,203 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-04-05 10:20:49,203 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-05 10:20:49,204 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-05 10:20:49,210 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-05 10:20:49,219 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-04-05 10:20:49,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:20:49,361 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-05 10:20:49,368 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-05 10:20:49,374 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#22](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-04-05 10:20:49,381 [ scc.config] DEBUG Found github.token
2024-04-05 10:20:49,381 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-04-05 10:20:49,381 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-05 10:20:49,425 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:49,425 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:49,431 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-05 10:20:49,474 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-05 10:20:49,483 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7cc8297a30> has no local changes
2024-04-05 10:20:49,483 [ 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#22 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/)'
2024-04-05 10:20:49,497 [ scc.git] DEBUG [detached HEAD 51e340b] merge master -Dorg -Ssuccess-only
2024-04-05 10:20:49,497 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:20:49,497 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-05 10:20:49,497 [ scc.repo] DEBUG ## PRs found:
2024-04-05 10:20:49,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-05 10:20:50,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-05 10:20:50,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-05 10:20:51,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-05 10:20:51,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-05 10:20:52,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-05 10:20:52,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-05 10:20:53,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-05 10:20:53,631 [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-05 10:20:54,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-05 10:20:54,485 [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-05 10:20:54,489 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-05 10:20:54,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-05 10:20:55,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-05 10:20:56,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-05 10:20:56,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-05 10:20:56,503 [ scc.repo] DEBUG ## Branches found:
2024-04-05 10:20:56,504 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-05 10:20:56,504 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:56,504 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:56,512 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-05 10:20:56,518 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-05 10:20:56,519 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-05 10:20:56,525 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-05 10:20:56,533 [ scc.git] DEBUG Already up to date.
2024-04-05 10:20:56,534 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-05 10:20:57,011 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-04-05 10:20:57,011 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-05 10:20:57,019 [ scc.git] DEBUG ## Unique users: []
2024-04-05 10:20:57,020 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:57,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:57,028 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-05 10:20:57,037 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:57,043 [ 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-05 10:20:57,082 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-05 10:20:57,082 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-05 10:20:57,082 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-05 10:20:57,083 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-05 10:20:57,091 [ scc.git] DEBUG Calling 'git reset --hard 2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-05 10:20:57,100 [ scc.git] DEBUG HEAD is now at 2078ac7 Bump version: 5.8.0 → 5.8.1.dev0
2024-04-05 10:20:57,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:20:57,253 [ scc.git] DEBUG Calling 'git merge-base 2078ac72dbf11f2733e685000a274eff81c2ac2d 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-05 10:20:57,264 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-05 10:20:57,271 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#22](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-05 10:20:57,290 [ scc.config] DEBUG Found github.token
2024-04-05 10:20:57,290 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-05 10:20:57,291 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-05 10:20:57,357 [ scc.git] DEBUG Get sha1 of %s
2024-04-05 10:20:57,358 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-05 10:20:57,375 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-05 10:20:57,420 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-05 10:20:57,427 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7cc828bb50> has no local changes
2024-04-05 10:20:57,428 [ 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#22 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/)'
2024-04-05 10:20:57,438 [ scc.git] DEBUG [detached HEAD 8b9a54a] merge master -Dorg -Ssuccess-only
2024-04-05 10:20:57,439 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:20:57,439 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-05 10:20:57,545 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-04-05 10:20:57,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:20:57,721 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-04-05 10:20:57,729 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-04-05 10:20:58,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:20:58,116 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-04-05 10:20:58,127 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-04-05 10:20:58,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:20:58,562 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-04-05 10:20:58,569 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-04-05 10:20:58,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:20:58,987 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-04-05 10:20:59,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:20:59,374 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-04-05 10:20:59,385 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-04-05 10:20:59,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:20:59,783 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-04-05 10:20:59,790 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-04-05 10:21:00,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:21:00,215 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-04-05 10:21:00,225 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-04-05 10:21:00,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:21:00,622 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-04-05 10:21:00,631 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-04-05 10:21:00,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:21:01,016 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-04-05 10:21:01,024 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-04-05 10:21:01,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:21:01,476 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-04-05 10:21:01,486 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-04-05 10:21:01,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:21:01,902 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-04-05 10:21:01,907 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-04-05 10:21:02,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:21:02,309 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-04-05 10:21:02,315 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-04-05 10:21:02,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:21:02,726 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-04-05 10:21:03,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:21:03,129 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-04-05 10:21:03,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:21:03,534 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-04-05 10:21:03,541 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-04-05 10:21:03,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:21:03,948 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-04-05 10:21:04,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:21:04,388 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-04-05 10:21:04,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:21:04,783 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-04-05 10:21:04,787 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-04-05 10:21:05,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:21:05,178 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-04-05 10:21:05,184 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-04-05 10:21:05,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:21:05,591 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-04-05 10:21:05,598 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-04-05 10:21:05,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:21:05,994 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-04-05 10:21:05,999 [ scc.config] DEBUG Found submodule.scripts.url
2024-04-05 10:21:06,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-05 10:21:06,410 [ scc.config] DEBUG Found submodule.scripts.branch
2024-04-05 10:21:06,411 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-05 10:21:06,521 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7ccaebcaf0> has local changes
2024-04-05 10:21:06,522 [ 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#22 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/22/)'
2024-04-05 10:21:06,538 [ scc.git] DEBUG [detached HEAD 8adaa52] merge master -Dorg -Ssuccess-only
2024-04-05 10:21:06,538 [ scc.merge] INFO Repository: ome/omero-plugins
2024-04-05 10:21:06,538 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-04-05 10:21:06,539 [ scc.merge] INFO Already up to date.
2024-04-05 10:21:06,539 [ scc.merge] INFO
2024-04-05 10:21:06,539 [ scc.merge] INFO
2024-04-05 10:21:06,539 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-04-05 10:21:06,539 [ scc.merge] INFO Already up to date.
2024-04-05 10:21:06,539 [ scc.merge] INFO
2024-04-05 10:21:06,539 [ scc.merge] INFO
2024-04-05 10:21:06,539 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-04-05 10:21:06,539 [ scc.merge] INFO Excluded PRs:
2024-04-05 10:21:06,539 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-04-05 10:21:06,539 [ scc.merge] INFO Already up to date.
2024-04-05 10:21:06,539 [ scc.merge] INFO
2024-04-05 10:21:06,539 [ scc.merge] INFO Merged PRs:
2024-04-05 10:21:06,539 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-04-05 10:21:06,539 [ scc.merge] INFO
2024-04-05 10:21:06,539 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-04-05 10:21:06,539 [ scc.merge] INFO Excluded PRs:
2024-04-05 10:21:06,539 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-04-05 10:21:06,539 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-04-05 10:21:06,539 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-04-05 10:21:06,539 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-04-05 10:21:06,539 [ scc.merge] INFO Already up to date.
2024-04-05 10:21:06,539 [ scc.merge] INFO
2024-04-05 10:21:06,539 [ scc.merge] INFO Merged PRs:
2024-04-05 10:21:06,539 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-04-05 10:21:06,539 [ scc.merge] INFO
2024-04-05 10:21:06,539 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-04-05 10:21:06,539 [ scc.merge] INFO Excluded PRs:
2024-04-05 10:21:06,539 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-05 10:21:06,539 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-04-05 10:21:06,539 [ scc.merge] INFO Already up to date.
2024-04-05 10:21:06,539 [ scc.merge] INFO
2024-04-05 10:21:06,539 [ scc.merge] INFO Merged PRs:
2024-04-05 10:21:06,540 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-04-05 10:21:06,540 [ scc.merge] INFO
2024-04-05 10:21:06,540 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-05 10:21:06,540 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-04-05 10:21:06,540 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-04-05 10:21:06,540 [ scc.merge] INFO
2024-04-05 10:21:06,540 [ scc.merge] INFO Repository: ome/omero-figure
2024-04-05 10:21:06,540 [ scc.merge] INFO Excluded PRs:
2024-04-05 10:21:06,540 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-04-05 10:21:06,540 [ scc.merge] INFO Already up to date.
2024-04-05 10:21:06,540 [ scc.merge] INFO
2024-04-05 10:21:06,540 [ scc.merge] INFO Merged PRs:
2024-04-05 10:21:06,540 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-04-05 10:21:06,540 [ scc.merge] INFO - PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
2024-04-05 10:21:06,540 [ scc.merge] INFO
2024-04-05 10:21:06,540 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-04-05 10:21:06,540 [ scc.merge] INFO Already up to date.
2024-04-05 10:21:06,540 [ scc.merge] INFO
2024-04-05 10:21:06,540 [ scc.merge] INFO Merged PRs:
2024-04-05 10:21:06,540 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-04-05 10:21:06,540 [ scc.merge] INFO
2024-04-05 10:21:06,540 [ scc.merge] INFO Repository: ome/omero-gallery
2024-04-05 10:21:06,540 [ scc.merge] INFO Already up to date.
2024-04-05 10:21:06,540 [ scc.merge] INFO
2024-04-05 10:21:06,540 [ scc.merge] INFO Merged PRs:
2024-04-05 10:21:06,540 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-05 10:21:06,540 [ scc.merge] INFO
2024-04-05 10:21:06,540 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-04-05 10:21:06,540 [ scc.merge] INFO Excluded PRs:
2024-04-05 10:21:06,540 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-04-05 10:21:06,540 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-04-05 10:21:06,540 [ scc.merge] INFO Already up to date.
2024-04-05 10:21:06,540 [ scc.merge] INFO
2024-04-05 10:21:06,540 [ scc.merge] INFO Merged PRs:
2024-04-05 10:21:06,540 [ scc.merge] INFO - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-04-05 10:21:06,540 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-04-05 10:21:06,540 [ scc.merge] INFO - PR 464 will-moore 'Tile load error warning'
2024-04-05 10:21:06,540 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-04-05 10:21:06,541 [ scc.merge] INFO - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-04-05 10:21:06,541 [ scc.merge] INFO - PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
2024-04-05 10:21:06,541 [ scc.merge] INFO
2024-04-05 10:21:06,541 [ scc.merge] INFO Repository: ome/omero-mapr
2024-04-05 10:21:06,541 [ scc.merge] INFO Excluded PRs:
2024-04-05 10:21:06,541 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-04-05 10:21:06,541 [ scc.merge] INFO Already up to date.
2024-04-05 10:21:06,541 [ scc.merge] INFO
2024-04-05 10:21:06,541 [ scc.merge] INFO Merged PRs:
2024-04-05 10:21:06,541 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-04-05 10:21:06,541 [ scc.merge] INFO
2024-04-05 10:21:06,541 [ scc.merge] INFO Repository: ome/omero-metadata
2024-04-05 10:21:06,541 [ scc.merge] INFO Already up to date.
2024-04-05 10:21:06,541 [ scc.merge] INFO
2024-04-05 10:21:06,541 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-05 10:21:06,541 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-05 10:21:06,541 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-05 10:21:06,541 [ scc.merge] INFO
2024-04-05 10:21:06,541 [ scc.merge] INFO Repository: ome/omero-parade
2024-04-05 10:21:06,541 [ scc.merge] INFO Excluded PRs:
2024-04-05 10:21:06,541 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-04-05 10:21:06,541 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-04-05 10:21:06,541 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-04-05 10:21:06,541 [ scc.merge] INFO Already up to date.
2024-04-05 10:21:06,541 [ scc.merge] INFO
2024-04-05 10:21:06,541 [ scc.merge] INFO Merged PRs:
2024-04-05 10:21:06,541 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-05 10:21:06,541 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-05 10:21:06,541 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-05 10:21:06,541 [ scc.merge] INFO
2024-04-05 10:21:06,541 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-04-05 10:21:06,541 [ scc.merge] INFO Already up to date.
2024-04-05 10:21:06,541 [ scc.merge] INFO
2024-04-05 10:21:06,541 [ scc.merge] INFO Merged PRs:
2024-04-05 10:21:06,541 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-04-05 10:21:06,541 [ scc.merge] INFO
2024-04-05 10:21:06,541 [ scc.merge] INFO Repository: ome/omero-rois
2024-04-05 10:21:06,541 [ scc.merge] INFO Excluded PRs:
2024-04-05 10:21:06,541 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-05 10:21:06,541 [ scc.merge] INFO Already up to date.
2024-04-05 10:21:06,541 [ scc.merge] INFO
2024-04-05 10:21:06,542 [ scc.merge] INFO Merged PRs:
2024-04-05 10:21:06,542 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-05 10:21:06,542 [ scc.merge] INFO
2024-04-05 10:21:06,542 [ scc.merge] INFO Repository: ome/omero-signup
2024-04-05 10:21:06,542 [ scc.merge] INFO Already up to date.
2024-04-05 10:21:06,542 [ scc.merge] INFO
2024-04-05 10:21:06,542 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-05 10:21:06,542 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-05 10:21:06,542 [ scc.merge] INFO
2024-04-05 10:21:06,542 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-04-05 10:21:06,542 [ scc.merge] INFO Already up to date.
2024-04-05 10:21:06,542 [ scc.merge] INFO
2024-04-05 10:21:06,542 [ scc.merge] INFO Merged PRs:
2024-04-05 10:21:06,542 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-05 10:21:06,542 [ scc.merge] INFO
2024-04-05 10:21:06,542 [ scc.merge] INFO Repository: ome/omero-upload
2024-04-05 10:21:06,542 [ scc.merge] INFO Already up to date.
2024-04-05 10:21:06,542 [ scc.merge] INFO
2024-04-05 10:21:06,542 [ scc.merge] INFO
2024-04-05 10:21:06,542 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-04-05 10:21:06,542 [ scc.merge] INFO Already up to date.
2024-04-05 10:21:06,542 [ scc.merge] INFO
2024-04-05 10:21:06,542 [ scc.merge] INFO
2024-04-05 10:21:06,542 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-04-05 10:21:06,542 [ scc.merge] INFO Excluded PRs:
2024-04-05 10:21:06,542 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-04-05 10:21:06,542 [ scc.merge] INFO Already up to date.
2024-04-05 10:21:06,542 [ scc.merge] INFO
2024-04-05 10:21:06,542 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-05 10:21:06,542 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-05 10:21:06,542 [ scc.merge] INFO
2024-04-05 10:21:06,542 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-04-05 10:21:06,542 [ scc.merge] INFO Already up to date.
2024-04-05 10:21:06,542 [ scc.merge] INFO
2024-04-05 10:21:06,542 [ scc.merge] INFO
2024-04-05 10:21:06,542 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-04-05 10:21:06,542 [ scc.merge] INFO Already up to date.
2024-04-05 10:21:06,542 [ scc.merge] INFO
2024-04-05 10:21:06,542 [ scc.merge] INFO
2024-04-05 10:21:06,543 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-04-05 10:21:06,543 [ scc.merge] INFO Already up to date.
2024-04-05 10:21:06,543 [ scc.merge] INFO
2024-04-05 10:21:06,543 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-05 10:21:06,543 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-04-05 10:21:06,543 [ scc.merge] INFO
2024-04-05 10:21:06,543 [ scc.merge] INFO Repository: ome/scripts
2024-04-05 10:21:06,543 [ scc.merge] INFO Excluded PRs:
2024-04-05 10:21:06,543 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-05 10:21:06,543 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-05 10:21:06,543 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-05 10:21:06,543 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-05 10:21:06,543 [ scc.merge] INFO Already up to date.
2024-04-05 10:21:06,543 [ scc.merge] INFO
2024-04-05 10:21:06,543 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-05 10:21:06,543 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-05 10:21:06,543 [ scc.merge] INFO
2024-04-05 10:21:06,543 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-05 10:21:06,543 [ scc.git] DEBUG Calling 'git remote'
2024-04-05 10:21:06,549 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-04-05 10:21:06,550 [ scc.git] DEBUG Calling 'git remote'
2024-04-05 10:21:06,555 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:21:06,555 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-04-05 10:21:06,555 [ scc.git] DEBUG Calling 'git remote'
2024-04-05 10:21:06,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:21:06,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-04-05 10:21:06,561 [ scc.git] DEBUG Calling 'git remote'
2024-04-05 10:21:06,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:21:06,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-04-05 10:21:06,566 [ scc.git] DEBUG Calling 'git remote'
2024-04-05 10:21:06,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:21:06,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-04-05 10:21:06,571 [ scc.git] DEBUG Calling 'git remote'
2024-04-05 10:21:06,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:21:06,577 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-05 10:21:06,577 [ scc.git] DEBUG Calling 'git remote'
2024-04-05 10:21:06,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:21:06,583 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-05 10:21:06,583 [ scc.git] DEBUG Calling 'git remote'
2024-04-05 10:21:06,589 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:21:06,589 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-05 10:21:06,589 [ scc.git] DEBUG Calling 'git remote'
2024-04-05 10:21:06,596 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:21:06,596 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-05 10:21:06,597 [ scc.git] DEBUG Calling 'git remote'
2024-04-05 10:21:06,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:21:06,603 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-05 10:21:06,603 [ scc.git] DEBUG Calling 'git remote'
2024-04-05 10:21:06,608 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:21:06,608 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-05 10:21:06,608 [ scc.git] DEBUG Calling 'git remote'
2024-04-05 10:21:06,614 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:21:06,614 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-05 10:21:06,614 [ scc.git] DEBUG Calling 'git remote'
2024-04-05 10:21:06,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:21:06,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-05 10:21:06,620 [ scc.git] DEBUG Calling 'git remote'
2024-04-05 10:21:06,626 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:21:06,626 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-05 10:21:06,626 [ scc.git] DEBUG Calling 'git remote'
2024-04-05 10:21:06,632 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:21:06,632 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-05 10:21:06,632 [ scc.git] DEBUG Calling 'git remote'
2024-04-05 10:21:06,637 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:21:06,637 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-05 10:21:06,637 [ scc.git] DEBUG Calling 'git remote'
2024-04-05 10:21:06,643 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:21:06,643 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-05 10:21:06,643 [ scc.git] DEBUG Calling 'git remote'
2024-04-05 10:21:06,649 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:21:06,649 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-05 10:21:06,649 [ scc.git] DEBUG Calling 'git remote'
2024-04-05 10:21:06,654 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:21:06,655 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-05 10:21:06,655 [ scc.git] DEBUG Calling 'git remote'
2024-04-05 10:21:06,660 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:21:06,660 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-05 10:21:06,660 [ scc.git] DEBUG Calling 'git remote'
2024-04-05 10:21:06,665 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:21:06,665 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-05 10:21:06,665 [ scc.git] DEBUG Calling 'git remote'
2024-04-05 10:21:06,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-05 10:21:06,670 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-05 10:21:06,670 [ scc.git] DEBUG Calling 'git remote'
2024-04-05 10:21:06,675 [ 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 f90080a] 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 1c51e43] 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-05 10:21:52,992 [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-05 10:22:01,947 [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-05 10:22:04,283 [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-05 10:22:08,813 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-05 10:22:57,649 [ 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}
