Skipping 122 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2024-04-22 00:46:31,458 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png
2024-04-22 00:46:31,458 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png
2024-04-22 00:46:31,458 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png
2024-04-22 00:46:31,458 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.js
2024-04-22 00:46:31,459 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js
2024-04-22 00:46:31,459 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-1.11.1/jquery.min.js
2024-04-22 00:46:31,459 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.base.css
2024-04-22 00:46:31,459 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/css/jquery.ui.slider.css
2024-04-22 00:46:31,459 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/jquery-ui-1.10.4/jquery-ui.min.js
2024-04-22 00:46:31,459 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/json2.js
2024-04-22 00:46:31,459 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.js
2024-04-22 00:46:31,459 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/markdown-browser-0.6.0-beta1/markdown.min.js
2024-04-22 00:46:31,459 [ scc.git] DEBUG delete mode 100755 omero_figure/static/figure/3rdparty/mousetrap-1.5.3/mousetrap.min.js
2024-04-22 00:46:31,459 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael-min.js
2024-04-22 00:46:31,459 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/raphael.js
2024-04-22 00:46:31,459 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/raphael-2.1.2/scaleraphael.js
2024-04-22 00:46:31,459 [ scc.git] DEBUG delete mode 100644 omero_figure/static/figure/3rdparty/underscore-1.13.1-umd-min.js
2024-04-22 00:46:31,459 [ scc.git] DEBUG delete mode 100644 omero_figure/templates/figure/index.html
2024-04-22 00:46:31,459 [ scc.git] DEBUG delete mode 100644 spec/ViewportViewSpec.js
2024-04-22 00:46:31,459 [ scc.git] DEBUG delete mode 100644 spec/images/testImage.png
2024-04-22 00:46:31,459 [ scc.git] DEBUG delete mode 100644 spec/javascripts/PanelSpec.js
2024-04-22 00:46:31,459 [ scc.git] DEBUG delete mode 100644 spec/javascripts/ViewportViewSpec.js
2024-04-22 00:46:31,459 [ scc.git] DEBUG delete mode 100644 spec/javascripts/fixtures/previewTab.html
2024-04-22 00:46:31,459 [ scc.git] DEBUG create mode 100644 src/.env
2024-04-22 00:46:31,459 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/css/figure.css (70%)
2024-04-22 00:46:31,459 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/arrow-icon-16.png (100%)
2024-04-22 00:46:31,459 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down-grey.png (100%)
2024-04-22 00:46:31,459 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-down.png (100%)
2024-04-22 00:46:31,459 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-flat.png (100%)
2024-04-22 00:46:31,459 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/button-up.png (100%)
2024-04-22 00:46:31,459 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/crop20.png (100%)
2024-04-22 00:46:31,459 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/cursor-icon-16.png (100%)
2024-04-22 00:46:31,459 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/ellipse-icon-16.png (100%)
2024-04-22 00:46:31,459 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/gradient.png (100%)
2024-04-22 00:46:31,459 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png => src/images/hue.png (100%)
2024-04-22 00:46:31,459 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-22 00:46:31,459 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/line-icon-16.png (100%)
2024-04-22 00:46:31,459 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/luts_10.png (100%)
2024-04-22 00:46:31,459 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_dark32x20.png (100%)
2024-04-22 00:46:31,459 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/markdown_light32x20.png (100%)
2024-04-22 00:46:31,459 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polygon-icon-16.png (100%)
2024-04-22 00:46:31,460 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/polyline-icon-16.png (100%)
2024-04-22 00:46:31,460 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/projection20.png (100%)
2024-04-22 00:46:31,460 [ scc.git] DEBUG rename {omero_figure/static/figure => src}/images/square-outline-icon-16.png (100%)
2024-04-22 00:46:31,460 [ scc.git] DEBUG create mode 100644 src/index.html
2024-04-22 00:46:31,460 [ scc.git] DEBUG delete mode 100644 src/js/app.js
2024-04-22 00:46:31,460 [ scc.git] DEBUG create mode 100644 src/js/main.js
2024-04-22 00:46:31,460 [ scc.git] DEBUG create mode 100644 src/js/shapeEditorTest.js
2024-04-22 00:46:31,460 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/ellipse.js
2024-04-22 00:46:31,460 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/line.js
2024-04-22 00:46:31,460 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/polygon.js
2024-04-22 00:46:31,460 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/rect.js
2024-04-22 00:46:31,460 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/shape_manager.js
2024-04-22 00:46:31,460 [ scc.git] DEBUG rename {omero_figure/static/figure/3rdparty/backbone.mousetrap => src/js/views}/backbone.mousetrap.js (76%)
2024-04-22 00:46:31,460 [ scc.git] DEBUG mode change 100755 => 100644
2024-04-22 00:46:31,460 [ scc.git] DEBUG rename omero_figure/static/figure/3rdparty/ome.csrf.js => src/js/views/util.csrf.js (84%)
2024-04-22 00:46:31,460 [ scc.git] DEBUG create mode 100644 src/js/views/zt_sliders_view.js
2024-04-22 00:46:31,460 [ scc.git] DEBUG create mode 100644 src/scss/styles.scss
2024-04-22 00:46:31,460 [ scc.git] DEBUG create mode 100644 src/shapeEditorTest.html
2024-04-22 00:46:31,460 [ scc.git] DEBUG create mode 100644 src/templates/channel_slider.template.html
2024-04-22 00:46:31,460 [ scc.git] DEBUG delete mode 100644 src/templates/channel_slider_template.html
2024-04-22 00:46:31,460 [ scc.git] DEBUG rename src/templates/{figure_panel_template.html => figure_panel.template.html} (77%)
2024-04-22 00:46:31,460 [ scc.git] DEBUG rename src/templates/files/{figure_file_item.html => figure_file_item.template.html} (100%)
2024-04-22 00:46:31,460 [ scc.git] DEBUG rename src/templates/{image_display_options_template.html => image_display_options.template.html} (54%)
2024-04-22 00:46:31,460 [ scc.git] DEBUG rename src/templates/{info_panel_template.html => info_panel.template.html} (90%)
2024-04-22 00:46:31,460 [ scc.git] DEBUG rename src/templates/labels/{label_template.html => label.template.html} (100%)
2024-04-22 00:46:31,460 [ scc.git] DEBUG rename src/templates/labels/{label_right_vertical_template.html => label_right_vertical.template.html} (100%)
2024-04-22 00:46:31,460 [ scc.git] DEBUG rename src/templates/labels/{label_table_template.html => label_table.template.html} (100%)
2024-04-22 00:46:31,460 [ scc.git] DEBUG rename src/templates/labels/{label_vertical_template.html => label_vertical.template.html} (100%)
2024-04-22 00:46:31,460 [ scc.git] DEBUG rename src/templates/{labels_form_template.html => labels_form.template.html} (89%)
2024-04-22 00:46:31,460 [ scc.git] DEBUG create mode 100644 src/templates/labels_form_inner.template.html
2024-04-22 00:46:31,460 [ scc.git] DEBUG delete mode 100644 src/templates/labels_form_inner_template.html
2024-04-22 00:46:31,460 [ scc.git] DEBUG rename src/templates/{lut_picker.html => lut_picker.template.html} (64%)
2024-04-22 00:46:31,460 [ scc.git] DEBUG rename src/templates/modal_dialogs/{crop_modal_roi.html => crop_modal_roi.template.html} (100%)
2024-04-22 00:46:31,460 [ scc.git] DEBUG rename src/templates/modal_dialogs/{paper_setup_modal_template.html => paper_setup_modal.template.html} (54%)
2024-04-22 00:46:31,460 [ scc.git] DEBUG rename src/templates/modal_dialogs/{preview_Id_change_template.html => preview_id_change.template.html} (52%)
2024-04-22 00:46:31,460 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_roi.html => roi_modal_roi.template.html} (94%)
2024-04-22 00:46:31,460 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_modal_shape.html => roi_modal_shape.template.html} (100%)
2024-04-22 00:46:31,461 [ scc.git] DEBUG rename src/templates/modal_dialogs/{roi_zt_buttons.html => roi_zt_buttons.template.html} (62%)
2024-04-22 00:46:31,461 [ scc.git] DEBUG create mode 100644 src/templates/rois_form.template.html
2024-04-22 00:46:31,461 [ scc.git] DEBUG delete mode 100644 src/templates/rois_form_template.html
2024-04-22 00:46:31,461 [ scc.git] DEBUG create mode 100644 src/templates/scalebar_form.template.html
2024-04-22 00:46:31,461 [ scc.git] DEBUG delete mode 100644 src/templates/scalebar_form_template.html
2024-04-22 00:46:31,461 [ scc.git] DEBUG rename src/templates/{scalebar_panel_template.html => scalebar_panel.template.html} (100%)
2024-04-22 00:46:31,461 [ scc.git] DEBUG rename src/templates/shapes/{shape_toolbar_template.html => shape_toolbar.template.html} (60%)
2024-04-22 00:46:31,461 [ scc.git] DEBUG create mode 100644 src/templates/viewport.template.html
2024-04-22 00:46:31,461 [ scc.git] DEBUG rename src/templates/{viewport_inner_template.html => viewport_inner.template.html} (100%)
2024-04-22 00:46:31,461 [ scc.git] DEBUG delete mode 100644 src/templates/viewport_template.html
2024-04-22 00:46:31,461 [ scc.git] DEBUG rename src/templates/{xywh_panel_template.html => xywh_panel.template.html} (64%)
2024-04-22 00:46:31,461 [ scc.git] DEBUG rename src/templates/{zoom_crop_template.html => zoom_crop.template.html} (54%)
2024-04-22 00:46:31,461 [ scc.git] DEBUG create mode 100644 vite.config.js
2024-04-22 00:46:31,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:46:31,622 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09f4867b631d72d6a362989df0e7194f40aa36c1'
2024-04-22 00:46:31,632 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:46:31,636 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 553 (Figure_To_Pdf: use max plane size to select the appropriate zoom level) 09f4867b631d72d6a362989df0e7194f40aa36c1'
2024-04-22 00:46:31,667 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-22 00:46:31,671 [ scc.git] DEBUG omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 ++++----
2024-04-22 00:46:31,671 [ scc.git] DEBUG 1 file changed, 4 insertions(+), 4 deletions(-)
2024-04-22 00:46:32,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:46:32,026 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-22 00:46:32,064 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:46:32,064 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:46:32,069 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-22 00:46:32,105 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-22 00:46:32,116 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff1c2581be0> has no local changes
2024-04-22 00:46:32,117 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 549 will-moore 'Inset feature' (stage: draft)
- PR 543 will-moore 'Plate well labels' (stage: draft)
Updating ded0caab..87d179a0
Previously merged:
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 553 sbesson 'Figure_To_Pdf: use max plane size to select the appropriate zoom level'
Generated by OMERO-plugins-push#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/)'
2024-04-22 00:46:32,125 [ scc.git] DEBUG [detached HEAD 9f18a141] merge master -Dorg -Ssuccess-only
2024-04-22 00:46:32,125 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:46:32,125 [ scc.repo] DEBUG ## PRs found:
2024-04-22 00:46:32,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-04-22 00:46:33,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-04-22 00:46:33,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-04-22 00:46:33,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-22 00:46:34,402 [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-22 00:46:34,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-04-22 00:46:35,367 [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-22 00:46:35,368 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-04-22 00:46:35,369 [ scc.repo] DEBUG ## Branches found:
2024-04-22 00:46:35,369 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-22 00:46:35,369 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:46:35,369 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:46:35,377 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-22 00:46:35,384 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-22 00:46:35,384 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-22 00:46:35,391 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-22 00:46:35,398 [ scc.git] DEBUG Already up to date.
2024-04-22 00:46:35,399 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-04-22 00:46:35,840 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-04-22 00:46:35,840 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-04-22 00:46:35,848 [ scc.git] DEBUG ## Unique users: []
2024-04-22 00:46:35,848 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:46:35,848 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:46:35,857 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-22 00:46:35,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:46:35,872 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-04-22 00:46:35,907 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-04-22 00:46:35,908 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-22 00:46:35,912 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-04-22 00:46:35,912 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-22 00:46:36,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:46:36,072 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-22 00:46:36,123 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:46:36,124 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:46:36,133 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-22 00:46:36,211 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-22 00:46:36,241 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff1c2538550> has no local changes
2024-04-22 00:46:36,242 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/)'
2024-04-22 00:46:36,263 [ scc.git] DEBUG [detached HEAD a631deb] merge master -Dorg -Ssuccess-only
2024-04-22 00:46:36,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:46:36,265 [ scc.repo] DEBUG ## PRs found:
2024-04-22 00:46:36,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-04-22 00:46:37,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-04-22 00:46:37,033 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-22 00:46:37,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-22 00:46:38,042 [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-22 00:46:38,517 [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-22 00:46:39,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-04-22 00:46:39,492 [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-22 00:46:39,493 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-22 00:46:39,493 [ scc.repo] DEBUG ## Branches found:
2024-04-22 00:46:39,494 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-22 00:46:39,494 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:46:39,494 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:46:39,501 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-22 00:46:39,508 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-22 00:46:39,508 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-22 00:46:39,515 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-22 00:46:39,523 [ scc.git] DEBUG Already up to date.
2024-04-22 00:46:39,523 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-04-22 00:46:39,915 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-04-22 00:46:39,916 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-04-22 00:46:39,926 [ scc.git] DEBUG ## Unique users: []
2024-04-22 00:46:39,926 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:46:39,926 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:46:39,935 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-04-22 00:46:39,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:46:39,953 [ 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-22 00:46:39,964 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-22 00:46:39,969 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-04-22 00:46:39,969 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-04-22 00:46:40,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:46:40,151 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-22 00:46:40,195 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:46:40,196 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:46:40,202 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-22 00:46:40,242 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-22 00:46:40,252 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff1c252a9d0> has no local changes
2024-04-22 00:46:40,252 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/)'
2024-04-22 00:46:40,262 [ scc.git] DEBUG [detached HEAD a53db12] merge master -Dorg -Ssuccess-only
2024-04-22 00:46:40,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:46:40,263 [ scc.repo] DEBUG ## PRs found:
2024-04-22 00:46:40,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-04-22 00:46:41,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-04-22 00:46:41,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-04-22 00:46:42,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-04-22 00:46:42,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-22 00:46:42,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-22 00:46:43,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-04-22 00:46:43,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-04-22 00:46:43,844 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-04-22 00:46:44,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470 HTTP/1.1" 200 None
2024-04-22 00:46:44,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/470/comments HTTP/1.1" 200 None
2024-04-22 00:46:45,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/44025ed69514a02ecbc5d4655d3da7519ebf9170 HTTP/1.1" 200 None
2024-04-22 00:46:45,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/44025ed69514a02ecbc5d4655d3da7519ebf9170/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-22 00:46:46,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/44025ed69514a02ecbc5d4655d3da7519ebf9170/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-22 00:46:46,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/44025ed69514a02ecbc5d4655d3da7519ebf9170 HTTP/1.1" 200 None
2024-04-22 00:46:47,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/44025ed69514a02ecbc5d4655d3da7519ebf9170?per_page=1 HTTP/1.1" 200 2
2024-04-22 00:46:47,122 [ scc.repo] DEBUG - PR 470 will-moore 'Movie playing waits for planes'
2024-04-22 00:46:47,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/469 HTTP/1.1" 200 None
2024-04-22 00:46:48,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-22 00:46:48,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-22 00:46:49,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-22 00:46:49,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/ca8b5aabef9a5358f93add750f4cbb51c864b7fe HTTP/1.1" 200 None
2024-04-22 00:46:50,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/ca8b5aabef9a5358f93add750f4cbb51c864b7fe?per_page=1 HTTP/1.1" 200 2
2024-04-22 00:46:50,010 [ scc.repo] DEBUG - PR 469 will-moore 'changelog 0.14.0'
2024-04-22 00:46:50,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-04-22 00:46:50,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-04-22 00:46:51,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-22 00:46:51,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-22 00:46:52,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-22 00:46:52,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/409c3429dd72d05fef895dcca6d133f8340eabf4 HTTP/1.1" 200 None
2024-04-22 00:46:53,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/409c3429dd72d05fef895dcca6d133f8340eabf4?per_page=1 HTTP/1.1" 200 2
2024-04-22 00:46:53,321 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-04-22 00:46:53,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-04-22 00:46:54,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-04-22 00:46:54,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-22 00:46:55,172 [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-22 00:46:55,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-04-22 00:46:56,093 [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-22 00:46:56,094 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-04-22 00:46:56,094 [ scc.repo] DEBUG ## Branches found:
2024-04-22 00:46:56,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-22 00:46:56,094 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:46:56,095 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:46:56,102 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-22 00:46:56,108 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-22 00:46:56,108 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-22 00:46:56,114 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-22 00:46:56,121 [ scc.git] DEBUG Already up to date.
2024-04-22 00:46:56,121 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-04-22 00:46:56,563 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-22 00:46:56,563 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-04-22 00:46:56,568 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-04-22 00:46:57,841 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-22 00:46:57,841 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-04-22 00:46:57,846 [ scc.git] DEBUG Calling 'git fetch origin pull/469/head'
2024-04-22 00:46:58,263 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-22 00:46:58,263 [ scc.git] DEBUG * branch refs/pull/469/head -> FETCH_HEAD
2024-04-22 00:46:58,268 [ scc.git] DEBUG Calling 'git fetch origin pull/470/head'
2024-04-22 00:46:59,136 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-22 00:46:59,137 [ scc.git] DEBUG * branch refs/pull/470/head -> FETCH_HEAD
2024-04-22 00:46:59,142 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-04-22 00:46:59,756 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-04-22 00:46:59,756 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-04-22 00:46:59,763 [ scc.git] DEBUG ## Unique users: []
2024-04-22 00:46:59,763 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:46:59,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:46:59,769 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-22 00:46:59,775 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:46:59,781 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-04-22 00:46:59,848 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-22 00:46:59,851 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-04-22 00:46:59,851 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-04-22 00:46:59,851 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-04-22 00:47:00,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:47:00,015 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-22 00:47:00,027 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:00,032 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 409c3429dd72d05fef895dcca6d133f8340eabf4'
2024-04-22 00:47:00,178 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-22 00:47:00,184 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-04-22 00:47:00,184 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-04-22 00:47:00,184 [ scc.git] DEBUG src/app/header.html | 5 +
2024-04-22 00:47:00,184 [ scc.git] DEBUG src/app/header.js | 46 ++++++++-
2024-04-22 00:47:00,184 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-04-22 00:47:00,184 [ scc.git] DEBUG src/utils/figure.js | 220 ++++++++++++++++++++++++++++++++++++++++++
2024-04-22 00:47:00,184 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 1 -
2024-04-22 00:47:00,184 [ scc.git] DEBUG 7 files changed, 294 insertions(+), 7 deletions(-)
2024-04-22 00:47:00,184 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-04-22 00:47:00,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:47:00,434 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-22 00:47:00,441 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:00,446 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 469 (changelog 0.14.0) ca8b5aabef9a5358f93add750f4cbb51c864b7fe'
2024-04-22 00:47:00,492 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-22 00:47:00,494 [ scc.git] DEBUG CHANGELOG.md | 9 ++++++++-
2024-04-22 00:47:00,494 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2024-04-22 00:47:00,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:47:00,838 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...44025ed69514a02ecbc5d4655d3da7519ebf9170'
2024-04-22 00:47:00,845 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:00,850 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 470 (Movie playing waits for planes) 44025ed69514a02ecbc5d4655d3da7519ebf9170'
2024-04-22 00:47:00,949 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-04-22 00:47:00,950 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-22 00:47:00,956 [ scc.git] DEBUG css/app.css | 22 +++++
2024-04-22 00:47:00,957 [ scc.git] DEBUG src/events/events.js | 4 +
2024-04-22 00:47:00,957 [ scc.git] DEBUG src/index-dev.html | 6 +-
2024-04-22 00:47:00,957 [ scc.git] DEBUG src/viewers/ol3-viewer.html | 2 +-
2024-04-22 00:47:00,957 [ scc.git] DEBUG src/viewers/ol3-viewer.js | 160 ++++++++++++++++++++++++-------------
2024-04-22 00:47:00,957 [ scc.git] DEBUG src/viewers/viewer/Viewer.js | 42 +++++++++-
2024-04-22 00:47:00,957 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 15 +++-
2024-04-22 00:47:00,957 [ scc.git] DEBUG 7 files changed, 190 insertions(+), 61 deletions(-)
2024-04-22 00:47:01,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:47:01,255 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-04-22 00:47:01,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:01,269 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-04-22 00:47:01,306 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-22 00:47:01,310 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-04-22 00:47:01,310 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-04-22 00:47:01,310 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-04-22 00:47:01,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:47:01,665 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-22 00:47:01,707 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:01,707 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:01,713 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-22 00:47:01,757 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-22 00:47:01,765 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff1c25185b0> has no local changes
2024-04-22 00:47:01,765 [ 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 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
- PR 471 will-moore 'Z projection disabled tooltip'
Generated by OMERO-plugins-push#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/)'
2024-04-22 00:47:01,775 [ scc.git] DEBUG [detached HEAD c8bcfe4] merge master -Dorg -Ssuccess-only
2024-04-22 00:47:01,775 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:47:01,776 [ scc.repo] DEBUG ## PRs found:
2024-04-22 00:47:02,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-04-22 00:47:02,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-04-22 00:47:03,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-04-22 00:47:03,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-22 00:47:04,343 [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-22 00:47:04,802 [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-22 00:47:05,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-04-22 00:47:05,706 [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-22 00:47:05,707 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-04-22 00:47:05,707 [ scc.repo] DEBUG ## Branches found:
2024-04-22 00:47:05,707 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-22 00:47:05,708 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:05,708 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:05,714 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-22 00:47:05,721 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-22 00:47:05,722 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-22 00:47:05,730 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-22 00:47:05,738 [ scc.git] DEBUG Already up to date.
2024-04-22 00:47:05,739 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-04-22 00:47:06,135 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-04-22 00:47:06,135 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-04-22 00:47:06,140 [ scc.git] DEBUG ## Unique users: []
2024-04-22 00:47:06,140 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:06,140 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:06,146 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-22 00:47:06,152 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:06,157 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-04-22 00:47:06,167 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-22 00:47:06,169 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-04-22 00:47:06,169 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-04-22 00:47:06,169 [ scc.git] DEBUG requirements.txt | 2 +-
2024-04-22 00:47:06,169 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-04-22 00:47:06,169 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-04-22 00:47:06,170 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-04-22 00:47:06,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:47:06,335 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-22 00:47:06,374 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:06,375 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:06,382 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-22 00:47:06,422 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-22 00:47:06,429 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff1c251f4f0> has no local changes
2024-04-22 00:47:06,430 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/)'
2024-04-22 00:47:06,439 [ scc.git] DEBUG [detached HEAD 56cc8ff] merge master -Dorg -Ssuccess-only
2024-04-22 00:47:06,439 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:47:06,439 [ scc.repo] DEBUG ## PRs found:
2024-04-22 00:47:06,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-04-22 00:47:07,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-04-22 00:47:07,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-04-22 00:47:08,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-22 00:47:08,802 [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-22 00:47:09,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-04-22 00:47:09,729 [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-22 00:47:09,729 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-22 00:47:10,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-04-22 00:47:10,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-04-22 00:47:11,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-22 00:47:11,554 [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-22 00:47:12,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-04-22 00:47:12,483 [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-22 00:47:12,484 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-22 00:47:12,484 [ scc.repo] DEBUG ## Branches found:
2024-04-22 00:47:12,484 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-22 00:47:12,485 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:12,485 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:12,492 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-22 00:47:12,502 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-22 00:47:12,503 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-22 00:47:12,511 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-22 00:47:12,522 [ scc.git] DEBUG Already up to date.
2024-04-22 00:47:12,522 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-04-22 00:47:13,195 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-22 00:47:13,195 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-04-22 00:47:13,200 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-04-22 00:47:14,167 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-04-22 00:47:14,167 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-04-22 00:47:14,173 [ scc.git] DEBUG ## Unique users: []
2024-04-22 00:47:14,173 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:14,174 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:14,183 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-22 00:47:14,193 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:14,201 [ 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-22 00:47:14,344 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-04-22 00:47:14,345 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-04-22 00:47:14,345 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-22 00:47:14,345 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-22 00:47:14,345 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-22 00:47:14,346 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-22 00:47:14,353 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-22 00:47:14,361 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-22 00:47:14,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:47:14,532 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-04-22 00:47:14,540 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-22 00:47:14,547 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#38](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-04-22 00:47:14,554 [ scc.config] DEBUG Found github.token
2024-04-22 00:47:14,554 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-04-22 00:47:14,554 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-22 00:47:14,562 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:14,569 [ 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-22 00:47:14,633 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-04-22 00:47:14,633 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-04-22 00:47:14,633 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-04-22 00:47:14,633 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-22 00:47:14,634 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-22 00:47:14,643 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-22 00:47:14,653 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-04-22 00:47:14,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:47:14,944 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-04-22 00:47:14,955 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-04-22 00:47:14,964 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#38](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/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-22 00:47:14,970 [ scc.config] DEBUG Found github.token
2024-04-22 00:47:14,971 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-04-22 00:47:14,971 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-22 00:47:15,015 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:15,015 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:15,023 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-22 00:47:15,080 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-22 00:47:15,089 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff1c2518550> has no local changes
2024-04-22 00:47:15,090 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/)'
2024-04-22 00:47:15,105 [ scc.git] DEBUG [detached HEAD f1b9f56] merge master -Dorg -Ssuccess-only
2024-04-22 00:47:15,105 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:47:15,106 [ scc.repo] DEBUG ## PRs found:
2024-04-22 00:47:15,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-04-22 00:47:16,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-04-22 00:47:16,011 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-22 00:47:16,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-22 00:47:17,098 [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-22 00:47:17,567 [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-22 00:47:18,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-04-22 00:47:18,545 [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-22 00:47:18,546 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-22 00:47:19,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-04-22 00:47:19,011 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-22 00:47:19,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-22 00:47:20,060 [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-22 00:47:20,534 [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-22 00:47:21,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-04-22 00:47:21,487 [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-22 00:47:21,488 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-22 00:47:21,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-04-22 00:47:21,941 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-22 00:47:22,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-22 00:47:23,029 [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-22 00:47:23,554 [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-22 00:47:23,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-04-22 00:47:24,412 [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-22 00:47:24,413 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-22 00:47:24,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-04-22 00:47:25,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-04-22 00:47:25,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-04-22 00:47:26,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-04-22 00:47:26,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-04-22 00:47:27,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-04-22 00:47:27,446 [ scc.repo] DEBUG ## Branches found:
2024-04-22 00:47:27,446 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-22 00:47:27,446 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:27,447 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:27,452 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-22 00:47:27,457 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-22 00:47:27,457 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-22 00:47:27,462 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-22 00:47:27,468 [ scc.git] DEBUG Already up to date.
2024-04-22 00:47:27,468 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-04-22 00:47:27,849 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-22 00:47:27,850 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-04-22 00:47:27,856 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-04-22 00:47:28,236 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-22 00:47:28,236 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-04-22 00:47:28,241 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-22 00:47:28,621 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-04-22 00:47:28,621 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-22 00:47:28,626 [ scc.git] DEBUG ## Unique users: []
2024-04-22 00:47:28,626 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:28,626 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:28,634 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-04-22 00:47:28,640 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:28,645 [ 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-22 00:47:28,658 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-22 00:47:28,662 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-04-22 00:47:28,662 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-04-22 00:47:28,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:47:28,833 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-04-22 00:47:28,840 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:28,845 [ 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-22 00:47:28,946 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-22 00:47:28,947 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-22 00:47:28,950 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-04-22 00:47:28,950 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-04-22 00:47:29,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:47:29,242 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-04-22 00:47:29,250 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:29,255 [ 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-22 00:47:29,279 [ scc.git] DEBUG Auto-merging package-lock.json
2024-04-22 00:47:29,280 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-22 00:47:29,283 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-04-22 00:47:29,283 [ scc.git] DEBUG package.json | 2 +-
2024-04-22 00:47:29,283 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-04-22 00:47:29,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:47:29,655 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-22 00:47:29,700 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:29,700 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:29,706 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-22 00:47:29,745 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-22 00:47:29,752 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff1c2522fd0> has no local changes
2024-04-22 00:47:29,752 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/)'
2024-04-22 00:47:29,777 [ scc.git] DEBUG [detached HEAD eb58a7d] merge master -Dorg -Ssuccess-only
2024-04-22 00:47:29,777 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:47:29,777 [ scc.repo] DEBUG ## PRs found:
2024-04-22 00:47:30,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-04-22 00:47:30,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-04-22 00:47:31,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-22 00:47:31,580 [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-22 00:47:32,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-04-22 00:47:32,493 [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-22 00:47:32,494 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-04-22 00:47:32,494 [ scc.repo] DEBUG ## Branches found:
2024-04-22 00:47:32,494 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-22 00:47:32,494 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:32,494 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:32,500 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-22 00:47:32,506 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-22 00:47:32,506 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-22 00:47:32,512 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-22 00:47:32,518 [ scc.git] DEBUG Already up to date.
2024-04-22 00:47:32,518 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-22 00:47:32,890 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-04-22 00:47:32,890 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-22 00:47:32,895 [ scc.git] DEBUG ## Unique users: []
2024-04-22 00:47:32,895 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:32,895 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:32,903 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-22 00:47:32,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:32,920 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-04-22 00:47:32,930 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-22 00:47:33,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:47:33,099 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-22 00:47:33,145 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:33,145 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:33,151 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-22 00:47:33,192 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-22 00:47:33,198 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff1c04a5340> has no local changes
2024-04-22 00:47:33,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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/)'
2024-04-22 00:47:33,207 [ scc.git] DEBUG [detached HEAD 9f7b789] merge master -Dorg -Ssuccess-only
2024-04-22 00:47:33,207 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:47:33,208 [ scc.repo] DEBUG ## PRs found:
2024-04-22 00:47:33,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-04-22 00:47:34,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-04-22 00:47:34,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-04-22 00:47:34,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-04-22 00:47:35,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-22 00:47:35,927 [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-22 00:47:36,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-04-22 00:47:36,848 [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-22 00:47:36,849 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-22 00:47:36,849 [ scc.repo] DEBUG ## Branches found:
2024-04-22 00:47:36,849 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-22 00:47:36,849 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:36,850 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:36,855 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-22 00:47:36,860 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-22 00:47:36,860 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-22 00:47:36,865 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-22 00:47:36,870 [ scc.git] DEBUG Already up to date.
2024-04-22 00:47:36,871 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-04-22 00:47:37,581 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-04-22 00:47:37,581 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-04-22 00:47:37,587 [ scc.git] DEBUG ## Unique users: []
2024-04-22 00:47:37,587 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:37,587 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:37,594 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-04-22 00:47:37,601 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:37,608 [ 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-22 00:47:37,620 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-04-22 00:47:37,620 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-22 00:47:37,622 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-04-22 00:47:37,622 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-04-22 00:47:37,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:47:37,781 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-22 00:47:37,822 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:37,822 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:37,829 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-22 00:47:37,868 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-22 00:47:37,877 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff1c04d25b0> has no local changes
2024-04-22 00:47:37,877 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/)'
2024-04-22 00:47:37,888 [ scc.git] DEBUG [detached HEAD 2da1ec8] merge master -Dorg -Ssuccess-only
2024-04-22 00:47:37,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:47:37,889 [ scc.repo] DEBUG ## PRs found:
2024-04-22 00:47:38,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-04-22 00:47:38,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-04-22 00:47:39,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-04-22 00:47:39,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-22 00:47:40,257 [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-22 00:47:40,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-04-22 00:47:41,198 [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-22 00:47:41,199 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-22 00:47:41,199 [ scc.repo] DEBUG ## Branches found:
2024-04-22 00:47:41,199 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-22 00:47:41,199 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:41,199 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:41,205 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-22 00:47:41,210 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-22 00:47:41,210 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-22 00:47:41,215 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-22 00:47:41,220 [ scc.git] DEBUG Already up to date.
2024-04-22 00:47:41,221 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-04-22 00:47:41,611 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-04-22 00:47:41,612 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-04-22 00:47:41,616 [ scc.git] DEBUG ## Unique users: []
2024-04-22 00:47:41,617 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:41,617 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:41,625 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-22 00:47:41,637 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:41,645 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-22 00:47:41,670 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-04-22 00:47:41,670 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-04-22 00:47:41,670 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-04-22 00:47:41,670 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-04-22 00:47:41,670 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-04-22 00:47:41,670 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-04-22 00:47:41,670 [ scc.git] DEBUG Auto-merging setup.py
2024-04-22 00:47:41,671 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-04-22 00:47:41,671 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-22 00:47:41,671 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-22 00:47:41,680 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-22 00:47:41,690 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-04-22 00:47:41,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:47:41,851 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-04-22 00:47:41,861 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-04-22 00:47:41,871 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#38](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- setup.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
--conflicts
2024-04-22 00:47:41,882 [ scc.config] DEBUG Found github.token
2024-04-22 00:47:41,883 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-04-22 00:47:41,883 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-22 00:47:41,946 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:41,946 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:41,957 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-22 00:47:42,013 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-22 00:47:42,023 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff1c252ae80> has no local changes
2024-04-22 00:47:42,023 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/)'
2024-04-22 00:47:42,035 [ scc.git] DEBUG [detached HEAD 8182f03] merge master -Dorg -Ssuccess-only
2024-04-22 00:47:42,035 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:47:42,036 [ scc.repo] DEBUG ## PRs found:
2024-04-22 00:47:42,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-04-22 00:47:42,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-04-22 00:47:43,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-04-22 00:47:43,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-22 00:47:44,238 [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-22 00:47:44,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-04-22 00:47:45,160 [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-22 00:47:45,161 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-22 00:47:45,161 [ scc.repo] DEBUG ## Branches found:
2024-04-22 00:47:45,161 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-22 00:47:45,161 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:45,161 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:45,169 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-22 00:47:45,174 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-22 00:47:45,174 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-22 00:47:45,179 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-22 00:47:45,184 [ scc.git] DEBUG Already up to date.
2024-04-22 00:47:45,184 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-04-22 00:47:45,665 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-04-22 00:47:45,665 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-04-22 00:47:45,670 [ scc.git] DEBUG ## Unique users: []
2024-04-22 00:47:45,670 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:45,670 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:45,677 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-04-22 00:47:45,683 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:45,688 [ 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-22 00:47:45,705 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-22 00:47:45,708 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-04-22 00:47:45,708 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-04-22 00:47:45,708 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-04-22 00:47:45,708 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-04-22 00:47:45,708 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-04-22 00:47:45,708 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-04-22 00:47:45,708 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-04-22 00:47:45,708 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-04-22 00:47:45,708 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-04-22 00:47:45,708 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-04-22 00:47:45,710 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-04-22 00:47:45,710 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-04-22 00:47:45,710 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-04-22 00:47:45,710 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-04-22 00:47:45,710 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-04-22 00:47:45,710 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-04-22 00:47:45,710 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-04-22 00:47:45,710 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-04-22 00:47:45,710 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-04-22 00:47:45,711 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-04-22 00:47:45,711 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-04-22 00:47:45,711 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-04-22 00:47:45,711 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-04-22 00:47:45,711 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-04-22 00:47:45,711 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-04-22 00:47:45,711 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-04-22 00:47:45,711 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-04-22 00:47:45,711 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-04-22 00:47:45,711 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-04-22 00:47:45,711 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-04-22 00:47:45,711 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-04-22 00:47:45,711 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-04-22 00:47:45,711 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-04-22 00:47:45,711 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-04-22 00:47:45,711 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-04-22 00:47:45,711 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-04-22 00:47:45,711 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-04-22 00:47:45,711 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-04-22 00:47:45,711 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-04-22 00:47:45,711 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-04-22 00:47:45,711 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-04-22 00:47:45,711 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-04-22 00:47:45,711 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-04-22 00:47:45,711 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-04-22 00:47:45,711 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-04-22 00:47:45,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:47:45,869 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-22 00:47:45,913 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:45,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:45,918 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-22 00:47:45,956 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-22 00:47:45,963 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff1c2522df0> has no local changes
2024-04-22 00:47:45,963 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/)'
2024-04-22 00:47:45,980 [ scc.git] DEBUG [detached HEAD 4fe843b] merge master -Dorg -Ssuccess-only
2024-04-22 00:47:45,980 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:47:45,980 [ scc.repo] DEBUG ## PRs found:
2024-04-22 00:47:46,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-04-22 00:47:46,301 [ scc.repo] DEBUG ## Branches found:
2024-04-22 00:47:46,301 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-22 00:47:46,302 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:46,302 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:46,309 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-22 00:47:46,314 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-22 00:47:46,314 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-22 00:47:46,320 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-22 00:47:46,326 [ scc.git] DEBUG Already up to date.
2024-04-22 00:47:46,326 [ scc.git] DEBUG ## Unique users: []
2024-04-22 00:47:46,326 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:46,327 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:46,332 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-22 00:47:46,372 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:46,373 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:46,379 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-22 00:47:46,418 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-22 00:47:46,426 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff1c04cefa0> has no local changes
2024-04-22 00:47:46,426 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/)'
2024-04-22 00:47:46,436 [ scc.git] DEBUG [detached HEAD e479c42] merge master -Dorg -Ssuccess-only
2024-04-22 00:47:46,436 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:47:46,436 [ scc.repo] DEBUG ## PRs found:
2024-04-22 00:47:46,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-04-22 00:47:46,733 [ scc.repo] DEBUG ## Branches found:
2024-04-22 00:47:46,733 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-22 00:47:46,733 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:46,733 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:46,740 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-22 00:47:46,746 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-22 00:47:46,747 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-22 00:47:46,752 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-22 00:47:46,759 [ scc.git] DEBUG Already up to date.
2024-04-22 00:47:46,759 [ scc.git] DEBUG ## Unique users: []
2024-04-22 00:47:46,759 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:46,759 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:46,765 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-22 00:47:46,808 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:46,809 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:46,815 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-22 00:47:46,859 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-22 00:47:46,866 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff1c04a0f70> has no local changes
2024-04-22 00:47:46,866 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/)'
2024-04-22 00:47:46,876 [ scc.git] DEBUG [detached HEAD 3cd80f8] merge master -Dorg -Ssuccess-only
2024-04-22 00:47:46,876 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:47:46,876 [ scc.git] INFO Overriding base-branch from master to main
2024-04-22 00:47:46,876 [ scc.repo] DEBUG ## PRs found:
2024-04-22 00:47:47,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-04-22 00:47:47,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-04-22 00:47:48,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-04-22 00:47:48,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-04-22 00:47:49,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-22 00:47:49,655 [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-22 00:47:50,129 [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-22 00:47:50,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-04-22 00:47:51,079 [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-22 00:47:51,079 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-22 00:47:51,080 [ scc.repo] DEBUG ## Branches found:
2024-04-22 00:47:51,080 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-22 00:47:51,080 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:51,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:51,089 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-04-22 00:47:51,096 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-22 00:47:51,097 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-04-22 00:47:51,105 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-04-22 00:47:51,113 [ scc.git] DEBUG Already up to date.
2024-04-22 00:47:51,114 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-04-22 00:47:51,570 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-04-22 00:47:51,570 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-04-22 00:47:51,576 [ scc.git] DEBUG ## Unique users: []
2024-04-22 00:47:51,577 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:51,577 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:51,583 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-22 00:47:51,590 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:51,597 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-22 00:47:51,625 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-04-22 00:47:51,625 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-04-22 00:47:51,625 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-22 00:47:51,626 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-22 00:47:51,636 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-22 00:47:51,644 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-04-22 00:47:51,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:47:51,804 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-04-22 00:47:51,811 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-04-22 00:47:51,821 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#38](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-04-22 00:47:51,827 [ scc.config] DEBUG Found github.token
2024-04-22 00:47:51,827 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-04-22 00:47:51,827 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-22 00:47:51,876 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:51,876 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:51,884 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-22 00:47:51,933 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-22 00:47:51,941 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff1c047f430> has no local changes
2024-04-22 00:47:51,941 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/)'
2024-04-22 00:47:51,953 [ scc.git] DEBUG [detached HEAD 838c16a] merge master -Dorg -Ssuccess-only
2024-04-22 00:47:51,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:47:51,953 [ scc.repo] DEBUG ## PRs found:
2024-04-22 00:47:52,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-04-22 00:47:52,227 [ scc.repo] DEBUG ## Branches found:
2024-04-22 00:47:52,227 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-22 00:47:52,227 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:52,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:52,235 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-22 00:47:52,240 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-22 00:47:52,240 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-22 00:47:52,246 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-22 00:47:52,253 [ scc.git] DEBUG Already up to date.
2024-04-22 00:47:52,254 [ scc.git] DEBUG ## Unique users: []
2024-04-22 00:47:52,254 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:52,254 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:52,259 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-22 00:47:52,308 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:52,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:52,315 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-22 00:47:52,359 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-22 00:47:52,367 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff1c04ade50> has no local changes
2024-04-22 00:47:52,367 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/)'
2024-04-22 00:47:52,377 [ scc.git] DEBUG [detached HEAD 9ed2d78] merge master -Dorg -Ssuccess-only
2024-04-22 00:47:52,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:47:52,377 [ scc.repo] DEBUG ## PRs found:
2024-04-22 00:47:52,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-04-22 00:47:52,667 [ scc.repo] DEBUG ## Branches found:
2024-04-22 00:47:52,667 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-22 00:47:52,667 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:52,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:52,674 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-22 00:47:52,680 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-22 00:47:52,680 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-22 00:47:52,686 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-22 00:47:52,693 [ scc.git] DEBUG Already up to date.
2024-04-22 00:47:52,694 [ scc.git] DEBUG ## Unique users: []
2024-04-22 00:47:52,694 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:52,694 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:52,700 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-22 00:47:52,740 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:52,741 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:52,747 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-22 00:47:52,791 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-22 00:47:52,800 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff1c03c7940> has no local changes
2024-04-22 00:47:52,800 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/)'
2024-04-22 00:47:52,813 [ scc.git] DEBUG [detached HEAD cef4f6e] merge master -Dorg -Ssuccess-only
2024-04-22 00:47:52,813 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:47:52,813 [ scc.repo] DEBUG ## PRs found:
2024-04-22 00:47:53,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-04-22 00:47:53,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-04-22 00:47:54,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-04-22 00:47:54,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-22 00:47:55,063 [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-22 00:47:55,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-04-22 00:47:55,944 [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-22 00:47:55,945 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-04-22 00:47:55,945 [ scc.repo] DEBUG ## Branches found:
2024-04-22 00:47:55,945 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-22 00:47:55,945 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:55,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:55,952 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-22 00:47:55,957 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-22 00:47:55,958 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-22 00:47:55,962 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-22 00:47:55,968 [ scc.git] DEBUG Already up to date.
2024-04-22 00:47:55,968 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-04-22 00:47:56,402 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-04-22 00:47:56,402 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-04-22 00:47:56,408 [ scc.git] DEBUG ## Unique users: []
2024-04-22 00:47:56,408 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:56,408 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:56,414 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-22 00:47:56,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:56,435 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-22 00:47:56,522 [ scc.git] DEBUG Auto-merging Dockerfile
2024-04-22 00:47:56,522 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-04-22 00:47:56,522 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-22 00:47:56,523 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-22 00:47:56,530 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-22 00:47:56,538 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-04-22 00:47:56,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:47:56,693 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-04-22 00:47:56,699 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-04-22 00:47:56,704 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#38](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-04-22 00:47:56,709 [ scc.config] DEBUG Found github.token
2024-04-22 00:47:56,709 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-04-22 00:47:56,710 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-22 00:47:56,748 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:47:56,749 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:47:56,754 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-22 00:47:56,792 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-22 00:47:56,798 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff1c04189d0> has no local changes
2024-04-22 00:47:56,799 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/)'
2024-04-22 00:47:56,807 [ scc.git] DEBUG [detached HEAD fff39fc] merge master -Dorg -Ssuccess-only
2024-04-22 00:47:56,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:47:56,808 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-22 00:47:56,808 [ scc.repo] DEBUG ## PRs found:
2024-04-22 00:47:57,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-22 00:47:57,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-22 00:47:58,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-22 00:47:58,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-22 00:47:59,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-22 00:47:59,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-22 00:48:00,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-22 00:48:00,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-22 00:48:01,058 [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-22 00:48:01,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-22 00:48:01,913 [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-22 00:48:01,914 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-22 00:48:02,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-22 00:48:02,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-22 00:48:03,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-22 00:48:03,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-22 00:48:03,869 [ scc.repo] DEBUG ## Branches found:
2024-04-22 00:48:03,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-22 00:48:03,870 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:48:03,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:48:03,877 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-22 00:48:03,883 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-22 00:48:03,883 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-22 00:48:03,890 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-22 00:48:03,899 [ scc.git] DEBUG Already up to date.
2024-04-22 00:48:03,899 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-22 00:48:04,403 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-04-22 00:48:04,403 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-22 00:48:04,408 [ scc.git] DEBUG ## Unique users: []
2024-04-22 00:48:04,408 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:48:04,409 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:48:04,416 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-22 00:48:04,424 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:48:04,431 [ 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-22 00:48:04,497 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-22 00:48:04,498 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-22 00:48:04,498 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-22 00:48:04,498 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-22 00:48:04,507 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-22 00:48:04,518 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-04-22 00:48:04,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:48:04,677 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-22 00:48:04,686 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-22 00:48:04,695 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#38](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-22 00:48:04,701 [ scc.config] DEBUG Found github.token
2024-04-22 00:48:04,702 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-22 00:48:04,702 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-22 00:48:04,744 [ scc.git] DEBUG Get sha1 of %s
2024-04-22 00:48:04,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-22 00:48:04,752 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-22 00:48:04,795 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-22 00:48:04,806 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff1c03c7bb0> has no local changes
2024-04-22 00:48:04,807 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/)'
2024-04-22 00:48:04,817 [ scc.git] DEBUG [detached HEAD e43ff1b] merge master -Dorg -Ssuccess-only
2024-04-22 00:48:04,817 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:48:04,817 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-22 00:48:04,897 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-04-22 00:48:05,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:48:05,104 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-04-22 00:48:05,109 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-04-22 00:48:05,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:48:05,517 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-04-22 00:48:05,522 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-04-22 00:48:05,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:48:05,963 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-04-22 00:48:05,968 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-04-22 00:48:06,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:48:06,386 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-04-22 00:48:06,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:48:06,794 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-04-22 00:48:06,800 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-04-22 00:48:07,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:48:07,205 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-04-22 00:48:07,210 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-04-22 00:48:07,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:48:07,617 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-04-22 00:48:07,622 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-04-22 00:48:08,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:48:08,019 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-04-22 00:48:08,025 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-04-22 00:48:08,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:48:08,424 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-04-22 00:48:08,429 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-04-22 00:48:08,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:48:08,830 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-04-22 00:48:08,834 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-04-22 00:48:09,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:48:09,236 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-04-22 00:48:09,242 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-04-22 00:48:09,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:48:09,653 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-04-22 00:48:09,660 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-04-22 00:48:10,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:48:10,074 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-04-22 00:48:10,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:48:10,474 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-04-22 00:48:10,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:48:10,879 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-04-22 00:48:10,885 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-04-22 00:48:11,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:48:11,290 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-04-22 00:48:11,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:48:11,721 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-04-22 00:48:12,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:48:12,121 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-04-22 00:48:12,125 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-04-22 00:48:12,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:48:12,540 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-04-22 00:48:12,544 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-04-22 00:48:12,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:48:12,987 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-04-22 00:48:12,993 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-04-22 00:48:13,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:48:13,404 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-04-22 00:48:13,409 [ scc.config] DEBUG Found submodule.scripts.url
2024-04-22 00:48:13,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-22 00:48:13,818 [ scc.config] DEBUG Found submodule.scripts.branch
2024-04-22 00:48:13,819 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-22 00:48:13,897 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff1c36c5ac0> has local changes
2024-04-22 00:48:13,897 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 549 will-moore 'Inset feature' (stage: draft)
- PR 543 will-moore 'Plate well labels' (stage: draft)
Updating ded0caab..87d179a0
Previously merged:
Merged PRs:
- PR 477 will-moore 'Vite'
- PR 553 sbesson 'Figure_To_Pdf: use max plane size to select the appropriate zoom level'
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 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 469 will-moore 'changelog 0.14.0'
- PR 470 will-moore 'Movie playing waits for planes'
- PR 471 will-moore 'Z projection disabled tooltip'
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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/38/)'
2024-04-22 00:48:13,914 [ scc.git] DEBUG [detached HEAD e5c986d] merge master -Dorg -Ssuccess-only
2024-04-22 00:48:13,914 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-04-22 00:48:13,915 [ scc.merge] INFO Repository: ome/omero-plugins
2024-04-22 00:48:13,915 [ scc.merge] INFO Already up to date.
2024-04-22 00:48:13,915 [ scc.merge] INFO
2024-04-22 00:48:13,915 [ scc.merge] INFO Merged PRs:
2024-04-22 00:48:13,915 [ scc.merge] INFO - PR 362 dependabot[bot] 'Bump scripts from `2078ac7` to `5a90893`'
2024-04-22 00:48:13,915 [ scc.merge] INFO
2024-04-22 00:48:13,915 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-04-22 00:48:13,915 [ scc.merge] INFO Already up to date.
2024-04-22 00:48:13,915 [ scc.merge] INFO
2024-04-22 00:48:13,915 [ scc.merge] INFO
2024-04-22 00:48:13,915 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-04-22 00:48:13,915 [ scc.merge] INFO Excluded PRs:
2024-04-22 00:48:13,915 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-04-22 00:48:13,915 [ scc.merge] INFO Already up to date.
2024-04-22 00:48:13,915 [ scc.merge] INFO
2024-04-22 00:48:13,915 [ scc.merge] INFO Merged PRs:
2024-04-22 00:48:13,915 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-04-22 00:48:13,915 [ scc.merge] INFO
2024-04-22 00:48:13,915 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-04-22 00:48:13,915 [ scc.merge] INFO Excluded PRs:
2024-04-22 00:48:13,915 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-04-22 00:48:13,916 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-04-22 00:48:13,916 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-04-22 00:48:13,916 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-04-22 00:48:13,916 [ scc.merge] INFO Already up to date.
2024-04-22 00:48:13,916 [ scc.merge] INFO
2024-04-22 00:48:13,916 [ scc.merge] INFO Merged PRs:
2024-04-22 00:48:13,916 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-04-22 00:48:13,916 [ scc.merge] INFO
2024-04-22 00:48:13,916 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-04-22 00:48:13,916 [ scc.merge] INFO Excluded PRs:
2024-04-22 00:48:13,916 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-22 00:48:13,916 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-04-22 00:48:13,916 [ scc.merge] INFO Already up to date.
2024-04-22 00:48:13,916 [ scc.merge] INFO
2024-04-22 00:48:13,916 [ scc.merge] INFO Merged PRs:
2024-04-22 00:48:13,916 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-04-22 00:48:13,916 [ scc.merge] INFO
2024-04-22 00:48:13,916 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-22 00:48:13,916 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-04-22 00:48:13,916 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-04-22 00:48:13,916 [ scc.merge] INFO
2024-04-22 00:48:13,916 [ scc.merge] INFO Repository: ome/omero-figure
2024-04-22 00:48:13,916 [ scc.merge] INFO Excluded PRs:
2024-04-22 00:48:13,916 [ scc.merge] INFO - PR 549 will-moore 'Inset feature' (stage: draft)
2024-04-22 00:48:13,916 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (stage: draft)
2024-04-22 00:48:13,916 [ scc.merge] INFO Updating ded0caab..87d179a0
2024-04-22 00:48:13,916 [ scc.merge] INFO Previously merged:
2024-04-22 00:48:13,916 [ scc.merge] INFO
2024-04-22 00:48:13,916 [ scc.merge] INFO Merged PRs:
2024-04-22 00:48:13,916 [ scc.merge] INFO - PR 477 will-moore 'Vite'
2024-04-22 00:48:13,916 [ scc.merge] INFO - PR 553 sbesson 'Figure_To_Pdf: use max plane size to select the appropriate zoom level'
2024-04-22 00:48:13,916 [ scc.merge] INFO
2024-04-22 00:48:13,916 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-04-22 00:48:13,916 [ scc.merge] INFO Already up to date.
2024-04-22 00:48:13,916 [ scc.merge] INFO
2024-04-22 00:48:13,917 [ scc.merge] INFO Merged PRs:
2024-04-22 00:48:13,917 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-04-22 00:48:13,917 [ scc.merge] INFO
2024-04-22 00:48:13,917 [ scc.merge] INFO Repository: ome/omero-gallery
2024-04-22 00:48:13,917 [ scc.merge] INFO Already up to date.
2024-04-22 00:48:13,917 [ scc.merge] INFO
2024-04-22 00:48:13,917 [ scc.merge] INFO Merged PRs:
2024-04-22 00:48:13,917 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-04-22 00:48:13,917 [ scc.merge] INFO
2024-04-22 00:48:13,917 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-04-22 00:48:13,917 [ scc.merge] INFO Excluded PRs:
2024-04-22 00:48:13,917 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-04-22 00:48:13,917 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-04-22 00:48:13,917 [ scc.merge] INFO Already up to date.
2024-04-22 00:48:13,917 [ scc.merge] INFO
2024-04-22 00:48:13,917 [ scc.merge] INFO Merged PRs:
2024-04-22 00:48:13,917 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-04-22 00:48:13,917 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-04-22 00:48:13,917 [ scc.merge] INFO - PR 469 will-moore 'changelog 0.14.0'
2024-04-22 00:48:13,917 [ scc.merge] INFO - PR 470 will-moore 'Movie playing waits for planes'
2024-04-22 00:48:13,917 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-04-22 00:48:13,917 [ scc.merge] INFO
2024-04-22 00:48:13,917 [ scc.merge] INFO Repository: ome/omero-mapr
2024-04-22 00:48:13,917 [ scc.merge] INFO Excluded PRs:
2024-04-22 00:48:13,917 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-04-22 00:48:13,917 [ scc.merge] INFO Already up to date.
2024-04-22 00:48:13,917 [ scc.merge] INFO
2024-04-22 00:48:13,917 [ scc.merge] INFO Merged PRs:
2024-04-22 00:48:13,917 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-04-22 00:48:13,917 [ scc.merge] INFO
2024-04-22 00:48:13,917 [ scc.merge] INFO Repository: ome/omero-metadata
2024-04-22 00:48:13,917 [ scc.merge] INFO Already up to date.
2024-04-22 00:48:13,917 [ scc.merge] INFO
2024-04-22 00:48:13,917 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-22 00:48:13,917 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-04-22 00:48:13,917 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-04-22 00:48:13,917 [ scc.merge] INFO
2024-04-22 00:48:13,917 [ scc.merge] INFO Repository: ome/omero-parade
2024-04-22 00:48:13,918 [ scc.merge] INFO Excluded PRs:
2024-04-22 00:48:13,918 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-04-22 00:48:13,918 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-04-22 00:48:13,918 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-04-22 00:48:13,918 [ scc.merge] INFO Already up to date.
2024-04-22 00:48:13,918 [ scc.merge] INFO
2024-04-22 00:48:13,918 [ scc.merge] INFO Merged PRs:
2024-04-22 00:48:13,918 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-04-22 00:48:13,918 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-04-22 00:48:13,918 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-04-22 00:48:13,918 [ scc.merge] INFO
2024-04-22 00:48:13,918 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-04-22 00:48:13,918 [ scc.merge] INFO Already up to date.
2024-04-22 00:48:13,918 [ scc.merge] INFO
2024-04-22 00:48:13,918 [ scc.merge] INFO Merged PRs:
2024-04-22 00:48:13,918 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-04-22 00:48:13,918 [ scc.merge] INFO
2024-04-22 00:48:13,918 [ scc.merge] INFO Repository: ome/omero-rois
2024-04-22 00:48:13,918 [ scc.merge] INFO Excluded PRs:
2024-04-22 00:48:13,918 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-22 00:48:13,918 [ scc.merge] INFO Already up to date.
2024-04-22 00:48:13,918 [ scc.merge] INFO
2024-04-22 00:48:13,918 [ scc.merge] INFO Merged PRs:
2024-04-22 00:48:13,918 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-04-22 00:48:13,918 [ scc.merge] INFO
2024-04-22 00:48:13,918 [ scc.merge] INFO Repository: ome/omero-signup
2024-04-22 00:48:13,918 [ scc.merge] INFO Already up to date.
2024-04-22 00:48:13,918 [ scc.merge] INFO
2024-04-22 00:48:13,918 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-22 00:48:13,918 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-04-22 00:48:13,918 [ scc.merge] INFO
2024-04-22 00:48:13,918 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-04-22 00:48:13,918 [ scc.merge] INFO Already up to date.
2024-04-22 00:48:13,918 [ scc.merge] INFO
2024-04-22 00:48:13,918 [ scc.merge] INFO Merged PRs:
2024-04-22 00:48:13,918 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-04-22 00:48:13,918 [ scc.merge] INFO
2024-04-22 00:48:13,919 [ scc.merge] INFO Repository: ome/omero-upload
2024-04-22 00:48:13,919 [ scc.merge] INFO Already up to date.
2024-04-22 00:48:13,919 [ scc.merge] INFO
2024-04-22 00:48:13,919 [ scc.merge] INFO
2024-04-22 00:48:13,919 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-04-22 00:48:13,919 [ scc.merge] INFO Already up to date.
2024-04-22 00:48:13,919 [ scc.merge] INFO
2024-04-22 00:48:13,919 [ scc.merge] INFO
2024-04-22 00:48:13,919 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-04-22 00:48:13,919 [ scc.merge] INFO Excluded PRs:
2024-04-22 00:48:13,919 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-04-22 00:48:13,919 [ scc.merge] INFO Already up to date.
2024-04-22 00:48:13,919 [ scc.merge] INFO
2024-04-22 00:48:13,919 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-22 00:48:13,919 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-04-22 00:48:13,919 [ scc.merge] INFO
2024-04-22 00:48:13,919 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-04-22 00:48:13,919 [ scc.merge] INFO Already up to date.
2024-04-22 00:48:13,919 [ scc.merge] INFO
2024-04-22 00:48:13,919 [ scc.merge] INFO
2024-04-22 00:48:13,919 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-04-22 00:48:13,919 [ scc.merge] INFO Already up to date.
2024-04-22 00:48:13,919 [ scc.merge] INFO
2024-04-22 00:48:13,919 [ scc.merge] INFO
2024-04-22 00:48:13,919 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-04-22 00:48:13,919 [ scc.merge] INFO Already up to date.
2024-04-22 00:48:13,919 [ scc.merge] INFO
2024-04-22 00:48:13,919 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-22 00:48:13,919 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-04-22 00:48:13,919 [ scc.merge] INFO
2024-04-22 00:48:13,919 [ scc.merge] INFO Repository: ome/scripts
2024-04-22 00:48:13,919 [ scc.merge] INFO Excluded PRs:
2024-04-22 00:48:13,919 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-22 00:48:13,919 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-22 00:48:13,919 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-22 00:48:13,919 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-22 00:48:13,919 [ scc.merge] INFO Already up to date.
2024-04-22 00:48:13,919 [ scc.merge] INFO
2024-04-22 00:48:13,920 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-22 00:48:13,920 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-22 00:48:13,920 [ scc.merge] INFO
2024-04-22 00:48:13,920 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-22 00:48:13,920 [ scc.git] DEBUG Calling 'git remote'
2024-04-22 00:48:13,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-04-22 00:48:13,926 [ scc.git] DEBUG Calling 'git remote'
2024-04-22 00:48:13,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:48:13,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-04-22 00:48:13,931 [ scc.git] DEBUG Calling 'git remote'
2024-04-22 00:48:13,937 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:48:13,937 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-04-22 00:48:13,937 [ scc.git] DEBUG Calling 'git remote'
2024-04-22 00:48:13,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:48:13,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-04-22 00:48:13,942 [ scc.git] DEBUG Calling 'git remote'
2024-04-22 00:48:13,949 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:48:13,949 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-04-22 00:48:13,949 [ scc.git] DEBUG Calling 'git remote'
2024-04-22 00:48:13,955 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:48:13,955 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-04-22 00:48:13,955 [ scc.git] DEBUG Calling 'git remote'
2024-04-22 00:48:13,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:48:13,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-04-22 00:48:13,960 [ scc.git] DEBUG Calling 'git remote'
2024-04-22 00:48:13,965 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:48:13,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-04-22 00:48:13,966 [ scc.git] DEBUG Calling 'git remote'
2024-04-22 00:48:13,970 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:48:13,971 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-04-22 00:48:13,971 [ scc.git] DEBUG Calling 'git remote'
2024-04-22 00:48:13,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:48:13,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-04-22 00:48:13,975 [ scc.git] DEBUG Calling 'git remote'
2024-04-22 00:48:13,980 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:48:13,980 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-04-22 00:48:13,980 [ scc.git] DEBUG Calling 'git remote'
2024-04-22 00:48:13,984 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:48:13,985 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-04-22 00:48:13,985 [ scc.git] DEBUG Calling 'git remote'
2024-04-22 00:48:13,989 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:48:13,989 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-04-22 00:48:13,989 [ scc.git] DEBUG Calling 'git remote'
2024-04-22 00:48:13,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:48:13,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-04-22 00:48:13,994 [ scc.git] DEBUG Calling 'git remote'
2024-04-22 00:48:13,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:48:13,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-04-22 00:48:13,999 [ scc.git] DEBUG Calling 'git remote'
2024-04-22 00:48:14,004 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:48:14,004 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-04-22 00:48:14,004 [ scc.git] DEBUG Calling 'git remote'
2024-04-22 00:48:14,008 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:48:14,008 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-04-22 00:48:14,008 [ scc.git] DEBUG Calling 'git remote'
2024-04-22 00:48:14,013 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:48:14,013 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-04-22 00:48:14,013 [ scc.git] DEBUG Calling 'git remote'
2024-04-22 00:48:14,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:48:14,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-04-22 00:48:14,018 [ scc.git] DEBUG Calling 'git remote'
2024-04-22 00:48:14,022 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:48:14,023 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-04-22 00:48:14,023 [ scc.git] DEBUG Calling 'git remote'
2024-04-22 00:48:14,027 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:48:14,027 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-04-22 00:48:14,027 [ scc.git] DEBUG Calling 'git remote'
2024-04-22 00:48:14,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-04-22 00:48:14,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-04-22 00:48:14,032 [ scc.git] DEBUG Calling 'git remote'
2024-04-22 00:48:14,037 [ 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 c9ce9b0] 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 ded0caab
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 9d8d147
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from a0148a6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from aca9e9c
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 5a90893
nothing to commit, working tree clean
[detached HEAD f3aa675] 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-22 00:49:00,941 [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-22 00:49:09,964 [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-22 00:49:12,324 [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-22 00:49:16,952 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-04-22 00:50:03,467 [ 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/03a0bb70/images/svgs/logo.svg){kind=logo}
