Skipping 120 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-04-07 00:45:15,639 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael-min.js
2024-04-07 00:45:15,639 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael.js
2024-04-07 00:45:15,639 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/scaleraphael.js
2024-04-07 00:45:15,639 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/underscore-1.13.1-umd-min.js
2024-04-07 00:45:15,639 [ scc.git] DEBUG delete mode 100644 omero_figure/templates/figure/index.html
2024-04-07 00:45:15,639 [ scc.git] DEBUG delete mode 100644 spec/ViewportViewSpec.js
2024-04-07 00:45:15,639 [ scc.git] DEBUG delete mode 100644 spec/images/testImage.png
2024-04-07 00:45:15,639 [ scc.git] DEBUG delete mode 100644 spec/javascripts/PanelSpec.js
2024-04-07 00:45:15,639 [ scc.git] DEBUG delete mode 100644 spec/javascripts/ViewportViewSpec.js
2024-04-07 00:45:15,639 [ scc.git] DEBUG delete mode 100644 spec/javascripts/fixtures/previewTab.html
2024-04-07 00:45:15,639 [ scc.git] DEBUG create mode 100644 src/.env
2024-04-07 00:45:15,639 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/css/figure.css (70%)
2024-04-07 00:45:15,639 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/arrow-icon-16.png (100%)
2024-04-07 00:45:15,639 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-04-07 00:45:15,639 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-04-07 00:45:15,639 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-04-07 00:45:15,639 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-04-07 00:45:15,639 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-04-07 00:45:15,639 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-04-07 00:45:15,639 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-04-07 00:45:15,639 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-04-07 00:45:15,639 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-04-07 00:45:15,639 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-07 00:45:15,639 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-04-07 00:45:15,639 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-04-07 00:45:15,639 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-04-07 00:45:15,640 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-04-07 00:45:15,640 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-04-07 00:45:15,640 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-04-07 00:45:15,640 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-04-07 00:45:15,640 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-04-07 00:45:15,640 [ scc.git] DEBUG create mode 100644 src/index.html
2024-04-07 00:45:15,640 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-04-07 00:45:15,640 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-04-07 00:45:15,640 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-04-07 00:45:15,640 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-04-07 00:45:15,640 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-04-07 00:45:15,640 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-04-07 00:45:15,640 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-04-07 00:45:15,640 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-04-07 00:45:15,640 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-04-07 00:45:15,640 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-07 00:45:15,640 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-04-07 00:45:15,640 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-04-07 00:45:15,640 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-04-07 00:45:15,640 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-04-07 00:45:15,640 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-04-07 00:45:15,640 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-04-07 00:45:15,640 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-04-07 00:45:15,640 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-04-07 00:45:15,640 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-04-07 00:45:15,640 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-04-07 00:45:15,640 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-04-07 00:45:15,640 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-04-07 00:45:15,640 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-04-07 00:45:15,640 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-04-07 00:45:15,640 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-04-07 00:45:15,640 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-04-07 00:45:15,640 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-04-07 00:45:15,640 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-04-07 00:45:15,640 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-04-07 00:45:15,640 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-04-07 00:45:15,641 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-04-07 00:45:15,641 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-04-07 00:45:15,641 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-04-07 00:45:15,641 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-04-07 00:45:15,641 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-04-07 00:45:15,641 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-04-07 00:45:15,641 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-04-07 00:45:15,641 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-04-07 00:45:15,641 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-04-07 00:45:15,641 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-04-07 00:45:15,641 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-04-07 00:45:15,641 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-04-07 00:45:15,641 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-04-07 00:45:15,641 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-04-07 00:45:15,641 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-04-07 00:45:15,641 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-04-07 00:45:15,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:45:15,778 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...32b0ccd55ce3c95dabcf8ebf817b032e4b864438'
2024-04-07 00:45:15,789 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:15,795 [ 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-07 00:45:15,839 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-07 00:45:15,843 [ scc.git] DEBUG omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 6 +++---
2024-04-07 00:45:15,844 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2024-04-07 00:45:16,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:45:16,186 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-07 00:45:16,230 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:45:16,230 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:16,236 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-07 00:45:16,287 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-07 00:45:16,302 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06c2b01be0> has no local changes
2024-04-07 00:45:16,302 [ 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#24 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/)'
2024-04-07 00:45:16,314 [ scc.git] DEBUG [detached HEAD 95d0fbf4] merge master -Dorg -Ssuccess-only
2024-04-07 00:45:16,315 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:45:16,315 [ scc.repo] DEBUG ## PRs found:
2024-04-07 00:45:16,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-04-07 00:45:17,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-04-07 00:45:17,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-04-07 00:45:18,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-07 00:45:18,517 [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-07 00:45:19,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-07 00:45:19,432 [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-07 00:45:19,433 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-04-07 00:45:19,433 [ scc.repo] DEBUG ## Branches found:
2024-04-07 00:45:19,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-07 00:45:19,433 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:45:19,433 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:19,441 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-07 00:45:19,446 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-07 00:45:19,447 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-07 00:45:19,454 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-07 00:45:19,461 [ scc.git] DEBUG Already up to date.
2024-04-07 00:45:19,461 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-04-07 00:45:19,909 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-04-07 00:45:19,909 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-04-07 00:45:19,914 [ scc.git] DEBUG ## Unique users: []
2024-04-07 00:45:19,914 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:45:19,914 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:19,921 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-07 00:45:19,928 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:19,934 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-07 00:45:19,978 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-04-07 00:45:19,978 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-07 00:45:19,982 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-04-07 00:45:19,982 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-07 00:45:20,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:45:20,126 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-07 00:45:20,169 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:45:20,169 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:20,175 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-07 00:45:20,217 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-07 00:45:20,226 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06c1a65550> has no local changes
2024-04-07 00:45:20,226 [ 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#24 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/)'
2024-04-07 00:45:20,238 [ scc.git] DEBUG [detached HEAD 69ef01a] merge master -Dorg -Ssuccess-only
2024-04-07 00:45:20,239 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:45:20,239 [ scc.repo] DEBUG ## PRs found:
2024-04-07 00:45:20,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-04-07 00:45:21,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-04-07 00:45:21,091 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-07 00:45:21,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-07 00:45:22,174 [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-07 00:45:22,646 [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-07 00:45:23,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-07 00:45:23,496 [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-07 00:45:23,497 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-07 00:45:23,497 [ scc.repo] DEBUG ## Branches found:
2024-04-07 00:45:23,497 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-07 00:45:23,497 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:45:23,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:23,504 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-07 00:45:23,512 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-07 00:45:23,513 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-07 00:45:23,520 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-07 00:45:23,527 [ scc.git] DEBUG Already up to date.
2024-04-07 00:45:23,527 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-04-07 00:45:23,922 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-04-07 00:45:23,923 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-04-07 00:45:23,929 [ scc.git] DEBUG ## Unique users: []
2024-04-07 00:45:23,929 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:45:23,929 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:23,937 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-07 00:45:23,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:23,952 [ 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-07 00:45:23,966 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-07 00:45:23,971 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-04-07 00:45:23,971 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-04-07 00:45:24,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:45:24,118 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-07 00:45:24,170 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:45:24,171 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:24,181 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-07 00:45:24,244 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-07 00:45:24,253 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06c1a5a9d0> has no local changes
2024-04-07 00:45:24,253 [ 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#24 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/)'
2024-04-07 00:45:24,279 [ scc.git] DEBUG [detached HEAD 6b28a85] merge master -Dorg -Ssuccess-only
2024-04-07 00:45:24,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:45:24,280 [ scc.repo] DEBUG ## PRs found:
2024-04-07 00:45:24,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-04-07 00:45:25,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/468 HTTP/1.1" 200 None
2024-04-07 00:45:25,119 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-07 00:45:25,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d HTTP/1.1" 200 None
2024-04-07 00:45:26,242 [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-07 00:45:26,712 [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-07 00:45:27,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/9f06f398570cddff1332355e1eda0fe54d88881d HTTP/1.1" 200 None
2024-04-07 00:45:27,561 [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-07 00:45:27,562 [ scc.repo] DEBUG - PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
2024-04-07 00:45:28,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/467 HTTP/1.1" 200 None
2024-04-07 00:45:28,038 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-07 00:45:28,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-04-07 00:45:29,034 [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-07 00:45:29,524 [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-07 00:45:29,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/78e253cccecbd349db3bcb16514f5c8b2c4185e6 HTTP/1.1" 200 None
2024-04-07 00:45:30,378 [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-07 00:45:30,379 [ scc.repo] DEBUG - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-04-07 00:45:30,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-04-07 00:45:31,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-04-07 00:45:31,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407 HTTP/1.1" 200 None
2024-04-07 00:45:32,235 [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-07 00:45:32,687 [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-07 00:45:33,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/105a9369cdb853508da5ec4e0839c6f448bf3407 HTTP/1.1" 200 None
2024-04-07 00:45:33,578 [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-07 00:45:33,579 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-04-07 00:45:34,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464 HTTP/1.1" 200 None
2024-04-07 00:45:34,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/464/comments HTTP/1.1" 200 None
2024-04-07 00:45:35,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-04-07 00:45:35,529 [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-07 00:45:36,028 [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-07 00:45:36,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/97542d9b749f93d4902f7dce703bbf2a04316a98 HTTP/1.1" 200 None
2024-04-07 00:45:36,880 [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-07 00:45:36,881 [ scc.repo] DEBUG - PR 464 will-moore 'Tile load error warning'
2024-04-07 00:45:37,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-04-07 00:45:37,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-04-07 00:45:38,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-07 00:45:38,728 [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-07 00:45:39,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-07 00:45:39,617 [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-07 00:45:39,619 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-04-07 00:45:40,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456 HTTP/1.1" 200 None
2024-04-07 00:45:40,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/456/comments HTTP/1.1" 200 None
2024-04-07 00:45:41,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-04-07 00:45:41,528 [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-07 00:45:41,990 [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-07 00:45:42,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/2954dd294c5d9f89b64ca4cedcc76dd0c9a32745 HTTP/1.1" 200 None
2024-04-07 00:45:42,849 [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-07 00:45:42,850 [ scc.repo] DEBUG - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-04-07 00:45:42,850 [ scc.repo] DEBUG ## Branches found:
2024-04-07 00:45:42,851 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-07 00:45:42,851 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:45:42,851 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:42,858 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-07 00:45:42,866 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-07 00:45:42,866 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-07 00:45:42,873 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-07 00:45:42,883 [ scc.git] DEBUG Already up to date.
2024-04-07 00:45:42,883 [ scc.git] DEBUG Calling 'git fetch origin pull/456/head'
2024-04-07 00:45:43,344 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-07 00:45:43,344 [ scc.git] DEBUG * branch refs/pull/456/head -> FETCH_HEAD
2024-04-07 00:45:43,350 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-04-07 00:45:43,801 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-07 00:45:43,801 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-04-07 00:45:43,807 [ scc.git] DEBUG Calling 'git fetch origin pull/464/head'
2024-04-07 00:45:44,319 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-07 00:45:44,319 [ scc.git] DEBUG * branch refs/pull/464/head -> FETCH_HEAD
2024-04-07 00:45:44,325 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-04-07 00:45:45,288 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-07 00:45:45,289 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-04-07 00:45:45,294 [ scc.git] DEBUG Calling 'git fetch origin pull/467/head'
2024-04-07 00:45:45,680 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-07 00:45:45,681 [ scc.git] DEBUG * branch refs/pull/467/head -> FETCH_HEAD
2024-04-07 00:45:45,687 [ scc.git] DEBUG Calling 'git fetch origin pull/468/head'
2024-04-07 00:45:46,264 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-07 00:45:46,264 [ scc.git] DEBUG * branch refs/pull/468/head -> FETCH_HEAD
2024-04-07 00:45:46,269 [ scc.git] DEBUG ## Unique users: []
2024-04-07 00:45:46,269 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:45:46,269 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:46,276 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2954dd294c5d9f89b64ca4cedcc76dd0c9a32745'
2024-04-07 00:45:46,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:46,290 [ 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-07 00:45:46,308 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-07 00:45:46,311 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 5 +++--
2024-04-07 00:45:46,311 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 2 deletions(-)
2024-04-07 00:45:46,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:45:46,462 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-07 00:45:46,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:46,475 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-07 00:45:46,560 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-07 00:45:46,563 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-04-07 00:45:46,563 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-04-07 00:45:46,563 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-04-07 00:45:46,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:45:46,919 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-04-07 00:45:46,926 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:46,931 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 464 (Tile load error warning) 97542d9b749f93d4902f7dce703bbf2a04316a98'
2024-04-07 00:45:47,017 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-07 00:45:47,022 [ scc.git] DEBUG css/app.css | 22 ++++++++++++++++++++++
2024-04-07 00:45:47,022 [ scc.git] DEBUG src/events/events.js | 2 ++
2024-04-07 00:45:47,022 [ scc.git] DEBUG src/index-dev.html | 6 +++---
2024-04-07 00:45:47,022 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 2 +-
2024-04-07 00:45:47,022 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 4 +++-
2024-04-07 00:45:47,022 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 39 +++++++++++++++++++++++++++++++++++++--
2024-04-07 00:45:47,022 [ scc.git] DEBUG 6 files changed, 68 insertions(+), 7 deletions(-)
2024-04-07 00:45:47,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:45:47,329 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...105a9369cdb853508da5ec4e0839c6f448bf3407'
2024-04-07 00:45:47,337 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:47,343 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 105a9369cdb853508da5ec4e0839c6f448bf3407'
2024-04-07 00:45:47,447 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-04-07 00:45:47,447 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-07 00:45:47,451 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-04-07 00:45:47,452 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-04-07 00:45:47,452 [ scc.git] DEBUG src/app/header.html | 5 +
2024-04-07 00:45:47,452 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-04-07 00:45:47,452 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-04-07 00:45:47,452 [ scc.git] DEBUG src/utils/figure.js | 210 ++++++++++++++++++++++++++++++++++++++++++
2024-04-07 00:45:47,452 [ scc.git] DEBUG 6 files changed, 283 insertions(+), 6 deletions(-)
2024-04-07 00:45:47,452 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-04-07 00:45:47,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:45:47,738 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e253cccecbd349db3bcb16514f5c8b2c4185e6'
2024-04-07 00:45:47,764 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:47,771 [ 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-07 00:45:47,812 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-07 00:45:47,821 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2024-04-07 00:45:47,822 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2024-04-07 00:45:48,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:45:48,143 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9f06f398570cddff1332355e1eda0fe54d88881d'
2024-04-07 00:45:48,164 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:48,170 [ 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-07 00:45:48,349 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-07 00:45:48,350 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-07 00:45:48,363 [ scc.git] DEBUG package-lock.json | 76 +++++++++++++++++++++++++++----------------------------
2024-04-07 00:45:48,363 [ scc.git] DEBUG 1 file changed, 38 insertions(+), 38 deletions(-)
2024-04-07 00:45:48,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:45:48,550 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-07 00:45:48,589 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:45:48,589 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:48,595 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-07 00:45:48,634 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-07 00:45:48,644 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06c1a4c5b0> has no local changes
2024-04-07 00:45:48,645 [ 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#24 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/)'
2024-04-07 00:45:48,658 [ scc.git] DEBUG [detached HEAD dca43ff] merge master -Dorg -Ssuccess-only
2024-04-07 00:45:48,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:45:48,658 [ scc.repo] DEBUG ## PRs found:
2024-04-07 00:45:49,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-04-07 00:45:49,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-04-07 00:45:50,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-04-07 00:45:50,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-07 00:45:50,990 [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-07 00:45:51,507 [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-07 00:45:51,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-07 00:45:52,415 [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-07 00:45:52,415 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-04-07 00:45:52,416 [ scc.repo] DEBUG ## Branches found:
2024-04-07 00:45:52,416 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-07 00:45:52,416 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:45:52,416 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:52,422 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-07 00:45:52,428 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-07 00:45:52,428 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-07 00:45:52,434 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-07 00:45:52,441 [ scc.git] DEBUG Already up to date.
2024-04-07 00:45:52,442 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-04-07 00:45:52,879 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-04-07 00:45:52,879 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-04-07 00:45:52,885 [ scc.git] DEBUG ## Unique users: []
2024-04-07 00:45:52,885 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:45:52,885 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:52,892 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-07 00:45:52,901 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:52,909 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-07 00:45:52,920 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-07 00:45:52,923 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-04-07 00:45:52,923 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-04-07 00:45:52,923 [ scc.git] DEBUG requirements.txt | 2 +-
2024-04-07 00:45:52,923 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-04-07 00:45:52,923 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-04-07 00:45:52,923 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-04-07 00:45:53,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:45:53,072 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-07 00:45:53,115 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:45:53,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:53,123 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-07 00:45:53,165 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-07 00:45:53,173 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06c2ac34f0> has no local changes
2024-04-07 00:45:53,173 [ 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#24 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/)'
2024-04-07 00:45:53,182 [ scc.git] DEBUG [detached HEAD 4df93d4] merge master -Dorg -Ssuccess-only
2024-04-07 00:45:53,183 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:45:53,183 [ scc.repo] DEBUG ## PRs found:
2024-04-07 00:45:53,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-04-07 00:45:54,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-04-07 00:45:54,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-04-07 00:45:55,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-07 00:45:55,499 [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-07 00:45:55,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-07 00:45:56,385 [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-07 00:45:56,386 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-07 00:45:56,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-04-07 00:45:57,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-04-07 00:45:57,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-07 00:45:58,210 [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-07 00:45:58,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-07 00:45:59,113 [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-07 00:45:59,115 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-07 00:45:59,115 [ scc.repo] DEBUG ## Branches found:
2024-04-07 00:45:59,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-07 00:45:59,116 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:45:59,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:45:59,129 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-07 00:45:59,146 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-07 00:45:59,147 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-07 00:45:59,158 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-07 00:45:59,174 [ scc.git] DEBUG Already up to date.
2024-04-07 00:45:59,174 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-04-07 00:45:59,715 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-07 00:45:59,716 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-04-07 00:45:59,722 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-04-07 00:46:00,351 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-07 00:46:00,351 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-04-07 00:46:00,358 [ scc.git] DEBUG ## Unique users: []
2024-04-07 00:46:00,359 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:00,359 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:00,374 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-07 00:46:00,383 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:00,392 [ 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-07 00:46:00,473 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-04-07 00:46:00,473 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-04-07 00:46:00,473 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-07 00:46:00,473 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-07 00:46:00,473 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-07 00:46:00,474 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-07 00:46:00,481 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-07 00:46:00,489 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-07 00:46:00,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:00,646 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-07 00:46:00,653 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-07 00:46:00,659 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#24](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-04-07 00:46:00,664 [ scc.config] DEBUG Found github.token
2024-04-07 00:46:00,664 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-04-07 00:46:00,665 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-07 00:46:00,671 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:00,677 [ 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-07 00:46:00,701 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-07 00:46:00,701 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-07 00:46:00,701 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-04-07 00:46:00,701 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-07 00:46:00,702 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-07 00:46:00,708 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-07 00:46:00,716 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-07 00:46:01,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:01,061 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-07 00:46:01,068 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-07 00:46:01,074 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#24](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/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-07 00:46:01,080 [ scc.config] DEBUG Found github.token
2024-04-07 00:46:01,080 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-04-07 00:46:01,080 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-07 00:46:01,120 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:01,120 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:01,127 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-07 00:46:01,165 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-07 00:46:01,173 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06c1a4c550> has no local changes
2024-04-07 00:46:01,174 [ 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#24 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/)'
2024-04-07 00:46:01,184 [ scc.git] DEBUG [detached HEAD 9a2135a] merge master -Dorg -Ssuccess-only
2024-04-07 00:46:01,184 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:01,184 [ scc.repo] DEBUG ## PRs found:
2024-04-07 00:46:01,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-04-07 00:46:02,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-04-07 00:46:02,091 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-07 00:46:02,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-07 00:46:03,086 [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-07 00:46:03,604 [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-07 00:46:04,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-07 00:46:04,532 [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-07 00:46:04,533 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-07 00:46:04,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-04-07 00:46:04,993 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-07 00:46:05,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-07 00:46:06,020 [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-07 00:46:06,489 [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-07 00:46:07,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-07 00:46:07,423 [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-07 00:46:07,424 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-07 00:46:07,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-04-07 00:46:07,880 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-07 00:46:08,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-07 00:46:08,937 [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-07 00:46:09,413 [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-07 00:46:09,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-07 00:46:10,379 [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-07 00:46:10,379 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-07 00:46:10,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-04-07 00:46:11,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-04-07 00:46:11,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-04-07 00:46:12,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-04-07 00:46:12,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-04-07 00:46:13,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-04-07 00:46:13,211 [ scc.repo] DEBUG ## Branches found:
2024-04-07 00:46:13,211 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-07 00:46:13,211 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:13,211 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:13,218 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-07 00:46:13,224 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-07 00:46:13,224 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-07 00:46:13,230 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-07 00:46:13,235 [ scc.git] DEBUG Already up to date.
2024-04-07 00:46:13,236 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-04-07 00:46:13,621 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-07 00:46:13,621 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-04-07 00:46:13,628 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-04-07 00:46:14,108 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-07 00:46:14,108 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-04-07 00:46:14,113 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-07 00:46:14,648 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-07 00:46:14,648 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-07 00:46:14,655 [ scc.git] DEBUG ## Unique users: []
2024-04-07 00:46:14,655 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:14,655 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:14,662 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-07 00:46:14,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:14,675 [ 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-07 00:46:14,687 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-07 00:46:14,690 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-04-07 00:46:14,690 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-04-07 00:46:14,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:14,837 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-07 00:46:14,843 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:14,848 [ 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-07 00:46:14,892 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-07 00:46:14,893 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-07 00:46:14,896 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-04-07 00:46:14,896 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-04-07 00:46:15,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:15,243 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-07 00:46:15,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:15,257 [ 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-07 00:46:15,315 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-07 00:46:15,315 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-07 00:46:15,319 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-04-07 00:46:15,319 [ scc.git] DEBUG package.json | 2 +-
2024-04-07 00:46:15,319 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-04-07 00:46:15,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:15,658 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-07 00:46:15,704 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:15,704 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:15,710 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-07 00:46:15,753 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-07 00:46:15,761 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06c1a58fd0> has no local changes
2024-04-07 00:46:15,761 [ 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#24 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/)'
2024-04-07 00:46:15,771 [ scc.git] DEBUG [detached HEAD 42ef8df] merge master -Dorg -Ssuccess-only
2024-04-07 00:46:15,772 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:15,772 [ scc.repo] DEBUG ## PRs found:
2024-04-07 00:46:16,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-04-07 00:46:16,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-04-07 00:46:17,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-07 00:46:17,545 [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-07 00:46:18,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-07 00:46:18,456 [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-07 00:46:18,457 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-04-07 00:46:18,457 [ scc.repo] DEBUG ## Branches found:
2024-04-07 00:46:18,457 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-07 00:46:18,458 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:18,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:18,465 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-07 00:46:18,470 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-07 00:46:18,470 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-07 00:46:18,476 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-07 00:46:18,484 [ scc.git] DEBUG Already up to date.
2024-04-07 00:46:18,484 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-07 00:46:18,895 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-04-07 00:46:18,895 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-07 00:46:18,900 [ scc.git] DEBUG ## Unique users: []
2024-04-07 00:46:18,900 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:18,900 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:18,908 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-07 00:46:18,915 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:18,923 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-07 00:46:18,934 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-07 00:46:19,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:19,097 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-07 00:46:19,141 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:19,141 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:19,148 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-07 00:46:19,190 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-07 00:46:19,199 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06c01d4340> has no local changes
2024-04-07 00:46:19,199 [ 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#24 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/)'
2024-04-07 00:46:19,211 [ scc.git] DEBUG [detached HEAD c2c490b] merge master -Dorg -Ssuccess-only
2024-04-07 00:46:19,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:19,212 [ scc.repo] DEBUG ## PRs found:
2024-04-07 00:46:19,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-04-07 00:46:20,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-04-07 00:46:20,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-04-07 00:46:20,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-04-07 00:46:21,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-07 00:46:21,928 [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-07 00:46:22,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-07 00:46:22,825 [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-07 00:46:22,826 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-07 00:46:22,826 [ scc.repo] DEBUG ## Branches found:
2024-04-07 00:46:22,826 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-07 00:46:22,826 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:22,826 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:22,833 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-07 00:46:22,840 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-07 00:46:22,840 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-07 00:46:22,848 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-07 00:46:22,856 [ scc.git] DEBUG Already up to date.
2024-04-07 00:46:22,856 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-04-07 00:46:23,378 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-04-07 00:46:23,378 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-04-07 00:46:23,384 [ scc.git] DEBUG ## Unique users: []
2024-04-07 00:46:23,385 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:23,385 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:23,390 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-07 00:46:23,396 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:23,400 [ 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-07 00:46:23,412 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-04-07 00:46:23,413 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-07 00:46:23,416 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-04-07 00:46:23,416 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-04-07 00:46:23,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:23,574 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-07 00:46:23,622 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:23,623 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:23,629 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-07 00:46:23,678 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-07 00:46:23,687 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06c02295b0> has no local changes
2024-04-07 00:46:23,687 [ 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#24 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/)'
2024-04-07 00:46:23,698 [ scc.git] DEBUG [detached HEAD 68673bb] merge master -Dorg -Ssuccess-only
2024-04-07 00:46:23,698 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:23,698 [ scc.repo] DEBUG ## PRs found:
2024-04-07 00:46:24,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-04-07 00:46:24,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-04-07 00:46:25,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-04-07 00:46:25,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-07 00:46:25,970 [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-07 00:46:26,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-07 00:46:26,941 [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-07 00:46:26,942 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-07 00:46:26,942 [ scc.repo] DEBUG ## Branches found:
2024-04-07 00:46:26,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-07 00:46:26,942 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:26,942 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:26,949 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-07 00:46:26,955 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-07 00:46:26,955 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-07 00:46:26,962 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-07 00:46:26,970 [ scc.git] DEBUG Already up to date.
2024-04-07 00:46:26,970 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-07 00:46:27,416 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-04-07 00:46:27,416 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-07 00:46:27,421 [ scc.git] DEBUG ## Unique users: []
2024-04-07 00:46:27,421 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:27,421 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:27,428 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-07 00:46:27,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:27,439 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-07 00:46:27,500 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-04-07 00:46:27,500 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-04-07 00:46:27,500 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-04-07 00:46:27,500 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-04-07 00:46:27,500 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-04-07 00:46:27,500 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-04-07 00:46:27,500 [ scc.git] DEBUG Auto-merging setup.py
2024-04-07 00:46:27,500 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-04-07 00:46:27,500 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-07 00:46:27,501 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-07 00:46:27,507 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-07 00:46:27,514 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-04-07 00:46:27,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:27,667 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-07 00:46:27,674 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-07 00:46:27,681 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#24](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/urls.py
- setup.py
- omero_signup/views.py
--conflicts
2024-04-07 00:46:27,686 [ scc.config] DEBUG Found github.token
2024-04-07 00:46:27,687 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-04-07 00:46:27,687 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-07 00:46:27,730 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:27,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:27,736 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-07 00:46:27,777 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-07 00:46:27,785 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06c1a5ae80> has no local changes
2024-04-07 00:46:27,785 [ 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#24 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/)'
2024-04-07 00:46:27,796 [ scc.git] DEBUG [detached HEAD 7c33637] merge master -Dorg -Ssuccess-only
2024-04-07 00:46:27,796 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:27,796 [ scc.repo] DEBUG ## PRs found:
2024-04-07 00:46:28,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-04-07 00:46:28,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-04-07 00:46:29,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-04-07 00:46:29,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-07 00:46:30,058 [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-07 00:46:30,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-07 00:46:30,995 [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-07 00:46:30,996 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-07 00:46:30,996 [ scc.repo] DEBUG ## Branches found:
2024-04-07 00:46:30,996 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-07 00:46:30,997 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:30,997 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:31,005 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-07 00:46:31,012 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-07 00:46:31,012 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-07 00:46:31,020 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-07 00:46:31,027 [ scc.git] DEBUG Already up to date.
2024-04-07 00:46:31,028 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-04-07 00:46:31,554 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-04-07 00:46:31,555 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-04-07 00:46:31,560 [ scc.git] DEBUG ## Unique users: []
2024-04-07 00:46:31,560 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:31,560 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:31,569 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-04-07 00:46:31,579 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:31,587 [ 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-07 00:46:31,615 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-07 00:46:31,619 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-04-07 00:46:31,620 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-04-07 00:46:31,620 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-04-07 00:46:31,620 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-04-07 00:46:31,620 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-04-07 00:46:31,620 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-04-07 00:46:31,620 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-04-07 00:46:31,620 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-04-07 00:46:31,620 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-04-07 00:46:31,622 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-04-07 00:46:31,622 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-04-07 00:46:31,622 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-04-07 00:46:31,622 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-04-07 00:46:31,623 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-04-07 00:46:31,623 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-04-07 00:46:31,623 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-04-07 00:46:31,623 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-04-07 00:46:31,623 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-04-07 00:46:31,623 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-04-07 00:46:31,623 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-04-07 00:46:31,623 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-04-07 00:46:31,623 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-04-07 00:46:31,623 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-04-07 00:46:31,623 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-04-07 00:46:31,623 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-04-07 00:46:31,623 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-04-07 00:46:31,623 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-04-07 00:46:31,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-04-07 00:46:31,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-04-07 00:46:31,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-04-07 00:46:31,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-04-07 00:46:31,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-04-07 00:46:31,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-04-07 00:46:31,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-04-07 00:46:31,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-04-07 00:46:31,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-04-07 00:46:31,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-04-07 00:46:31,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-04-07 00:46:31,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-04-07 00:46:31,624 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-04-07 00:46:31,624 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-04-07 00:46:31,624 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-04-07 00:46:31,624 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-04-07 00:46:31,624 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-04-07 00:46:31,624 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-04-07 00:46:31,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:31,782 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-07 00:46:31,825 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:31,826 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:31,833 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-07 00:46:31,878 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-07 00:46:31,886 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06c1a58df0> has no local changes
2024-04-07 00:46:31,886 [ 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#24 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/)'
2024-04-07 00:46:31,897 [ scc.git] DEBUG [detached HEAD 71f36ad] merge master -Dorg -Ssuccess-only
2024-04-07 00:46:31,897 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:31,897 [ scc.repo] DEBUG ## PRs found:
2024-04-07 00:46:32,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-04-07 00:46:32,216 [ scc.repo] DEBUG ## Branches found:
2024-04-07 00:46:32,217 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-07 00:46:32,217 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:32,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:32,224 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-07 00:46:32,231 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-07 00:46:32,231 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-07 00:46:32,237 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-07 00:46:32,245 [ scc.git] DEBUG Already up to date.
2024-04-07 00:46:32,245 [ scc.git] DEBUG ## Unique users: []
2024-04-07 00:46:32,245 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:32,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:32,253 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-07 00:46:32,296 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:32,296 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:32,303 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-07 00:46:32,343 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-07 00:46:32,351 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06c020efa0> has no local changes
2024-04-07 00:46:32,351 [ 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#24 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/)'
2024-04-07 00:46:32,360 [ scc.git] DEBUG [detached HEAD 5eb8c69] merge master -Dorg -Ssuccess-only
2024-04-07 00:46:32,360 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:32,360 [ scc.repo] DEBUG ## PRs found:
2024-04-07 00:46:32,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-04-07 00:46:32,642 [ scc.repo] DEBUG ## Branches found:
2024-04-07 00:46:32,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-07 00:46:32,642 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:32,643 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:32,651 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-07 00:46:32,657 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-07 00:46:32,657 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-07 00:46:32,664 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-07 00:46:32,671 [ scc.git] DEBUG Already up to date.
2024-04-07 00:46:32,671 [ scc.git] DEBUG ## Unique users: []
2024-04-07 00:46:32,672 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:32,672 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:32,679 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-07 00:46:32,720 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:32,720 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:32,726 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-07 00:46:32,771 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-07 00:46:32,780 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06c01e0cd0> has no local changes
2024-04-07 00:46:32,781 [ 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#24 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/)'
2024-04-07 00:46:32,790 [ scc.git] DEBUG [detached HEAD 890fb8a] merge master -Dorg -Ssuccess-only
2024-04-07 00:46:32,790 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:32,791 [ scc.git] INFO Overriding base-branch from master to main
2024-04-07 00:46:32,791 [ scc.repo] DEBUG ## PRs found:
2024-04-07 00:46:33,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-04-07 00:46:33,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-04-07 00:46:34,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-04-07 00:46:34,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-04-07 00:46:34,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-07 00:46:35,455 [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-07 00:46:35,945 [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-07 00:46:36,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-07 00:46:36,826 [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-07 00:46:36,827 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-07 00:46:36,828 [ scc.repo] DEBUG ## Branches found:
2024-04-07 00:46:36,828 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-07 00:46:36,828 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:36,828 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:36,836 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-04-07 00:46:36,841 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-07 00:46:36,841 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-04-07 00:46:36,846 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-04-07 00:46:36,851 [ scc.git] DEBUG Already up to date.
2024-04-07 00:46:36,852 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-07 00:46:37,278 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-04-07 00:46:37,278 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-07 00:46:37,283 [ scc.git] DEBUG ## Unique users: []
2024-04-07 00:46:37,283 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:37,283 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:37,290 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-07 00:46:37,297 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:37,303 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-07 00:46:37,321 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-04-07 00:46:37,321 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-04-07 00:46:37,321 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-07 00:46:37,322 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-07 00:46:37,330 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-07 00:46:37,336 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-04-07 00:46:37,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:37,482 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-07 00:46:37,489 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-07 00:46:37,496 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#24](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-04-07 00:46:37,502 [ scc.config] DEBUG Found github.token
2024-04-07 00:46:37,502 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-04-07 00:46:37,502 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-07 00:46:37,546 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:37,546 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:37,553 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-07 00:46:37,595 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-07 00:46:37,602 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06c01e2430> has no local changes
2024-04-07 00:46:37,602 [ 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#24 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/)'
2024-04-07 00:46:37,612 [ scc.git] DEBUG [detached HEAD 9aa7b1e] merge master -Dorg -Ssuccess-only
2024-04-07 00:46:37,613 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:37,613 [ scc.repo] DEBUG ## PRs found:
2024-04-07 00:46:37,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-04-07 00:46:37,908 [ scc.repo] DEBUG ## Branches found:
2024-04-07 00:46:37,908 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-07 00:46:37,908 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:37,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:37,915 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-07 00:46:37,922 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-07 00:46:37,923 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-07 00:46:37,929 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-07 00:46:37,935 [ scc.git] DEBUG Already up to date.
2024-04-07 00:46:37,935 [ scc.git] DEBUG ## Unique users: []
2024-04-07 00:46:37,935 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:37,936 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:37,941 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-07 00:46:37,980 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:37,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:37,987 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-07 00:46:38,029 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-07 00:46:38,037 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06c01c2c10> has no local changes
2024-04-07 00:46:38,037 [ 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#24 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/)'
2024-04-07 00:46:38,046 [ scc.git] DEBUG [detached HEAD 1b722d6] merge master -Dorg -Ssuccess-only
2024-04-07 00:46:38,047 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:38,047 [ scc.repo] DEBUG ## PRs found:
2024-04-07 00:46:38,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-04-07 00:46:38,332 [ scc.repo] DEBUG ## Branches found:
2024-04-07 00:46:38,332 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-07 00:46:38,332 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:38,332 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:38,340 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-07 00:46:38,346 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-07 00:46:38,346 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-07 00:46:38,353 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-07 00:46:38,360 [ scc.git] DEBUG Already up to date.
2024-04-07 00:46:38,360 [ scc.git] DEBUG ## Unique users: []
2024-04-07 00:46:38,361 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:38,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:38,367 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-07 00:46:38,408 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:38,409 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:38,414 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-07 00:46:38,454 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-07 00:46:38,461 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06c0174940> has no local changes
2024-04-07 00:46:38,461 [ 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#24 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/)'
2024-04-07 00:46:38,469 [ scc.git] DEBUG [detached HEAD ed68212] merge master -Dorg -Ssuccess-only
2024-04-07 00:46:38,470 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:38,470 [ scc.repo] DEBUG ## PRs found:
2024-04-07 00:46:38,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-04-07 00:46:39,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-04-07 00:46:39,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-04-07 00:46:40,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-07 00:46:40,726 [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-07 00:46:41,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-07 00:46:41,681 [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-07 00:46:41,681 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-04-07 00:46:41,682 [ scc.repo] DEBUG ## Branches found:
2024-04-07 00:46:41,682 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-07 00:46:41,682 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:41,682 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:41,688 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-07 00:46:41,694 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-07 00:46:41,695 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-07 00:46:41,701 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-07 00:46:41,707 [ scc.git] DEBUG Already up to date.
2024-04-07 00:46:41,707 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-04-07 00:46:42,217 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-04-07 00:46:42,217 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-04-07 00:46:42,222 [ scc.git] DEBUG ## Unique users: []
2024-04-07 00:46:42,222 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:42,222 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:42,229 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-07 00:46:42,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:42,243 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-07 00:46:42,359 [ scc.git] DEBUG Auto-merging Dockerfile
2024-04-07 00:46:42,359 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-04-07 00:46:42,359 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-07 00:46:42,360 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-07 00:46:42,367 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-07 00:46:42,375 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-04-07 00:46:42,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:42,526 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-07 00:46:42,532 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-07 00:46:42,538 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#24](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-04-07 00:46:42,542 [ scc.config] DEBUG Found github.token
2024-04-07 00:46:42,542 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-04-07 00:46:42,542 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-07 00:46:42,582 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:42,582 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:42,589 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-07 00:46:42,630 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-07 00:46:42,638 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06c01809a0> has no local changes
2024-04-07 00:46:42,638 [ 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#24 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/)'
2024-04-07 00:46:42,648 [ scc.git] DEBUG [detached HEAD a29ad7a] merge master -Dorg -Ssuccess-only
2024-04-07 00:46:42,649 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:42,649 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-07 00:46:42,649 [ scc.repo] DEBUG ## PRs found:
2024-04-07 00:46:43,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-07 00:46:43,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-07 00:46:43,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-07 00:46:44,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-07 00:46:44,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-07 00:46:45,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-07 00:46:45,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-07 00:46:46,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-07 00:46:46,708 [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-07 00:46:47,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-07 00:46:47,557 [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-07 00:46:47,558 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-07 00:46:48,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-07 00:46:48,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-07 00:46:48,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-07 00:46:49,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-07 00:46:49,475 [ scc.repo] DEBUG ## Branches found:
2024-04-07 00:46:49,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-07 00:46:49,475 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:49,475 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:49,482 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-07 00:46:49,486 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-07 00:46:49,487 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-07 00:46:49,491 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-07 00:46:49,496 [ scc.git] DEBUG Already up to date.
2024-04-07 00:46:49,496 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-07 00:46:49,914 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-04-07 00:46:49,914 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-07 00:46:49,919 [ scc.git] DEBUG ## Unique users: []
2024-04-07 00:46:49,919 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:49,919 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:49,925 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-07 00:46:49,932 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:49,937 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-07 00:46:49,972 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-07 00:46:49,972 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-07 00:46:49,973 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-07 00:46:49,973 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-07 00:46:49,979 [ scc.git] DEBUG Calling 'git reset --hard 2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-07 00:46:49,985 [ scc.git] DEBUG HEAD is now at 2078ac7 Bump version: 5.8.0 → 5.8.1.dev0
2024-04-07 00:46:50,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:50,133 [ scc.git] DEBUG Calling 'git merge-base 2078ac72dbf11f2733e685000a274eff81c2ac2d 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-07 00:46:50,140 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-07 00:46:50,147 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#24](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-07 00:46:50,151 [ scc.config] DEBUG Found github.token
2024-04-07 00:46:50,152 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-07 00:46:50,152 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-07 00:46:50,194 [ scc.git] DEBUG Get sha1 of %s
2024-04-07 00:46:50,194 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-07 00:46:50,200 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-07 00:46:50,241 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-07 00:46:50,248 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06c0174bb0> has no local changes
2024-04-07 00:46:50,248 [ 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#24 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/)'
2024-04-07 00:46:50,256 [ scc.git] DEBUG [detached HEAD 23dd82f] merge master -Dorg -Ssuccess-only
2024-04-07 00:46:50,256 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:50,256 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-07 00:46:50,332 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-04-07 00:46:50,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:50,550 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-04-07 00:46:50,555 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-04-07 00:46:50,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:50,958 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-04-07 00:46:50,962 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-04-07 00:46:51,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:51,358 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-04-07 00:46:51,363 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-04-07 00:46:51,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:51,774 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-04-07 00:46:52,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:52,169 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-04-07 00:46:52,173 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-04-07 00:46:52,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:52,584 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-04-07 00:46:52,590 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-04-07 00:46:52,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:52,988 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-04-07 00:46:52,992 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-04-07 00:46:53,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:53,395 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-04-07 00:46:53,399 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-04-07 00:46:53,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:53,784 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-04-07 00:46:53,789 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-04-07 00:46:54,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:54,206 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-04-07 00:46:54,210 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-04-07 00:46:54,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:54,605 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-04-07 00:46:54,610 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-04-07 00:46:54,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:55,010 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-04-07 00:46:55,014 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-04-07 00:46:55,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:55,425 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-04-07 00:46:55,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:55,844 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-04-07 00:46:56,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:56,251 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-04-07 00:46:56,256 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-04-07 00:46:56,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:56,664 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-04-07 00:46:57,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:57,090 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-04-07 00:46:57,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:57,493 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-04-07 00:46:57,497 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-04-07 00:46:57,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:57,903 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-04-07 00:46:57,908 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-04-07 00:46:58,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:58,312 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-04-07 00:46:58,317 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-04-07 00:46:58,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:58,725 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-04-07 00:46:58,729 [ scc.config] DEBUG Found submodule.scripts.url
2024-04-07 00:46:59,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-07 00:46:59,124 [ scc.config] DEBUG Found submodule.scripts.branch
2024-04-07 00:46:59,125 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-07 00:46:59,204 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06c3bf6ac0> has local changes
2024-04-07 00:46:59,204 [ 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#24 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-plugins-push/24/)'
2024-04-07 00:46:59,220 [ scc.git] DEBUG [detached HEAD ae220ba] merge master -Dorg -Ssuccess-only
2024-04-07 00:46:59,220 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-04-07 00:46:59,220 [ scc.merge] INFO Repository: ome/omero-plugins
2024-04-07 00:46:59,220 [ scc.merge] INFO Already up to date.
2024-04-07 00:46:59,220 [ scc.merge] INFO
2024-04-07 00:46:59,220 [ scc.merge] INFO
2024-04-07 00:46:59,220 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-04-07 00:46:59,220 [ scc.merge] INFO Already up to date.
2024-04-07 00:46:59,220 [ scc.merge] INFO
2024-04-07 00:46:59,221 [ scc.merge] INFO
2024-04-07 00:46:59,221 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-04-07 00:46:59,221 [ scc.merge] INFO Excluded PRs:
2024-04-07 00:46:59,221 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-04-07 00:46:59,221 [ scc.merge] INFO Already up to date.
2024-04-07 00:46:59,221 [ scc.merge] INFO
2024-04-07 00:46:59,221 [ scc.merge] INFO Merged PRs:
2024-04-07 00:46:59,221 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-04-07 00:46:59,221 [ scc.merge] INFO
2024-04-07 00:46:59,221 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-04-07 00:46:59,221 [ scc.merge] INFO Excluded PRs:
2024-04-07 00:46:59,221 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-04-07 00:46:59,221 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-04-07 00:46:59,221 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-04-07 00:46:59,221 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-04-07 00:46:59,221 [ scc.merge] INFO Already up to date.
2024-04-07 00:46:59,221 [ scc.merge] INFO
2024-04-07 00:46:59,221 [ scc.merge] INFO Merged PRs:
2024-04-07 00:46:59,221 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-04-07 00:46:59,221 [ scc.merge] INFO
2024-04-07 00:46:59,221 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-04-07 00:46:59,221 [ scc.merge] INFO Excluded PRs:
2024-04-07 00:46:59,221 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-07 00:46:59,221 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-04-07 00:46:59,221 [ scc.merge] INFO Already up to date.
2024-04-07 00:46:59,221 [ scc.merge] INFO
2024-04-07 00:46:59,221 [ scc.merge] INFO Merged PRs:
2024-04-07 00:46:59,221 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-04-07 00:46:59,221 [ scc.merge] INFO
2024-04-07 00:46:59,221 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-07 00:46:59,221 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-04-07 00:46:59,221 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-04-07 00:46:59,221 [ scc.merge] INFO
2024-04-07 00:46:59,221 [ scc.merge] INFO Repository: ome/omero-figure
2024-04-07 00:46:59,221 [ scc.merge] INFO Excluded PRs:
2024-04-07 00:46:59,221 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-04-07 00:46:59,221 [ scc.merge] INFO Already up to date.
2024-04-07 00:46:59,221 [ scc.merge] INFO
2024-04-07 00:46:59,222 [ scc.merge] INFO Merged PRs:
2024-04-07 00:46:59,222 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-04-07 00:46:59,222 [ scc.merge] INFO - PR 548 will-moore 'Fix cropping of panel labels and float usage for shape labels'
2024-04-07 00:46:59,222 [ scc.merge] INFO
2024-04-07 00:46:59,222 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-04-07 00:46:59,222 [ scc.merge] INFO Already up to date.
2024-04-07 00:46:59,222 [ scc.merge] INFO
2024-04-07 00:46:59,222 [ scc.merge] INFO Merged PRs:
2024-04-07 00:46:59,222 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-04-07 00:46:59,222 [ scc.merge] INFO
2024-04-07 00:46:59,222 [ scc.merge] INFO Repository: ome/omero-gallery
2024-04-07 00:46:59,222 [ scc.merge] INFO Already up to date.
2024-04-07 00:46:59,222 [ scc.merge] INFO
2024-04-07 00:46:59,222 [ scc.merge] INFO Merged PRs:
2024-04-07 00:46:59,222 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-07 00:46:59,222 [ scc.merge] INFO
2024-04-07 00:46:59,222 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-04-07 00:46:59,222 [ scc.merge] INFO Excluded PRs:
2024-04-07 00:46:59,222 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-04-07 00:46:59,222 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-04-07 00:46:59,222 [ scc.merge] INFO Already up to date.
2024-04-07 00:46:59,222 [ scc.merge] INFO
2024-04-07 00:46:59,222 [ scc.merge] INFO Merged PRs:
2024-04-07 00:46:59,222 [ scc.merge] INFO - PR 456 will-moore 'Don't use tiles for non-big movies'
2024-04-07 00:46:59,222 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-04-07 00:46:59,222 [ scc.merge] INFO - PR 464 will-moore 'Tile load error warning'
2024-04-07 00:46:59,222 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-04-07 00:46:59,222 [ scc.merge] INFO - PR 467 dependabot[bot] 'Bump webpack-dev-middleware from 5.3.3 to 5.3.4'
2024-04-07 00:46:59,222 [ scc.merge] INFO - PR 468 dependabot[bot] 'Bump express from 4.18.2 to 4.19.2'
2024-04-07 00:46:59,222 [ scc.merge] INFO
2024-04-07 00:46:59,222 [ scc.merge] INFO Repository: ome/omero-mapr
2024-04-07 00:46:59,222 [ scc.merge] INFO Excluded PRs:
2024-04-07 00:46:59,222 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-04-07 00:46:59,222 [ scc.merge] INFO Already up to date.
2024-04-07 00:46:59,222 [ scc.merge] INFO
2024-04-07 00:46:59,222 [ scc.merge] INFO Merged PRs:
2024-04-07 00:46:59,222 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-04-07 00:46:59,222 [ scc.merge] INFO
2024-04-07 00:46:59,222 [ scc.merge] INFO Repository: ome/omero-metadata
2024-04-07 00:46:59,223 [ scc.merge] INFO Already up to date.
2024-04-07 00:46:59,223 [ scc.merge] INFO
2024-04-07 00:46:59,223 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-07 00:46:59,223 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-07 00:46:59,223 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-07 00:46:59,223 [ scc.merge] INFO
2024-04-07 00:46:59,223 [ scc.merge] INFO Repository: ome/omero-parade
2024-04-07 00:46:59,223 [ scc.merge] INFO Excluded PRs:
2024-04-07 00:46:59,223 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-04-07 00:46:59,223 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-04-07 00:46:59,223 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-04-07 00:46:59,223 [ scc.merge] INFO Already up to date.
2024-04-07 00:46:59,223 [ scc.merge] INFO
2024-04-07 00:46:59,223 [ scc.merge] INFO Merged PRs:
2024-04-07 00:46:59,223 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-07 00:46:59,223 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-07 00:46:59,223 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-07 00:46:59,223 [ scc.merge] INFO
2024-04-07 00:46:59,223 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-04-07 00:46:59,223 [ scc.merge] INFO Already up to date.
2024-04-07 00:46:59,223 [ scc.merge] INFO
2024-04-07 00:46:59,223 [ scc.merge] INFO Merged PRs:
2024-04-07 00:46:59,223 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-04-07 00:46:59,223 [ scc.merge] INFO
2024-04-07 00:46:59,223 [ scc.merge] INFO Repository: ome/omero-rois
2024-04-07 00:46:59,223 [ scc.merge] INFO Excluded PRs:
2024-04-07 00:46:59,223 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-07 00:46:59,223 [ scc.merge] INFO Already up to date.
2024-04-07 00:46:59,223 [ scc.merge] INFO
2024-04-07 00:46:59,223 [ scc.merge] INFO Merged PRs:
2024-04-07 00:46:59,223 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-07 00:46:59,223 [ scc.merge] INFO
2024-04-07 00:46:59,223 [ scc.merge] INFO Repository: ome/omero-signup
2024-04-07 00:46:59,223 [ scc.merge] INFO Already up to date.
2024-04-07 00:46:59,223 [ scc.merge] INFO
2024-04-07 00:46:59,223 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-07 00:46:59,223 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-07 00:46:59,223 [ scc.merge] INFO
2024-04-07 00:46:59,223 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-04-07 00:46:59,224 [ scc.merge] INFO Already up to date.
2024-04-07 00:46:59,224 [ scc.merge] INFO
2024-04-07 00:46:59,224 [ scc.merge] INFO Merged PRs:
2024-04-07 00:46:59,224 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-07 00:46:59,224 [ scc.merge] INFO
2024-04-07 00:46:59,224 [ scc.merge] INFO Repository: ome/omero-upload
2024-04-07 00:46:59,224 [ scc.merge] INFO Already up to date.
2024-04-07 00:46:59,224 [ scc.merge] INFO
2024-04-07 00:46:59,224 [ scc.merge] INFO
2024-04-07 00:46:59,224 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-04-07 00:46:59,224 [ scc.merge] INFO Already up to date.
2024-04-07 00:46:59,224 [ scc.merge] INFO
2024-04-07 00:46:59,224 [ scc.merge] INFO
2024-04-07 00:46:59,224 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-04-07 00:46:59,224 [ scc.merge] INFO Excluded PRs:
2024-04-07 00:46:59,224 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-04-07 00:46:59,224 [ scc.merge] INFO Already up to date.
2024-04-07 00:46:59,224 [ scc.merge] INFO
2024-04-07 00:46:59,224 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-07 00:46:59,224 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-07 00:46:59,224 [ scc.merge] INFO
2024-04-07 00:46:59,224 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-04-07 00:46:59,224 [ scc.merge] INFO Already up to date.
2024-04-07 00:46:59,224 [ scc.merge] INFO
2024-04-07 00:46:59,224 [ scc.merge] INFO
2024-04-07 00:46:59,224 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-04-07 00:46:59,224 [ scc.merge] INFO Already up to date.
2024-04-07 00:46:59,224 [ scc.merge] INFO
2024-04-07 00:46:59,224 [ scc.merge] INFO
2024-04-07 00:46:59,224 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-04-07 00:46:59,224 [ scc.merge] INFO Already up to date.
2024-04-07 00:46:59,224 [ scc.merge] INFO
2024-04-07 00:46:59,224 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-07 00:46:59,224 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-04-07 00:46:59,224 [ scc.merge] INFO
2024-04-07 00:46:59,224 [ scc.merge] INFO Repository: ome/scripts
2024-04-07 00:46:59,224 [ scc.merge] INFO Excluded PRs:
2024-04-07 00:46:59,224 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-07 00:46:59,224 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-07 00:46:59,224 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-07 00:46:59,225 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-07 00:46:59,225 [ scc.merge] INFO Already up to date.
2024-04-07 00:46:59,225 [ scc.merge] INFO
2024-04-07 00:46:59,225 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-07 00:46:59,225 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-07 00:46:59,225 [ scc.merge] INFO
2024-04-07 00:46:59,225 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-07 00:46:59,225 [ scc.git] DEBUG Calling 'git remote'
2024-04-07 00:46:59,231 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-04-07 00:46:59,231 [ scc.git] DEBUG Calling 'git remote'
2024-04-07 00:46:59,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:59,238 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-04-07 00:46:59,238 [ scc.git] DEBUG Calling 'git remote'
2024-04-07 00:46:59,246 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:59,246 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-04-07 00:46:59,246 [ scc.git] DEBUG Calling 'git remote'
2024-04-07 00:46:59,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:59,256 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-04-07 00:46:59,256 [ scc.git] DEBUG Calling 'git remote'
2024-04-07 00:46:59,261 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:59,262 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-04-07 00:46:59,262 [ scc.git] DEBUG Calling 'git remote'
2024-04-07 00:46:59,268 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:59,268 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-07 00:46:59,268 [ scc.git] DEBUG Calling 'git remote'
2024-04-07 00:46:59,273 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:59,273 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-07 00:46:59,274 [ scc.git] DEBUG Calling 'git remote'
2024-04-07 00:46:59,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:59,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-07 00:46:59,278 [ scc.git] DEBUG Calling 'git remote'
2024-04-07 00:46:59,283 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:59,283 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-07 00:46:59,283 [ scc.git] DEBUG Calling 'git remote'
2024-04-07 00:46:59,287 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:59,288 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-07 00:46:59,288 [ scc.git] DEBUG Calling 'git remote'
2024-04-07 00:46:59,292 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:59,292 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-07 00:46:59,292 [ scc.git] DEBUG Calling 'git remote'
2024-04-07 00:46:59,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:59,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-07 00:46:59,298 [ scc.git] DEBUG Calling 'git remote'
2024-04-07 00:46:59,304 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:59,304 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-07 00:46:59,304 [ scc.git] DEBUG Calling 'git remote'
2024-04-07 00:46:59,310 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:59,310 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-07 00:46:59,310 [ scc.git] DEBUG Calling 'git remote'
2024-04-07 00:46:59,315 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:59,315 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-07 00:46:59,315 [ scc.git] DEBUG Calling 'git remote'
2024-04-07 00:46:59,321 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:59,321 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-07 00:46:59,321 [ scc.git] DEBUG Calling 'git remote'
2024-04-07 00:46:59,326 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:59,327 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-07 00:46:59,327 [ scc.git] DEBUG Calling 'git remote'
2024-04-07 00:46:59,331 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:59,332 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-07 00:46:59,332 [ scc.git] DEBUG Calling 'git remote'
2024-04-07 00:46:59,338 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:59,338 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-07 00:46:59,338 [ scc.git] DEBUG Calling 'git remote'
2024-04-07 00:46:59,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:59,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-07 00:46:59,344 [ scc.git] DEBUG Calling 'git remote'
2024-04-07 00:46:59,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:59,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-07 00:46:59,349 [ scc.git] DEBUG Calling 'git remote'
2024-04-07 00:46:59,353 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-07 00:46:59,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-07 00:46:59,354 [ scc.git] DEBUG Calling 'git remote'
2024-04-07 00:46:59,359 [ 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 4d0caf9] 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 d91dbdb] 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-07 00:47:45,437 [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-07 00:47:54,297 [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-07 00:47:56,633 [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-07 00:48:01,241 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-07 00:48:47,504 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
